Skip to content

Commit

Permalink
Use sonatype token (#776)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TingDaoK
TingDaoK authored Apr 9, 2024
1 parent 3de687a commit 10b0791
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion codebuild/cd/deploy-snapshot-android.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 6 additions & 4 deletions codebuild/cd/deploy-snapshot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions codebuild/cd/promote-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-auth
Submodule aws-c-auth updated 10 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-cal
Submodule aws-c-cal updated 6 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-common
Submodule aws-c-common updated 20 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-io
Submodule aws-c-io updated 6 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-s3
Submodule aws-c-s3 updated 25 files
+5 −2 .github/workflows/ci.yml
+1 −1 .github/workflows/clang-format.yml
+1 −1 .github/workflows/codecov.yml
+12 −0 include/aws/s3/private/s3_client_impl.h
+32 −3 include/aws/s3/private/s3_meta_request_impl.h
+1 −1 include/aws/s3/private/s3_platform_info.h
+6 −0 include/aws/s3/private/s3_util.h
+8 −0 include/aws/s3/s3.h
+64 −1 include/aws/s3/s3_client.h
+5 −1 source/s3.c
+18 −3 source/s3_auto_ranged_get.c
+7 −0 source/s3_auto_ranged_put.c
+97 −4 source/s3_client.c
+10 −12 source/s3_endpoint.c
+31 −1 source/s3_endpoint_resolver/aws_s3_endpoint_rule_set.c
+229 −31 source/s3_meta_request.c
+10 −2 source/s3_platform_info.c
+16 −7 source/s3_util.c
+21 −0 tests/CMakeLists.txt
+9 −0 tests/mock_s3_server/GetObject/get_object_long_error.json
+3 −1 tests/mock_s3_server/mock_s3_server.py
+652 −0 tests/s3_asyncwrite_tests.c
+60 −9 tests/s3_data_plane_tests.c
+156 −0 tests/s3_many_async_uploads_without_data_test.c
+44 −0 tests/s3_mock_server_tests.c
2 changes: 1 addition & 1 deletion crt/s2n
Submodule s2n updated from 80a691 to 38d769

0 comments on commit 10b0791

Please sign in to comment.