Merge branch 'develop' into prod

.github/workflows/aws-deploy.yaml

@@ -0,0 +1,47 @@
+# reusable template for running Elastic Beanstalk deployments to AWS accounts
+name: aws-deploy
+
+on:
+  workflow_call:
+    inputs:
+      aws-region:
+        type: string
+        default: us-east-1
+      role-to-assume:
+        required: true
+        type: string
+      role-duration-seconds:
+        type: number
+        default: 1800
+      ebcli-command:
+        type: string
+        required: true
+
+jobs:
+  deploy:
+    permissions:
+      id-token: write
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'maven'
+      - name: Build with Maven
+        run: mvn clean package
+      - name: Assume AWS Role
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-region: ${{ inputs.aws-region }}
+          role-to-assume: ${{ inputs.role-to-assume }}
+          role-session-name: GHA-${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ github.run_id }}
+          role-duration-seconds: ${{ inputs.role-duration-seconds }}
+      # Install EB CLI from pypi instead of https://github.com/aws/aws-elastic-beanstalk-cli-setup
+      # due to issue https://github.com/aws/aws-elastic-beanstalk-cli-setup/issues/148
+      - name: Install EB CLI
+        run: pip install PyYAML==5.3.1 awsebcli
+      - name: Deploy to Beanstalk
+        run: ${{ inputs.ebcli-command }}

.github/workflows/main.yaml

@@ -0,0 +1,50 @@
+name: main
+
+on:
+  pull_request:
+    branches: ['*']
+  push:
+    branches: ['*']
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'maven'
+      - name: Build with Maven
+        run: mvn clean package
+
+  # Deploy with EB CLI using work around https://stackoverflow.com/a/53364728
+  deploy-scipooldev:
+    if: github.ref == 'refs/heads/develop'
+    needs: [test]
+    uses: "./.github/workflows/aws-deploy.yaml"
+    with:
+      role-to-assume: "arn:aws:iam::465877038949:role/sagebase-github-oidc-scipool-dev-synapse-login-aws-infra"
+      ebcli-command: "eb deploy --region us-east-1 --verbose --staged --timeout 30 synapse-login-scipooldev"
+  deploy-scipoolprod:
+    if: github.ref == 'refs/heads/prod'
+    needs: [test]
+    uses: "./.github/workflows/aws-deploy.yaml"
+    with:
+      role-to-assume: "arn:aws:iam::237179673806:role/sagebase-github-oidc-scipool-prod-synapse-login-aws-infra"
+      ebcli-command: "eb deploy --region us-east-1 --verbose --staged --timeout 30 synapse-login-scipoolprod"
+  deploy-bmgfki:
+    if: github.ref == 'refs/heads/prod'
+    needs: [test]
+    uses: "./.github/workflows/aws-deploy.yaml"
+    with:
+      role-to-assume: "arn:aws:iam::464102568320:role/sagebase-github-oidc-scipool-prod-synapse-login-aws-infra"
+      ebcli-command: "eb deploy --region us-east-1 --verbose --staged --timeout 30 synapse-login-bmgfki"
+  deploy-strides:
+    if: github.ref == 'refs/heads/prod'
+    needs: [test]
+    uses: "./.github/workflows/aws-deploy.yaml"
+    with:
+      role-to-assume: "arn:aws:iam::423819316185:role/github-oidc-sage-bionetworks"
+      ebcli-command: "eb deploy --region us-east-1 --verbose --staged --timeout 30 synapse-login-strides"

README.md

@@ -106,7 +106,7 @@ eb deploy synapse-login-scipooldev --profile my-aws --region us-east-1
 ```
 
 ## Continuous Integration
-We have configured Travis CI to automatically build, test and deploy the application.
+We have configured Github Action CI to automatically build, test and deploy the application.
 
 ## Contributions
 Contributions are welcome
@@ -129,7 +129,3 @@ prod branch
 
 ## Issues
 * https://sagebionetworks.jira.com/projects/SC
-
-## Builds
-* https://travis-ci.org/Sage-Bionetworks/synapse-login-scipoolprod
-

pom.xml

@@ -15,7 +15,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
-		<synapseVersion>388.0</synapseVersion>
+		<synapseVersion>446.0</synapseVersion>
 	</properties>
 
 	<repositories>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20180813</version>
+			<version>20230227</version>
 		</dependency>
 
 		<!-- http://mvnrepository.com/artifact/commons-io/commons-io -->