From 721e6a86b3f27c87607ee42b1903c88d3f53b582 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Tue, 23 Jan 2024 19:16:04 +0300 Subject: [PATCH 1/2] chore(dogfood): use versioning for coder modules --- dogfood/main.tf | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 4154070329e58..52ea8beb2a053 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -85,36 +85,42 @@ data "coder_external_auth" "github" { data "coder_workspace" "me" {} module "slackme" { - source = "https://registry.coder.com/modules/slackme" + source = "registry.coder.com/modules/slackme/coder" + version = "1.0.1" agent_id = coder_agent.dev.id auth_provider_id = "slack" } module "dotfiles" { - source = "https://registry.coder.com/modules/dotfiles" + source = "registry.coder.com/modules/dotfiles/coder" + version = "1.0.1" agent_id = coder_agent.dev.id } module "git-clone" { - source = "https://registry.coder.com/modules/git-clone" + source = "registry.coder.com/modules/git-clone/coder" + version = "1.0.1" agent_id = coder_agent.dev.id url = "https://github.com/coder/coder" path = local.repo_dir } module "personalize" { - source = "https://registry.coder.com/modules/personalize" + source = "registry.coder.com/modules/personalize/coder" + version = "1.0.1" agent_id = coder_agent.dev.id } module "code-server" { - source = "https://registry.coder.com/modules/code-server" + source = "registry.coder.com/modules/code-server/coder" + version = "1.0.1" agent_id = coder_agent.dev.id folder = local.repo_dir } module "jetbrains_gateway" { - source = "https://registry.coder.com/modules/jetbrains-gateway" + source = "registry.coder.com/modules/jetbrains-gateway/coder" + version = "1.0.1" agent_id = coder_agent.dev.id agent_name = "dev" folder = local.repo_dir @@ -123,23 +129,27 @@ module "jetbrains_gateway" { } module "vscode-desktop" { - source = "https://registry.coder.com/modules/vscode-desktop" + source = "registry.coder.com/modules/vscode-desktop/coder" + version = "1.0.1" agent_id = coder_agent.dev.id folder = local.repo_dir } module "filebrowser" { - source = "https://registry.coder.com/modules/filebrowser" + source = "registry.coder.com/modules/filebrowser/coder" + version = "1.0.1" agent_id = coder_agent.dev.id } module "coder-login" { - source = "https://registry.coder.com/modules/coder-login" + source = "registry.coder.com/modules/coder-login/coder" + version = "1.0.1" agent_id = coder_agent.dev.id } module "jfrog" { - source = "https://registry.coder.com/modules/jfrog-oauth" + source = "registry.coder.com/modules/jfrog-oauth/coder" + version = "1.0.1" agent_id = coder_agent.dev.id jfrog_url = var.jfrog_url configure_code_server = true From 39bca54352c3af2381dc02c50ae2603cc90a35bf Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Tue, 23 Jan 2024 23:39:27 +0000 Subject: [PATCH 2/2] `make fmt` --- dogfood/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 52ea8beb2a053..09c95d7832614 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -120,7 +120,7 @@ module "code-server" { module "jetbrains_gateway" { source = "registry.coder.com/modules/jetbrains-gateway/coder" - version = "1.0.1" + version = "1.0.1" agent_id = coder_agent.dev.id agent_name = "dev" folder = local.repo_dir @@ -130,7 +130,7 @@ module "jetbrains_gateway" { module "vscode-desktop" { source = "registry.coder.com/modules/vscode-desktop/coder" - version = "1.0.1" + version = "1.0.1" agent_id = coder_agent.dev.id folder = local.repo_dir }