From c29997b765f08cbf27b19856daba80cd610c8259 Mon Sep 17 00:00:00 2001 From: Kevin Neufeld Date: Wed, 20 Sep 2023 10:01:46 -0700 Subject: [PATCH] DevOps update to support Java 17 --- .env.template | 1 + .github/workflows/ci-api.yml | 6 +++--- docker-compose.yml | 1 + src/backend/ai-reviewer-api/README.md | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env.template b/.env.template index 4c3fb8e7..4b310738 100644 --- a/.env.template +++ b/.env.template @@ -2,6 +2,7 @@ MVN_PROFILE= SERVER_PORT=8090 # KEYCLOAK CONFIG +KEYCLOAK_REALM_SERVER_URL KEYCLOAK_SSL_REQUIRED=none KEYCLOAK_RESOURCE=ai-reviewer-api KEYCLOAK_AUTH_SERVER_URL= diff --git a/.github/workflows/ci-api.yml b/.github/workflows/ci-api.yml index 52a3dcd6..eafba15f 100644 --- a/.github/workflows/ci-api.yml +++ b/.github/workflows/ci-api.yml @@ -27,7 +27,7 @@ jobs: with: repository: bcgov/spring-boot-starters path: spring-boot-starters - ref: v0.1.8 + ref: v1.0.0 # TODO REMOVE AFTER SFTP IS IN MAVEN CENTRAL - name: Build Spring SFTP Starter @@ -74,10 +74,10 @@ jobs: if: env.GIT_BRANCH == 'refs/heads/main' # Setup Java Environment - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 17 # Run Maven Verify to generate all jacoco reports - name: Build with Maven diff --git a/docker-compose.yml b/docker-compose.yml index 94d42e8a..455126f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,7 @@ services: - CLAMAV_HOST=clamav - CLAMAV_PORT=3310 - CLAMAV_TIMEOUT=50000 + - KEYCLOAK_REALM_SERVER_URL=${KEYCLOAK_REALM_SERVER_URL:-http://keycloak:8080/auth/realms/ai-reviewer} - KEYCLOAK_AUTH_SERVER_URL=${KEYCLOAK_AUTH_SERVER_URL:-http://keycloak:8080/auth} - KEYCLOAK_REALM=${KEYCLOAK_REALM:-ai-reviewer} - KEYCLOAK_RESOURCE=${KEYCLOAK_RESOURCE:-ai-reviewer-api} diff --git a/src/backend/ai-reviewer-api/README.md b/src/backend/ai-reviewer-api/README.md index 90dddfb8..51d023f4 100644 --- a/src/backend/ai-reviewer-api/README.md +++ b/src/backend/ai-reviewer-api/README.md @@ -46,6 +46,7 @@ You should use environment variables to configure the jag ai-reviewer-api | CSO_WEBHOOK_ENDPOINT | String | CSO extract | defaulted to mock service | | CSO_WEBHOOK_USERNAME | String | CSO username | defaulted to mock service | | CSO_WEBHOOK_PASSWORD | String | CSO password | defaulted to mock service | +| KEYCLOAK_REALM_SERVER_URL | String | The keycloak JWT issuer uri | not set by default | | KEYCLOAK_AUTH_SERVER_URL | String | The keycloak auth server URL | not set by default | | KEYCLOAK_REALM | String | The keycloak realm name | not set by default | | KEYCLOAK_RESOURCE | String | The keycloak resource name | not set by default |