diff --git a/jfrog-oauth/main.tf b/jfrog-oauth/main.tf index 0df4ae5..b6f1583 100644 --- a/jfrog-oauth/main.tf +++ b/jfrog-oauth/main.tf @@ -67,6 +67,7 @@ resource "coder_script" "jfrog" { JFROG_URL : var.jfrog_url, JFROG_HOST : replace(var.jfrog_url, "https://", ""), ARTIFACTORY_USERNAME : local.username, + ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, ARTIFACTORY_ACCESS_TOKEN : data.coder_external_auth.jfrog.access_token, REPOSITORY_NPM : lookup(var.package_managers, "npm", ""), REPOSITORY_GO : lookup(var.package_managers, "go", ""), diff --git a/jfrog-oauth/run.sh b/jfrog-oauth/run.sh index a8a4c4e..90b5bba 100644 --- a/jfrog-oauth/run.sh +++ b/jfrog-oauth/run.sh @@ -26,7 +26,7 @@ else echo "📦 Configuring npm..." jf npmc --global --repo-resolve "${REPOSITORY_NPM}" cat <~/.npmrc -email = ${ARTIFACTORY_USERNAME} +email = ${ARTIFACTORY_EMAIL} registry = ${JFROG_URL}/artifactory/api/npm/${REPOSITORY_NPM} EOF jf rt curl /api/npm/auth >>~/.npmrc diff --git a/jfrog-token/main.tf b/jfrog-token/main.tf index 3a69512..a586148 100644 --- a/jfrog-token/main.tf +++ b/jfrog-token/main.tf @@ -79,7 +79,8 @@ resource "coder_script" "jfrog" { script = templatefile("${path.module}/run.sh", { JFROG_URL : var.jfrog_url, JFROG_HOST : replace(var.jfrog_url, "https://", ""), - ARTIFACTORY_USERNAME : data.coder_workspace.me.owner_email, + ARTIFACTORY_USERNAME : local.username, + ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token, REPOSITORY_NPM : lookup(var.package_managers, "npm", ""), REPOSITORY_GO : lookup(var.package_managers, "go", ""), diff --git a/jfrog-token/run.sh b/jfrog-token/run.sh index a8a4c4e..90b5bba 100644 --- a/jfrog-token/run.sh +++ b/jfrog-token/run.sh @@ -26,7 +26,7 @@ else echo "📦 Configuring npm..." jf npmc --global --repo-resolve "${REPOSITORY_NPM}" cat <~/.npmrc -email = ${ARTIFACTORY_USERNAME} +email = ${ARTIFACTORY_EMAIL} registry = ${JFROG_URL}/artifactory/api/npm/${REPOSITORY_NPM} EOF jf rt curl /api/npm/auth >>~/.npmrc