diff --git a/jfrog/main.tf b/jfrog/main.tf index ba42876..600e291 100644 --- a/jfrog/main.tf +++ b/jfrog/main.tf @@ -60,9 +60,8 @@ resource "coder_script" "jfrog" { icon = "/icon/jfrog.svg" script = templatefile("${path.module}/run.sh", { JFROG_HOST : var.jfrog_host, - ARTIFACTORY_USERNAME : artifactory_scoped_token.me.username, + ARTIFACTORY_USERNAME : artifactory_scoped_token.me.owner_email, ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token, - ARTIFACTORY_EMAIL : data.coder_workspace.me.owner_email, REPOSITORY_NPM : lookup(var.package_managers, "npm", ""), REPOSITORY_GO : lookup(var.package_managers, "go", ""), REPOSITORY_PYPI : lookup(var.package_managers, "pypi", ""), diff --git a/jfrog/run.sh b/jfrog/run.sh index 3dd9d4e..f4e413d 100644 --- a/jfrog/run.sh +++ b/jfrog/run.sh @@ -17,7 +17,7 @@ else echo "📦 Configuring npm..." jf rt npm-config set registry https://${JFROG_HOST}/artifactory/api/npm/${REPOSITORY_NPM} cat << EOF > ~/.npmrc - email = ${ARTIFACTORY_EMAIL} + email = ${ARTIFACTORY_USERNAME} registry = https://${JFROG_HOST}/artifactory/api/npm/${REPOSITORY_NPM} EOF jf rt curl /api/npm/auth >> .npmrc