From 92d2899f0afebb6080bedb2fa63ff6f4607e5564 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 15 Feb 2024 18:46:24 +0300 Subject: [PATCH 1/4] chore(dogfood): switch to jfrog-token module --- dogfood/main.tf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index e1cb21685c5b5..239e2ee0de523 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -157,13 +157,18 @@ module "coder-login" { agent_id = coder_agent.dev.id } +variable "artifactory_access_token" { + sensitive = true +} + module "jfrog" { - source = "registry.coder.com/modules/jfrog-oauth/coder" - version = "1.0.2" - agent_id = coder_agent.dev.id - jfrog_url = var.jfrog_url - configure_code_server = true - username_field = "username" + source = "registry.coder.com/modules/jfrog-token/coder" + version = "1.0.2" + agent_id = coder_agent.dev.id + jfrog_url = var.jfrog_url + artifactory_access_token = var.artifactory_access_token + configure_code_server = true + username_field = "username" package_managers = { "npm" : "npm", "go" : "go", From 9f3f06de10b1f0d64066d767ec50c22e844d2498 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 15 Feb 2024 18:48:15 +0300 Subject: [PATCH 2/4] add token variable --- .github/workflows/dogfood.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml index fa328a0b525c5..256f95f7993ff 100644 --- a/.github/workflows/dogfood.yaml +++ b/.github/workflows/dogfood.yaml @@ -109,7 +109,7 @@ jobs: - name: "Push template" if: github.ref == 'refs/heads/main' run: | - ./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }} + ./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }} --variable artifactory_access_token=${{ secrets.JFROG_ARTIFACTORY_ACCESS_TOKEN }} env: # Consumed by Coder CLI CODER_URL: https://dev.coder.com From b91ac11a4716861b3ece95b9132231a92964acf5 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 16 Feb 2024 13:29:59 +0300 Subject: [PATCH 3/4] Update dogfood.yaml --- .github/workflows/dogfood.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml index 256f95f7993ff..9b6fe4365ddb2 100644 --- a/.github/workflows/dogfood.yaml +++ b/.github/workflows/dogfood.yaml @@ -109,8 +109,7 @@ jobs: - name: "Push template" if: github.ref == 'refs/heads/main' run: | - ./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }} --variable artifactory_access_token=${{ secrets.JFROG_ARTIFACTORY_ACCESS_TOKEN }} - env: + ./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" # Consumed by Coder CLI CODER_URL: https://dev.coder.com CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }} From cef85f07676f79b0ac702b5ae1c322ff430c32c2 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 16 Feb 2024 13:31:09 +0300 Subject: [PATCH 4/4] revert --- dogfood/main.tf | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dogfood/main.tf b/dogfood/main.tf index 239e2ee0de523..b4cb59eb12f27 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -10,16 +10,6 @@ terraform { } } -variable "jfrog_url" { - type = string - description = "Artifactory URL. e.g. https://myartifactory.example.com" - # ensue the URL is HTTPS or HTTP - validation { - condition = can(regex("^(https|http)://", var.jfrog_url)) - error_message = "jfrog_url must be a valid URL starting with either 'https://' or 'http://'" - } -} - locals { // These are cluster service addresses mapped to Tailscale nodes. Ask Dean or // Kyle for help. @@ -34,7 +24,6 @@ locals { repo_base_dir = data.coder_parameter.repo_base_dir.value == "~" ? "/home/coder" : replace(data.coder_parameter.repo_base_dir.value, "/^~\\//", "/home/coder/") repo_dir = replace(module.git-clone.repo_dir, "/^~\\//", "/home/coder/") container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}" - jfrog_host = replace(var.jfrog_url, "https://", "") } data "coder_parameter" "repo_base_dir" { @@ -157,26 +146,6 @@ module "coder-login" { agent_id = coder_agent.dev.id } -variable "artifactory_access_token" { - sensitive = true -} - -module "jfrog" { - source = "registry.coder.com/modules/jfrog-token/coder" - version = "1.0.2" - agent_id = coder_agent.dev.id - jfrog_url = var.jfrog_url - artifactory_access_token = var.artifactory_access_token - configure_code_server = true - username_field = "username" - package_managers = { - "npm" : "npm", - "go" : "go", - "pypi" : "pypi", - "docker" : "docker" - } -} - resource "coder_agent" "dev" { arch = "amd64" os = "linux"