diff --git a/codebuild/cd/deploy-snapshot-android.sh b/codebuild/cd/deploy-snapshot-android.sh index 8e44a6512..c5ae2b9fb 100755 --- 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 index 1b93f34e1..b43e3ccb4 100644 --- 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 index 41cf00287..9403d6f8f 100644 --- 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 index 0d2aa00ae..0de6b271b 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 0d2aa00ae70c699fcb14d0338c1b07a58b9eb24b +Subproject commit 0de6b271bdfb447853d1af0eced39faed7f746f3 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 56f0a79ce..314fc5558 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 56f0a79ceb10f2efcf92f525ace717f84d8c8a11 +Subproject commit 314fc555846ac7bf2cc68a117c99a6af26f7043e diff --git a/crt/aws-c-common b/crt/aws-c-common index 15a25349d..ae7b067d9 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 15a25349d59852e2655c0920835644f2eb948d77 +Subproject commit ae7b067d9274d2d3faa1d3ae42d489a6986661f7 diff --git a/crt/aws-c-io b/crt/aws-c-io index 5b89f50a8..bf2d72230 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 5b89f50a813271d68b8efe58f0515b480b1356c7 +Subproject commit bf2d72230727f02eddb5b16c4e6c5ac5a3f203a7 diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 59569e317..3334843eb 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 59569e317a4ef84506c39b798875f4f169a796fe +Subproject commit 3334843eb4e0e56c2565e481b2ef853d1cadde78 diff --git a/crt/s2n b/crt/s2n index 80a691335..38d769c9c 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 80a691335f6ec4846634952cb1a9bf1327e4b953 +Subproject commit 38d769c9cd079b4bbe250032acdc7fdafbfaab51