Use sonatype token (#776)

awslabs · Apr 9, 2024 · 10b0791 · 10b0791
1 parent 3de687a
commit 10b0791
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/codebuild/cd/deploy-snapshot-android.sh b/codebuild/cd/deploy-snapshot-android.sh
@@ -8,6 +8,6 @@ cd ./android
 
 GPG_KEY=$(cat /tmp/aws-sdk-common-runtime.key.asc)
 # Publish to nexus
-../gradlew -PsigningKey=$"$GPG_KEY" -PsigningPassword=$GPG_PASSPHRASE -PsonatypeUsername='aws-sdk-common-runtime' -PsonatypePassword=$ST_PASSWORD publishToAwsNexus closeAwsNexusStagingRepository | tee /tmp/android_deploy.log
+../gradlew -PsigningKey=$"$GPG_KEY" -PsigningPassword=$GPG_PASSPHRASE -PsonatypeUsername=$ST_USERNAME -PsonatypePassword=$ST_PASSWORD publishToAwsNexus closeAwsNexusStagingRepository | tee /tmp/android_deploy.log
 # Get the staging repository id and save it
 cat /tmp/android_deploy.log | grep "Created staging repository" | cut -d\' -f2 | tee /tmp/android_repositoryId.txt
diff --git a/codebuild/cd/deploy-snapshot.yml b/codebuild/cd/deploy-snapshot.yml
@@ -32,14 +32,16 @@ phases:
       - ls -alR $CODEBUILD_SRC_DIR/aws-crt-java/target
       # install settings.xml to ~/.m2/settings.xml
       - mkdir -p $HOME/.m2
-      - aws s3 cp s3://code-sharing-aws-crt/aws-crt-java.settings.xml $HOME/.m2/settings.xml
+      - aws s3 cp s3://code-sharing-aws-crt/aws-crt-java.settings.token.xml $HOME/.m2/settings.xml
       # import gpg key
       - aws s3 cp s3://code-sharing-aws-crt/aws-sdk-common-runtime.key.asc /tmp/aws-sdk-common-runtime.key.asc
       - gpg --import /tmp/aws-sdk-common-runtime.key.asc
       - export GPG_PASSPHRASE=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id aws-sdk-common-runtime.key.asc/password | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
-      - export ST_PASSWORD=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/Password | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
-      # Use the password from secret manager to update the settings
-      - sed -i 's/password-to-replace/'"$ST_PASSWORD"'/g' $HOME/.m2/settings.xml
+      - export ST_USERNAME=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/token | cut -f2 -d":" | cut -f1 -d"," | sed -e 's/[\\\"\}]//g')
+      - export ST_PASSWORD=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/token | cut -f3 -d":" | sed -e 's/[\\\"\}]//g')
+      # Use the username and password from secret manager to update the settings
+      - sed -i 's|token-username|'"$ST_USERNAME"'|g' $HOME/.m2/settings.xml
+      - sed -i 's|token-password|'"$ST_PASSWORD"'|g' $HOME/.m2/settings.xml
   build:
     commands:
       - cd $CODEBUILD_SRC_DIR/aws-crt-java

diff --git a/codebuild/cd/promote-release.yml b/codebuild/cd/promote-release.yml
@@ -16,16 +16,18 @@ phases:
       - echo PKG_VERSION=$PKG_VERSION
       # install settings.xml to ~/.m2/settings.xml
       - mkdir -p $HOME/.m2
-      - aws s3 cp s3://code-sharing-aws-crt/aws-crt-java.settings.xml $HOME/.m2/settings.xml
+      - aws s3 cp s3://code-sharing-aws-crt/aws-crt-java.settings.token.xml $HOME/.m2/settings.xml
       # import gpg key
       - aws s3 cp s3://code-sharing-aws-crt/aws-sdk-common-runtime.key.asc /tmp/aws-sdk-common-runtime.key.asc
       - gpg --import /tmp/aws-sdk-common-runtime.key.asc
       - export GPG_PASSPHRASE=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id aws-sdk-common-runtime.key.asc/password | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
       - export REPOSITORY_ID=$(cat $CODEBUILD_SRC_DIR_aws_crt/repositoryId.txt)
       - export ANDROID_REPOSITORY_ID=$(cat $CODEBUILD_SRC_DIR_aws_crt/android_repositoryId.txt)
