diff --git a/jfrog-token/main.tf b/jfrog-token/main.tf index 7aa1de0..37e7629 100644 --- a/jfrog-token/main.tf +++ b/jfrog-token/main.tf @@ -77,7 +77,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://", "") } # Configure the Artifactory provider @@ -104,7 +105,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 : artifactory_scoped_token.me.access_token, @@ -116,17 +117,6 @@ resource "coder_script" "jfrog" { run_on_start = true } -output "access_token" { - description = "value of the JFrog access token" - value = artifactory_scoped_token.me.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 @@ -161,3 +151,21 @@ resource "coder_env" "jfrog_ide_store_connection" { name = "JFROG_IDE_STORE_CONNECTION" value = true } + +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 = artifactory_scoped_token.me.access_token + sensitive = true +} + +output "username" { + description = "value of the JFrog username" + value = local.username +}