Merge remote-tracking branch 'aws/main' into crac

Author: AntonKozlov

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,5 +2,7 @@
 
 *Description of changes:*
 
+*Target (OCI, Managed Runtime, both):*
+
 
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/aws-lambda-java-core.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-core
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-core/**'
   pull_request:
@@ -19,11 +19,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install core with Maven

.github/workflows/aws-lambda-java-events-sdk-transformer.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-events-sdk-transformer
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-events-sdk-transformer/**'
   pull_request:
@@ -19,11 +19,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install events with Maven

.github/workflows/aws-lambda-java-events.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-events
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-events/**'
   pull_request:
@@ -19,11 +19,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install events with Maven

.github/workflows/aws-lambda-java-log4j2.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-log4j2
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-log4j2/**'
   pull_request:
@@ -19,11 +19,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install core with Maven

.github/workflows/aws-lambda-java-runtime-interface-client.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-serialization
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-serialization/**'
   pull_request:
@@ -19,15 +19,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install events with Maven
       run: mvn -B install --file aws-lambda-java-events/pom.xml
-    # Package target module
+
+    # Package and install target module
     - name: Package serialization with Maven
-      run: mvn -B package --file aws-lambda-java-serialization/pom.xml
+      run: mvn -B package install --file aws-lambda-java-serialization/pom.xml
+
+    # Run tests
+    - name: Run tests from aws-lambda-java-tests
+      run: mvn test --file aws-lambda-java-tests/pom.xml

.github/workflows/aws-lambda-java-serialization.yml

@@ -5,7 +5,7 @@ name: Java CI aws-lambda-java-tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
     - 'aws-lambda-java-tests/**'
   pull_request:
@@ -19,11 +19,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: corretto
 
     # Install base module
     - name: Install events with Maven

.github/workflows/aws-lambda-java-tests.yml

@@ -0,0 +1,31 @@
+name: Repo Sync
+
+on:
+  schedule:
+    - cron: "0 8 * * 1-5" # At 08:00 on every day-of-week from Monday through Friday
+  workflow_dispatch:
+
+jobs:
+  repo-sync:
+    name: Repo Sync
+    runs-on: ubuntu-latest
+    env:
+      IS_CONFIGURED: ${{ secrets.SOURCE_REPO != '' }}
+    steps:
+      - uses: actions/checkout@v3
+        if: ${{ env.IS_CONFIGURED == 'true' }}
+      - uses: repo-sync/github-sync@v2
+        name: Sync repo to branch
+        if: ${{ env.IS_CONFIGURED == 'true' }}
+        with:
+          source_repo: ${{ secrets.SOURCE_REPO }}
+          source_branch: main
+          destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: repo-sync/pull-request@v2
+        name: Create pull request
+        if: ${{ env.IS_CONFIGURED == 'true' }}
+        with:
+          source_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
+          destination_branch: main
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/repo-sync.yml

@@ -0,0 +1,74 @@
+# This workflow will be triggered on merge to the main branch if
+# aws-lambda-java-runtime-interface-client package was changed
+#
+# It will publish artifacts to CodeArtifact repository, specified by properties defined in GitHub repo secrets:
+# CODE_ARTIFACT_REPO_ACCOUNT, AWS_REGION, CODE_ARTIFACT_REPO_NAME, CODE_ARTIFACT_DOMAIN
+# and will assume role specified by AWS_ROLE
+#
+# Prerequisite setup:
+# https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services
+
+name: Publish artifact for aws-lambda-java-runtime-interface-client
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+    - 'aws-lambda-java-runtime-interface-client/**'
+
+jobs:
+
+  publish:
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v3
+      with:
+        java-version: 8
+        distribution: corretto
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+      with:
+        install: true
+
+    - name: Available buildx platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+          
+    - name: Test Runtime Interface Client xplatform build - Run 'build' target
+      working-directory: ./aws-lambda-java-runtime-interface-client
+      run: make build
+
+    - name: Issue AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-region: ${{ secrets.AWS_REGION }}
+        role-to-assume: ${{ secrets.AWS_ROLE }}
+        role-session-name: GitHubActionsPublishPackage
+        role-duration-seconds: 900
+
+    - name: Prepare codeartifact properties
+      working-directory: ./aws-lambda-java-runtime-interface-client/ric-dev-environment
+      run: |
+        cat <<EOF > codeartifact-properties.mk
+        CODE_ARTIFACT_REPO_ACCOUNT=${{ secrets.AWS_ACCOUNT }}
+        CODE_ARTIFACT_REPO_REGION=${{ env.AWS_REGION }}
+        CODE_ARTIFACT_REPO_NAME=${{ secrets.CODE_ARTIFACT_REPO_NAME }}
+        CODE_ARTIFACT_DOMAIN=${{ secrets.AWS_CODEARTIFACT_DOMAIN }}
+        EOF
+
+    - name: Publish
+      working-directory: ./aws-lambda-java-runtime-interface-client
+      env:
+        ENABLE_SNAPSHOT: ${{ secrets.ENABLE_SNAPSHOT }}
+      run: make publish