From e36c28497def7bdf10efdf54a88b46c75e84723a Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 27 Dec 2023 16:17:21 +0300 Subject: [PATCH] Update main.tf --- jfrog-oauth/main.tf | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/jfrog-oauth/main.tf b/jfrog-oauth/main.tf index 8af19ab..f26394e 100644 --- a/jfrog-oauth/main.tf +++ b/jfrog-oauth/main.tf @@ -56,7 +56,8 @@ EOF locals { # 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.me.owner_email : data.coder_workspace.me.owner + jfrog_host = replace(var.jfrog_url, "https://", "") } data "coder_workspace" "me" {} @@ -71,7 +72,7 @@ resource "coder_script" "jfrog" { icon = "/icon/jfrog.svg" script = templatefile("${path.module}/run.sh", { JFROG_URL : var.jfrog_url, - JFROG_HOST : replace(var.jfrog_url, "https://", ""), + JFROG_HOST : var.jfrog_host, ARTIFACTORY_USERNAME : local.username, ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, ARTIFACTORY_ACCESS_TOKEN : data.coder_external_auth.jfrog.access_token, @@ -83,17 +84,6 @@ resource "coder_script" "jfrog" { run_on_start = true } -output "access_token" { - description = "value of the JFrog access token" - value = data.coder_external_auth.jfrog.access_token - sensitive = true -} - -output "username" { - description = "value of the JFrog username" - value = local.username -} - resource "coder_env" "jfrog_ide_url" { count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id @@ -127,4 +117,22 @@ resource "coder_env" "jfrog_ide_store_connection" { agent_id = var.agent_id name = "JFROG_IDE_STORE_CONNECTION" value = true -} \ No newline at end of file +} + +resource "coder_env" "go_proxy" { + count = lookup(var.package_managers, "go", "") == "" ? 0 : 1 + agent_id = var.agent_id + name = "GOPROXY" + value = "https://${local.username}:${artifactory_scoped_token.me.access_token}@${var.jfrog_host}/artifactory/api/go/${lookup(var.package_managers, "go", "")}" +} + +output "access_token" { + description = "value of the JFrog access token" + value = data.coder_external_auth.jfrog.access_token + sensitive = true +} + +output "username" { + description = "value of the JFrog username" + value = local.username +}