- Notifications
You must be signed in to change notification settings - Fork22
chore!: remove deprecated items fromcoder_workspace data source#255
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
16 commits Select commitHold shift + click to select a range
d14d6ee chore!: remove deprecated owner-related fields from workspace data so…
matifali1da8ba7 fix integration tests
matifali4d5b168 remove remaining instances
matifali4dbf571 Discard changes to integration/workspace-owner/main.tf
matifalic7ce74a Discard changes to integration/test-data-source/main.tf
matifalid38e383 Discard changes to integration/integration_test.go
matifaliff0131f fixup!
matifalic916802 cleanup
matifalif604605 more cleanup
matifalif4a4746 fixup!
matifali28d764d remove example
matifali396eaff fixup!
matifali4ede0cd Discard changes to examples/data-sources/coder_workspace/data-source.tf
matifali001c185 elaborate example
matifali7337eac fmt
matifali025afb1 `make gen`
matifaliFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
53 changes: 43 additions & 10 deletionsdocs/data-sources/workspace.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -13,11 +13,51 @@ Use this data source to get information for the active workspace build. | ||
| ## Example Usage | ||
| ```terraform | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Elaborated example usage. If its too much happy to simply it. | ||
| provider "coder" {} | ||
| provider "docker" {} | ||
| data "coder_workspace" "me" {} | ||
| data "coder_workspace_owner" "me" {} | ||
| resource "coder_agent" "dev" { | ||
| arch = "amd64" | ||
| os = "linux" | ||
| dir = "/workspace" | ||
| } | ||
| resource "docker_container" "workspace" { | ||
| count = data.coder_workspace.me.start_count | ||
| image = docker_image.main.name | ||
| # Uses lower() to avoid Docker restriction on container names. | ||
| name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}" | ||
| # Hostname makes the shell more user friendly: coder@my-workspace:~$ | ||
| hostname = data.coder_workspace.me.name | ||
| # Use the docker gateway if the access URL is 127.0.0.1 | ||
| entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")] | ||
| env = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"] | ||
| host { | ||
| host = "host.docker.internal" | ||
| ip = "host-gateway" | ||
| } | ||
| # Add labels in Docker to keep track of orphan resources. | ||
| labels { | ||
| label = "coder.owner" | ||
| value = data.coder_workspace_owner.me.name | ||
| } | ||
| labels { | ||
| label = "coder.owner_id" | ||
| value = data.coder_workspace_owner.me.id | ||
| } | ||
| labels { | ||
| label = "coder.workspace_id" | ||
| value = data.coder_workspace.me.id | ||
| } | ||
| labels { | ||
| label = "coder.workspace_name" | ||
| value = data.coder_workspace.me.name | ||
| } | ||
| } | ||
| ``` | ||
| @@ -30,13 +70,6 @@ resource "kubernetes_pod" "dev" { | ||
| - `access_url` (String) The access URL of the Coder deployment provisioning this workspace. | ||
| - `id` (String) UUID of the workspace. | ||
| - `name` (String) Name of the workspace. | ||
| - `start_count` (Number) A computed count based on `transition` state. If `start`, count will equal 1. | ||
| - `template_id` (String) ID of the workspace's template. | ||
| - `template_name` (String) Name of the workspace's template. | ||
6 changes: 2 additions & 4 deletionsdocs/data-sources/workspace_owner.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -15,14 +15,12 @@ Use this data source to fetch information about the workspace owner. | ||
| ```terraform | ||
| provider "coder" {} | ||
| data "coder_workspace_owner" "me" {} | ||
| resource "coder_agent" "dev" { | ||
| arch = "amd64" | ||
| os = "linux" | ||
| dir ="/workspace" | ||
| env = { | ||
| OIDC_TOKEN : data.coder_workspace_owner.me.oidc_access_token, | ||
| } | ||
| @@ -36,7 +34,7 @@ resource "coder_env" "git_author_name" { | ||
| } | ||
| resource "coder_env" "git_author_email" { | ||
| agent_id =coder_agent.dev.id | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. there was no var defined so used the already defined agent. | ||
| name = "GIT_AUTHOR_EMAIL" | ||
| value = data.coder_workspace_owner.me.email | ||
| count = data.coder_workspace_owner.me.email != "" ? 1 : 0 | ||
46 changes: 43 additions & 3 deletionsexamples/data-sources/coder_workspace/data-source.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,46 @@ | ||
| provider "coder" {} | ||
| provider "docker" {} | ||
| data "coder_workspace" "me" {} | ||
| data "coder_workspace_owner" "me" {} | ||
| resource "coder_agent" "dev" { | ||
| arch = "amd64" | ||
| os = "linux" | ||
| dir = "/workspace" | ||
| } | ||
| resource "docker_container" "workspace" { | ||
| count = data.coder_workspace.me.start_count | ||
| image = docker_image.main.name | ||
| # Uses lower() to avoid Docker restriction on container names. | ||
| name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}" | ||
| # Hostname makes the shell more user friendly: coder@my-workspace:~$ | ||
| hostname = data.coder_workspace.me.name | ||
| # Use the docker gateway if the access URL is 127.0.0.1 | ||
| entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")] | ||
| env = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"] | ||
| host { | ||
| host = "host.docker.internal" | ||
| ip = "host-gateway" | ||
| } | ||
| # Add labels in Docker to keep track of orphan resources. | ||
| labels { | ||
| label = "coder.owner" | ||
| value = data.coder_workspace_owner.me.name | ||
| } | ||
| labels { | ||
| label = "coder.owner_id" | ||
| value = data.coder_workspace_owner.me.id | ||
| } | ||
| labels { | ||
| label = "coder.workspace_id" | ||
| value = data.coder_workspace.me.id | ||
| } | ||
| labels { | ||
| label = "coder.workspace_name" | ||
| value = data.coder_workspace.me.name | ||
| } | ||
| } |
6 changes: 2 additions & 4 deletionsexamples/data-sources/coder_workspace_owner/data-source.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
38 changes: 12 additions & 26 deletionsintegration/integration_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -71,25 +71,18 @@ func TestIntegration(t *testing.T) { | ||
| name: "test-data-source", | ||
| minVersion: "v0.0.0", | ||
| expectedOutput: map[string]string{ | ||
Comment on lines -81 to -87 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. removed all owner related items from the integration test. We already have a separate integration test for | ||
| "provisioner.arch": runtime.GOARCH, | ||
| "provisioner.id": `[a-zA-Z0-9-]+`, | ||
| "provisioner.os": runtime.GOOS, | ||
| "workspace.access_port": `\d+`, | ||
| "workspace.access_url": `https?://\D+:\d+`, | ||
| "workspace.id": `[a-zA-z0-9-]+`, | ||
| "workspace.name": `test-data-source`, | ||
| "workspace.start_count": `1`, | ||
| "workspace.template_id": `[a-zA-Z0-9-]+`, | ||
| "workspace.template_name": `test-data-source`, | ||
| "workspace.template_version": `.+`, | ||
| "workspace.transition": `start`, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -103,13 +96,6 @@ func TestIntegration(t *testing.T) { | ||
| "workspace.access_url": `https?://\D+:\d+`, | ||
| "workspace.id": `[a-zA-z0-9-]+`, | ||
| "workspace.name": ``, | ||
| "workspace.start_count": `1`, | ||
| "workspace.template_id": `[a-zA-Z0-9-]+`, | ||
| "workspace.template_name": `workspace-owner`, | ||
10 changes: 1 addition & 9 deletionsintegration/test-data-source/main.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
10 changes: 1 addition & 9 deletionsintegration/workspace-owner/main.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
76 changes: 0 additions & 76 deletionsprovider/workspace.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.