ci: compile with openjdk11, validate against other JDKs

buildspec.yml

@@ -1,30 +1,89 @@
 version: 0.2
 
+# TODO: Replace/Augment build-graph with build-matrix
+# Note: It's possible that 9 builds will be running concurrently with the current arrangement
+
 batch:
   fast-fail: false
-  build-list:
-    - identifier: openjdk8
-      buildspec: codebuild/openjdk8.yml
+  build-graph:
+    - identifier: static_analysis
+      buildspec: codebuild/ci/static-analysis.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+    ######### Start Vector tests #########
+    - identifier: vectors_ci_openjdk8
+      buildspec: codebuild/ci/vectors-ci.yml
       env:
-        env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          JAVA_ENV_VERSION: openjdk8
         image: aws/codebuild/standard:3.0
-    - identifier: openjdk11
-      buildspec: codebuild/openjdk11.yml
+    - identifier: vectors_ci_openjdk11
+      buildspec: codebuild/ci/vectors-ci.yml
       env:
-        env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          JAVA_ENV_VERSION: openjdk11
         image: aws/codebuild/standard:3.0
-    - identifier: corretto8
-      buildspec: codebuild/corretto8.yml
+    - identifier: vectors_ci_corretto8
+      buildspec: codebuild/ci/vectors-ci.yml
       env:
-        env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          JAVA_ENV_VERSION: corretto8
         image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
-    - identifier: corretto11
-      buildspec: codebuild/corretto11.yml
+    - identifier: vectors_ci_corretto11
+      buildspec: codebuild/ci/vectors-ci.yml
       env:
-        env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          JAVA_ENV_VERSION: corretto11
         image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
-    - identifier: static_analysis
-      buildspec: codebuild/static-analysis.yml
+    ######### End Vector tests #########
+    - identifier: release_ci
+      buildspec: codebuild/ci/release-ci.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        image: aws/codebuild/standard:3.0
+    ######### Start JAR Smoke tests #########
+    - identifier: validate_ci_openjdk8
+      depend-on:
+        - release_ci
+      buildspec: codebuild/ci/validate-ci.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: openjdk8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_ci_openjdk11
+      depend-on:
+        - release_ci
+      buildspec: codebuild/ci/validate-ci.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+        variables:
+          JAVA_ENV_VERSION: openjdk11
+          JAVA_NUMERIC_VERSION: 11
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_ci_corretto8
+      depend-on:
+        - release_ci
+      buildspec: codebuild/ci/validate-ci.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+        variables:
+          JAVA_ENV_VERSION: corretto8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+    - identifier: validate_ci_corretto11
+      depend-on:
+        - release_ci
+      buildspec: codebuild/ci/validate-ci.yml
       env:
-        env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+        variables:
+          JAVA_ENV_VERSION: corretto11
+          JAVA_NUMERIC_VERSION: 11
         image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+    ######### End JAR Smoke tests #########

codebuild/ci/release-ci.yml

@@ -0,0 +1,62 @@
+version: 0.2
+
+env:
+  variables:
+    REGION: us-east-1
+    DOMAIN: crypto-tools-internal
+    REPOSITORY: java-esdk-ci
+    NAMESPACE: com.amazonaws
+    PACKAGE: aws-encryption-sdk-java
+  parameter-store:
+    ACCOUNT: /CodeBuild/AccountId
+  secrets-manager:
+    GPG_KEY: Maven-GPG-Keys-Credentials:Keyname
+    GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase
+
+phases:
+  install:
+    runtime-versions:
+      java: openjdk11
+  pre_build:
+    commands:
+      - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml
+      - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain $DOMAIN --domain-owner $ACCOUNT --query authorizationToken --output text --region ${REGION})
+      - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY}
+      - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
+      - tar -xvf ~/mvn_gpg.tgz -C ~
+  build:
+    commands:
+      - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION"
+#      See https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
+      - echo "Setting version in POM to $VERSION_HASH"
+      - mvn versions:set -DnewVersion="$VERSION_HASH" --no-transfer-progress
+      - echo "Version is now $(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')"
+      - |
+        mvn deploy \
+          -PpublishingCodeArtifact \
+          -Dmaven.test.skip=true \
+          -DperformRelease \
+          -Dgpg.homedir="$HOME/mvn_gpg" \
+          -DautoReleaseAfterClose=true \
+          -Dgpg.keyname="$GPG_KEY" \
+          -Dgpg.passphrase="$GPG_PASS" \
+          -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
+          -DaltDeploymentRepository=codeartifact::default::$CODEARTIFACT_REPO_URL \
+          --no-transfer-progress \
+          -T 8 \
+          -s $SETTINGS_FILE
+    finally:
+      - |
+        if expr ${CODEBUILD_BUILD_SUCCEEDING} != 1; then
+          echo "An error occured while building and uploading $REPOSITORY."
+          echo "Did a previous build already upload $VERSION_HASH to $REPOSITORY?"
+          echo "Try deleting $VERSION_HASH from $REPOSITORY and restart"
+          echo "Delete Package Version Command \n
+            aws codeartifact delete-package-versions --domain $DOMAIN \
+              --repository $REPOSITORY \
+              --format maven \
+              --namespace $NAMESPACE \
+              --package $PACKAGE \
+              --versions $VERSION_HASH \
+              --region $REGION";
+        fi

