From d64a6cfd0af04b31a6133de73c32852a25f0dddc Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Tue, 23 Jul 2024 14:56:14 -0400 Subject: [PATCH 1/2] chore: Sonatype Migration to User Tokens --- cfn/CB-Staging.yml | 1 + codebuild/release/release-prod.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cfn/CB-Staging.yml b/cfn/CB-Staging.yml index 123425cbf..3dd20d22b 100644 --- a/cfn/CB-Staging.yml +++ b/cfn/CB-Staging.yml @@ -239,6 +239,7 @@ Resources: "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-haLIjZ", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-Credentials-WgJanS", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-Team-Account-0tWvZm", + "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-User-Token-zK61bM", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Github/aws-crypto-tools-ci-bot-AGUB3U" ], "Action": "secretsmanager:GetSecretValue" diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 338a2b0b9..84aa8332d 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -9,8 +9,8 @@ env: secrets-manager: GPG_KEY: Maven-GPG-Keys-Release-Credentials:Keyname GPG_PASS: Maven-GPG-Keys-Release-Credentials:Passphrase - SONA_USERNAME: Sonatype-Team-Account:Username - SONA_PASSWORD: Sonatype-Team-Account:Password + SONA_USERNAME: Sonatype-User-Token:username + SONA_PASSWORD: Sonatype-User-Token:password phases: install: From 894305dbb323aaa0c9ad52e0fe3071d2ae8d5ea2 Mon Sep 17 00:00:00 2001 From: Andrew Jewell <107044381+ajewellamz@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:13:37 -0400 Subject: [PATCH 2/2] Update cfn/CB-Staging.yml Co-authored-by: Tony Knapp <5892063+texastony@users.noreply.github.com> --- cfn/CB-Staging.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/cfn/CB-Staging.yml b/cfn/CB-Staging.yml index 3dd20d22b..2779bdfdd 100644 --- a/cfn/CB-Staging.yml +++ b/cfn/CB-Staging.yml @@ -238,7 +238,6 @@ Resources: "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-CI-Credentials-eBrSNB", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-haLIjZ", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-Credentials-WgJanS", - "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-Team-Account-0tWvZm", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-User-Token-zK61bM", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Github/aws-crypto-tools-ci-bot-AGUB3U" ],