publicWagsHome
/
modules
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #256 from coder/cj/deprecated_owner_fields

Browse Source 
chore: remove usage of deprecated fields coder_workspace.owner_*
pull/258/head
Cian Johnston 11 months ago committed by GitHub
parent c6b457e7fe 249cb2fe9e
commit 72eaf8a9e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File

5
coder-login/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.12" version = ">= 0.23"
} }
} }
} }
@ -15,11 +15,12 @@ variable "agent_id" {
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
resource "coder_script" "coder-login" { resource "coder_script" "coder-login" {
agent_id = var.agent_id agent_id = var.agent_id
script = templatefile("${path.module}/run.sh", { script = templatefile("${path.module}/run.sh", {
CODER_USER_TOKEN : data.coder_workspace.me.owner_session_token, CODER_USER_TOKEN : data.coder_workspace_owner.me.session_token,
CODER_DEPLOYMENT_URL : data.coder_workspace.me.access_url CODER_DEPLOYMENT_URL : data.coder_workspace.me.access_url
}) })
display_name = "Coder Login" display_name = "Coder Login"

15
git-config/main.test.ts
Unescape Escape View File

@ -20,9 +20,10 @@ describe("git-config", async () => {
}); });
const resources = state.resources; const resources = state.resources;
expect(resources).toHaveLength(5); expect(resources).toHaveLength(6);
expect(resources).toMatchObject([ expect(resources).toMatchObject([
{ type: "coder_workspace", name: "me" }, { type: "coder_workspace", name: "me" },
{ type: "coder_workspace_owner", name: "me" },
{ type: "coder_env", name: "git_author_email" }, { type: "coder_env", name: "git_author_email" },
{ type: "coder_env", name: "git_author_name" }, { type: "coder_env", name: "git_author_name" },
{ type: "coder_env", name: "git_commmiter_email" }, { type: "coder_env", name: "git_commmiter_email" },
@ -37,11 +38,12 @@ describe("git-config", async () => {
}); });
const resources = state.resources; const resources = state.resources;
expect(resources).toHaveLength(7); expect(resources).toHaveLength(8);
expect(resources).toMatchObject([ expect(resources).toMatchObject([
{ type: "coder_parameter", name: "user_email" }, { type: "coder_parameter", name: "user_email" },
{ type: "coder_parameter", name: "username" }, { type: "coder_parameter", name: "username" },
{ type: "coder_workspace", name: "me" }, { type: "coder_workspace", name: "me" },
{ type: "coder_workspace_owner", name: "me" },
{ type: "coder_env", name: "git_author_email" }, { type: "coder_env", name: "git_author_email" },
{ type: "coder_env", name: "git_author_name" }, { type: "coder_env", name: "git_author_name" },
{ type: "coder_env", name: "git_commmiter_email" }, { type: "coder_env", name: "git_commmiter_email" },
@ -61,9 +63,10 @@ describe("git-config", async () => {
); );
const resources = state.resources; const resources = state.resources;
expect(resources).toHaveLength(5); expect(resources).toHaveLength(6);
expect(resources).toMatchObject([ expect(resources).toMatchObject([
{ type: "coder_workspace", name: "me" }, { type: "coder_workspace", name: "me" },
{ type: "coder_workspace_owner", name: "me" },
{ type: "coder_env", name: "git_author_email" }, { type: "coder_env", name: "git_author_email" },
{ type: "coder_env", name: "git_author_name" }, { type: "coder_env", name: "git_author_name" },
{ type: "coder_env", name: "git_commmiter_email" }, { type: "coder_env", name: "git_commmiter_email" },
@ -80,11 +83,12 @@ describe("git-config", async () => {
coder_parameter_order: order.toString(), coder_parameter_order: order.toString(),
}); });
const resources = state.resources; const resources = state.resources;
expect(resources).toHaveLength(7); expect(resources).toHaveLength(8);
expect(resources).toMatchObject([ expect(resources).toMatchObject([
{ type: "coder_parameter", name: "user_email" }, { type: "coder_parameter", name: "user_email" },
{ type: "coder_parameter", name: "username" }, { type: "coder_parameter", name: "username" },
{ type: "coder_workspace", name: "me" }, { type: "coder_workspace", name: "me" },
{ type: "coder_workspace_owner", name: "me" },
{ type: "coder_env", name: "git_author_email" }, { type: "coder_env", name: "git_author_email" },
{ type: "coder_env", name: "git_author_name" }, { type: "coder_env", name: "git_author_name" },
{ type: "coder_env", name: "git_commmiter_email" }, { type: "coder_env", name: "git_commmiter_email" },
@ -106,10 +110,11 @@ describe("git-config", async () => {
coder_parameter_order: order.toString(), coder_parameter_order: order.toString(),
}); });
const resources = state.resources; const resources = state.resources;
expect(resources).toHaveLength(6); expect(resources).toHaveLength(7);
expect(resources).toMatchObject([ expect(resources).toMatchObject([
{ type: "coder_parameter", name: "username" }, { type: "coder_parameter", name: "username" },
{ type: "coder_workspace", name: "me" }, { type: "coder_workspace", name: "me" },
{ type: "coder_workspace_owner", name: "me" },
{ type: "coder_env", name: "git_author_email" }, { type: "coder_env", name: "git_author_email" },
{ type: "coder_env", name: "git_author_name" }, { type: "coder_env", name: "git_author_name" },
{ type: "coder_env", name: "git_commmiter_email" }, { type: "coder_env", name: "git_commmiter_email" },

15
git-config/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.22" version = ">= 0.23"
} }
} }
} }
@ -33,6 +33,7 @@ variable "coder_parameter_order" {
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
data "coder_parameter" "user_email" { data "coder_parameter" "user_email" {
count = var.allow_email_change ? 1 : 0 count = var.allow_email_change ? 1 : 0
@ -59,25 +60,25 @@ data "coder_parameter" "username" {
resource "coder_env" "git_author_name" { resource "coder_env" "git_author_name" {
agent_id = var.agent_id agent_id = var.agent_id
name = "GIT_AUTHOR_NAME" name = "GIT_AUTHOR_NAME"
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace.me.owner_name, data.coder_workspace.me.owner) value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
} }
resource "coder_env" "git_commmiter_name" { resource "coder_env" "git_commmiter_name" {
agent_id = var.agent_id agent_id = var.agent_id
name = "GIT_COMMITTER_NAME" name = "GIT_COMMITTER_NAME"
value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace.me.owner_name, data.coder_workspace.me.owner) value = coalesce(try(data.coder_parameter.username[0].value, ""), data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
} }
resource "coder_env" "git_author_email" { resource "coder_env" "git_author_email" {
agent_id = var.agent_id agent_id = var.agent_id
name = "GIT_AUTHOR_EMAIL" name = "GIT_AUTHOR_EMAIL"
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace.me.owner_email) value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
count = data.coder_workspace.me.owner_email != "" ? 1 : 0 count = data.coder_workspace_owner.me.email != "" ? 1 : 0
} }
resource "coder_env" "git_commmiter_email" { resource "coder_env" "git_commmiter_email" {
agent_id = var.agent_id agent_id = var.agent_id
name = "GIT_COMMITTER_EMAIL" name = "GIT_COMMITTER_EMAIL"
value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace.me.owner_email) value = coalesce(try(data.coder_parameter.user_email[0].value, ""), data.coder_workspace_owner.me.email)
count = data.coder_workspace.me.owner_email != "" ? 1 : 0 count = data.coder_workspace_owner.me.email != "" ? 1 : 0
} }

5
github-upload-public-key/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.12" version = ">= 0.23"
} }
} }
} }
@ -27,11 +27,12 @@ variable "github_api_url" {
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
resource "coder_script" "github_upload_public_key" { resource "coder_script" "github_upload_public_key" {
agent_id = var.agent_id agent_id = var.agent_id
script = templatefile("${path.module}/run.sh", { script = templatefile("${path.module}/run.sh", {
CODER_OWNER_SESSION_TOKEN : data.coder_workspace.me.owner_session_token, CODER_OWNER_SESSION_TOKEN : data.coder_workspace_owner.me.session_token,
CODER_ACCESS_URL : data.coder_workspace.me.access_url, CODER_ACCESS_URL : data.coder_workspace.me.access_url,
CODER_EXTERNAL_AUTH_ID : var.external_auth_id, CODER_EXTERNAL_AUTH_ID : var.external_auth_id,
GITHUB_API_URL : var.github_api_url, GITHUB_API_URL : var.github_api_url,

7
jfrog-oauth/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.12.4" version = ">= 0.23"
} }
} }
} }
@ -68,11 +68,12 @@ EOF
locals { locals {
# The username field to use for artifactory # The username field to use for artifactory
username = var.username_field == "email" ? data.coder_workspace.me.owner_email : data.coder_workspace.me.owner username = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
jfrog_host = replace(var.jfrog_url, "https://", "") jfrog_host = replace(var.jfrog_url, "https://", "")
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
data "coder_external_auth" "jfrog" { data "coder_external_auth" "jfrog" {
id = var.external_auth_id id = var.external_auth_id
@ -87,7 +88,7 @@ resource "coder_script" "jfrog" {
JFROG_HOST : local.jfrog_host, JFROG_HOST : local.jfrog_host,
JFROG_SERVER_ID : var.jfrog_server_id, JFROG_SERVER_ID : var.jfrog_server_id,
ARTIFACTORY_USERNAME : local.username, ARTIFACTORY_USERNAME : local.username,
ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, ARTIFACTORY_EMAIL : data.coder_workspace_owner.me.email,
ARTIFACTORY_ACCESS_TOKEN : data.coder_external_auth.jfrog.access_token, ARTIFACTORY_ACCESS_TOKEN : data.coder_external_auth.jfrog.access_token,
CONFIGURE_CODE_SERVER : var.configure_code_server, CONFIGURE_CODE_SERVER : var.configure_code_server,
REPOSITORY_NPM : lookup(var.package_managers, "npm", ""), REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),

2
jfrog-token/README.md
Unescape Escape View File

@ -98,7 +98,7 @@ module "jfrog" {
agent_id = coder_agent.example.id agent_id = coder_agent.example.id
jfrog_url = "https://XXXX.jfrog.io" jfrog_url = "https://XXXX.jfrog.io"
artifactory_access_token = var.artifactory_access_token artifactory_access_token = var.artifactory_access_token
token_description = "Token for Coder workspace: ${data.coder_workspace.me.owner}/${data.coder_workspace.me.name}" token_description = "Token for Coder workspace: ${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}"
package_managers = { package_managers = {
"npm" : "npm", "npm" : "npm",
"go" : "go", "go" : "go",

7
jfrog-token/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.12.4" version = ">= 0.23"
} }
artifactory = { artifactory = {
source = "registry.terraform.io/jfrog/artifactory" source = "registry.terraform.io/jfrog/artifactory"
@ -95,7 +95,7 @@ EOF
locals { locals {
# The username field to use for artifactory # The username field to use for artifactory
username = var.username_field == "email" ? data.coder_workspace.me.owner_email : data.coder_workspace.me.owner username = var.username_field == "email" ? data.coder_workspace_owner.me.email : data.coder_workspace_owner.me.name
jfrog_host = replace(var.jfrog_url, "https://", "") jfrog_host = replace(var.jfrog_url, "https://", "")
} }
@ -117,6 +117,7 @@ resource "artifactory_scoped_token" "me" {
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
resource "coder_script" "jfrog" { resource "coder_script" "jfrog" {
agent_id = var.agent_id agent_id = var.agent_id
@ -127,7 +128,7 @@ resource "coder_script" "jfrog" {
JFROG_HOST : local.jfrog_host, JFROG_HOST : local.jfrog_host,
JFROG_SERVER_ID : var.jfrog_server_id, JFROG_SERVER_ID : var.jfrog_server_id,
ARTIFACTORY_USERNAME : local.username, ARTIFACTORY_USERNAME : local.username,
ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, ARTIFACTORY_EMAIL : data.coder_workspace_owner.me.email,
ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token, ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token,
CONFIGURE_CODE_SERVER : var.configure_code_server, CONFIGURE_CODE_SERVER : var.configure_code_server,
REPOSITORY_NPM : lookup(var.package_managers, "npm", ""), REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),

16
vscode-desktop/main.test.ts
Unescape Escape View File

@ -21,8 +21,12 @@ describe("vscode-desktop", async () => {
"vscode://coder.coder-remote/open?owner=default&workspace=default&url=https://mydeployment.coder.com&token=$SESSION_TOKEN", "vscode://coder.coder-remote/open?owner=default&workspace=default&url=https://mydeployment.coder.com&token=$SESSION_TOKEN",
); );
const resources: any = state.resources; const coder_app = state.resources.find(
expect(resources[1].instances[0].attributes.order).toBeNull(); (res) => res.type == "coder_app" && res.name == "vscode",
);
expect(coder_app).not.toBeNull();
expect(coder_app.instances.length).toBe(1);
expect(coder_app.instances[0].attributes.order).toBeNull();
}); });
it("adds folder", async () => { it("adds folder", async () => {
@ -73,7 +77,11 @@ describe("vscode-desktop", async () => {
order: "22", order: "22",
}); });
const resources: any = state.resources; const coder_app = state.resources.find(
expect(resources[1].instances[0].attributes.order).toBe(22); (res) => res.type == "coder_app" && res.name == "vscode",
);
expect(coder_app).not.toBeNull();
expect(coder_app.instances.length).toBe(1);
expect(coder_app.instances[0].attributes.order).toBe(22);
}); });
}); });

5
vscode-desktop/main.tf
Unescape Escape View File

@ -4,7 +4,7 @@ terraform {
required_providers { required_providers {
coder = { coder = {
source = "coder/coder" source = "coder/coder"
version = ">= 0.17" version = ">= 0.23"
} }
} }
} }
@ -33,6 +33,7 @@ variable "order" {
} }
data "coder_workspace" "me" {} data "coder_workspace" "me" {}
data "coder_workspace_owner" "me" {}
resource "coder_app" "vscode" { resource "coder_app" "vscode" {
agent_id = var.agent_id agent_id = var.agent_id
@ -44,7 +45,7 @@ resource "coder_app" "vscode" {
url = join("", [ url = join("", [
"vscode://coder.coder-remote/open", "vscode://coder.coder-remote/open",
"?owner=", "?owner=",
data.coder_workspace.me.owner, data.coder_workspace_owner.me.name,
"&workspace=", "&workspace=",
data.coder_workspace.me.name, data.coder_workspace.me.name,
var.folder != "" ? join("", ["&folder=", var.folder]) : "", var.folder != "" ? join("", ["&folder=", var.folder]) : "",

Write Preview
Loading…
Cancel
Save