codebuild/ci/settings.xml

@@ -0,0 +1,25 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                                  http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>codeartifact</id>
+      <username>aws</username>
+      <password>${codeartifact.token}</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <id>codeartifact</id>
+      <repositories>
+        <repository>
+          <id>codeartifact</id>
+          <name>codeartifact</name>
+          <url>${codeartifact.url}</url> <!-- passed via command line to avoid hardcoding it here -->
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</settings>

codebuild/static-analysis.yml → codebuild/ci/static-analysis.yml

@@ -7,5 +7,5 @@ phases:
       java: corretto11
   build:
     commands:
-      - mvn com.coveo:fmt-maven-plugin:check
+      - mvn -T 4 -ntp com.coveo:fmt-maven-plugin:check
       - ./util/test-conditions.sh

codebuild/ci/validate-ci.yml

@@ -0,0 +1,38 @@
+version: 0.2
+
+env:
+  variables:
+    REGION: us-east-1
+    DOMAIN: crypto-tools-internal
+    REPOSITORY: java-esdk-ci
+  parameter-store:
+    ACCOUNT: /CodeBuild/AccountId
+
+phases:
+  install:
+    commands:
+      - pip install awscli
+    runtime-versions:
+      java: $JAVA_ENV_VERSION
+  pre_build:
+    commands:
+      - VERSION_HASH="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)-$CODEBUILD_RESOLVED_SOURCE_VERSION"
+      - export SETTINGS_FILE=$(pwd)/codebuild/ci/settings.xml
+      - git clone https://github.com/aws-samples/busy-engineers-document-bucket.git
+      - cd busy-engineers-document-bucket/exercises/java/encryption-context-complete
+      - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain $DOMAIN --domain-owner $ACCOUNT --query authorizationToken --output text --region ${REGION})
+      - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY}
+  build:
+    commands:
+      - |
+        mvn verify \
+          -Pcodeartifact \
+          -Dcheckstyle.skip \
+          -Desdk.version=$VERSION_HASH \
+          -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
+          -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \
+          -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
+          -Dcodeartifact.url=$CODEARTIFACT_REPO_URL \
+          --no-transfer-progress \
+          -T 4 \
+          -s $SETTINGS_FILE

codebuild/ci/vectors-ci.yml

@@ -0,0 +1,9 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      java: $JAVA_ENV_VERSION
+  build:
+    commands:
+      - mvn install -T 8 -Dgpg.skip=true -ntp "-DtestVectorZip=file://$CODEBUILD_SRC_DIR/src/test/resources/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0-mrks.zip"

codebuild/release/release-prod.yml

@@ -36,6 +36,7 @@ phases:
           -Dgpg.passphrase="$GPG_PASS" \
           -Dsonatype.username="$SONA_USERNAME" \
           -Dsonatype.password="$SONA_PASSWORD" \
+          --no-transfer-progress \
           -s $SETTINGS_FILE
 
 

codebuild/release/release-staging.yml

@@ -42,6 +42,7 @@ phases:
           -Dgpg.passphrase="$GPG_PASS" \
           -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
           -DaltDeploymentRepository=codeartifact::default::$CODEARTIFACT_REPO_URL \
+          --no-transfer-progress \
           -s $SETTINGS_FILE
 
 batch:

codebuild/release/validate-prod.yml

@@ -15,4 +15,5 @@ phases:
           -Dcheckstyle.skip \
           -Desdk.version=$VERSION \
           -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
-          -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION
+          -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \
+          --no-transfer-progress

codebuild/release/validate-staging.yml

@@ -32,5 +32,6 @@ phases:
           -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \
           -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
           -Dcodeartifact.url=$CODEARTIFACT_REPO_URL \
+          --no-transfer-progress \
           -s $SETTINGS_FILE
 

pom.xml

@@ -129,6 +129,7 @@
                     <maxmemory>1024m</maxmemory>
                     <doclint>none</doclint>
                     <source>8</source>
+                    <quiet>true</quiet>
                 </configuration>
             </plugin>