diff --git a/.drone.yml b/.drone.yml index b16cf402e0e..cc834b4b2cd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4451,6 +4451,12 @@ get: kind: secret name: azure_tenant --- +get: + name: token + path: infra/data/ci/grafana-release-eng/npm +kind: secret +name: npm_token +--- get: name: public-key-b64 path: infra/data/ci/packages-publish/gpg @@ -4542,6 +4548,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: 12ff5339f60d173517d4e7480de10b4c925e57a87279d610ffac3e34450efe72 +hmac: 728c159587c47f2df5132626abb56674bc7271f227a930893783926ffe645157 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index b2655c0f955..13f5f72efda 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -55,6 +55,7 @@ load( "scripts/drone/vault.star", "from_secret", "gcp_upload_artifacts_key", + "npm_token", "prerelease_bucket", ) load( @@ -124,7 +125,7 @@ def release_npm_packages_step(): ], "failure": "ignore", "environment": { - "NPM_TOKEN": from_secret("npm_token"), + "NPM_TOKEN": from_secret(npm_token), }, "commands": ["./bin/build artifacts npm release --tag ${DRONE_TAG}"], } diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index c17ae4b6fb1..e2ab9df888d 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -8,6 +8,7 @@ load( "gcp_grafanauploads", "gcp_grafanauploads_base64", "gcp_upload_artifacts_key", + "npm_token", "prerelease_bucket", ) load( @@ -1140,7 +1141,7 @@ def release_canary_npm_packages_step(trigger = None): "image": images["build_image"], "depends_on": end_to_end_tests_deps(), "environment": { - "NPM_TOKEN": from_secret("npm_token"), + "NPM_TOKEN": from_secret(npm_token), }, "commands": [ "./scripts/publish-npm-packages.sh --dist-tag 'canary' --registry 'https://registry.npmjs.org'", diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star index ad98a74996f..eb7c9944dca 100644 --- a/scripts/drone/vault.star +++ b/scripts/drone/vault.star @@ -17,6 +17,8 @@ rgm_destination = "destination" rgm_github_token = "github_token" rgm_dagger_token = "dagger_token" +npm_token = "npm_token" + def from_secret(secret): return {"from_secret": secret} @@ -64,6 +66,11 @@ def secrets(): "infra/data/ci/datasources/cpp-azure-resourcemanager-credentials", "tenant_id", ), + vault_secret( + npm_token, + "infra/data/ci/grafana-release-eng/npm", + "token", + ), # Package publishing vault_secret( "packages_gpg_public_key",