-      - export ST_PASSWORD=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/Password | cut -f2 -d":" | sed -e 's/[\\\"\}]//g')
-      # Use the password from secret manager to update the settings
-      - sed -i 's/password-to-replace/'"$ST_PASSWORD"'/g' $HOME/.m2/settings.xml
+      - export ST_USERNAME=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/token | cut -f2 -d":" | cut -f1 -d"," | sed -e 's/[\\\"\}]//g')
+      - export ST_PASSWORD=$(aws --query "SecretString" secretsmanager get-secret-value --secret-id Sonatype/JIRA/token | cut -f3 -d":" | sed -e 's/[\\\"\}]//g')
+      # Use the username and password from secret manager to update the settings
+      - sed -i 's|token-username|'"$ST_USERNAME"'|g' $HOME/.m2/settings.xml
+      - sed -i 's|token-password|'"$ST_PASSWORD"'|g' $HOME/.m2/settings.xml
   build:
     commands:
       - cd $CODEBUILD_SRC_DIR/aws-crt-java

diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/s2n b/crt/s2n
+22 −0		source/credentials_provider_default_chain.c
+3 −0		source/credentials_provider_ecs.c
+11 −0		source/credentials_provider_environment.c
+25 −0		source/credentials_provider_imds.c
+14 −1		source/credentials_provider_profile.c
+5 −0		source/credentials_provider_sts_web_identity.c
+0 −12		tests/aws-signing-test-suite/v4/get-vanilla-query-order-key/context.json
+0 −2		tests/aws-signing-test-suite/v4/get-vanilla-query-order-key/request.txt
+0 −12		tests/aws-signing-test-suite/v4/get-vanilla-query-order-value/context.json
+0 −2		tests/aws-signing-test-suite/v4/get-vanilla-query-order-value/request.txt
+22 −5		.github/workflows/ci.yml
+1 −9		bin/produce_x_platform_fuzz_corpus/CMakeLists.txt
+1 −9		bin/run_x_platform_fuzz_corpus/CMakeLists.txt
+1 −9		bin/sha256_profile/CMakeLists.txt
+16 −2		builder.json
+6 −3		source/windows/bcrypt_aes.c
+10 −10		CMakeLists.txt
+1 −1		README.md
+14 −0		bin/system_info/print_system_info.c
+13 −0		cmake/AwsFeatureTests.cmake
+73 −24		cmake/AwsSIMD.cmake
+64 −16		include/aws/common/atomics_msvc.inl
+7 −0		include/aws/common/config.h.in
+2 −0		include/aws/common/cpuid.h
+5 −2		include/aws/common/date_time.h
+1 −1		include/aws/common/package.h
+7 −1		source/arch/arm/auxv/cpuid.c
+40 −0		source/arch/arm/darwin/cpuid.c
+11 −2		source/arch/arm/windows/cpuid.c
+2 −2		source/arch/intel/cpuid.c
+186 −238		source/date_time.c
+16 −3		source/posix/thread.c
+2 −5		source/string.c
+2 −2		tests/CMakeLists.txt
+51 −62		tests/date_time_test.c
+34 −0		tests/thread_test.c
+20 −1		.github/workflows/ci.yml
+1 −1		builder.json
+4 −0		include/aws/io/channel.h
+0 −12		include/aws/io/tls_channel_handler.h
+1 −1		source/darwin/secure_transport_tls_channel_handler.c
+2 −2		tests/CMakeLists.txt