generated from bcgov/quickstart-openshift
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/multiSelectOpeningSearchFeatures
- Loading branch information
Showing
28 changed files
with
1,211 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| name: .Deploys | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| ### Required | ||
| # Nothing! Only `secrets: inherit` is required | ||
|
|
||
| ### Typical / recommended | ||
| environment: | ||
| description: GitHub/OpenShift environment; usually PR number, test or prod | ||
| default: '' | ||
| required: false | ||
| type: string | ||
| tag: | ||
| description: Container tag; usually PR number | ||
| default: ${{ github.event.number }} | ||
| required: false | ||
| type: string | ||
| target: | ||
| description: Deployment target; usually PR number, test or prod | ||
| default: ${{ github.event.number }} | ||
| required: false | ||
| type: string | ||
|
|
||
| outputs: | ||
| run_tests: | ||
| description: Run Cypress tests if the core apps have changed (excludes sync) | ||
| value: ${{ jobs.init.outputs.deploy_core }} | ||
|
|
||
| jobs: | ||
| init: | ||
| name: Deploy (init) | ||
| environment: ${{ inputs.environment }} | ||
| outputs: | ||
| fam-modded-zone: ${{ steps.fam-modded-zone.outputs.fam-modded-zone }} | ||
| deploy_core: ${{ steps.triggers.outputs.core }} | ||
| deploy_sync: ${{ steps.triggers.outputs.sync }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| # Check triggers (omitted or matched) | ||
| - name: Check core triggers | ||
| uses: bcgov-nr/action-diff-triggers@v0.2.0 | ||
| id: check_core | ||
| with: | ||
| triggers: ('backend/' 'common/' 'database/' 'frontend/' 'oracle-api/') | ||
|
|
||
| - name: Check sync triggers | ||
| uses: bcgov-nr/action-diff-triggers@v0.2.0 | ||
| id: check_sync | ||
| with: | ||
| triggers: ('common/' 'sync/') | ||
|
|
||
| # Simplify triggers | ||
| - name: Simplify triggers | ||
| id: triggers | ||
| run: | | ||
| echo "core=${{ github.event_name != 'pull_request' || steps.check_core.outputs.triggered == 'true' }}" >> $GITHUB_OUTPUT | ||
| echo "sync=${{ github.event_name != 'pull_request' || steps.check_sync.outputs.triggered == 'true' }}" >> $GITHUB_OUTPUT | ||
| - name: FAM routing | ||
| id: fam-modded-zone | ||
| if: steps.triggers.outputs.core == 'true' | ||
| run: | | ||
| if [ ${{ github.event_name }} == 'pull_request' ]; then | ||
| echo "fam-modded-zone=$(( ${{ inputs.target }} % 50 ))" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "fam-modded-zone=${{ inputs.target }}" >> $GITHUB_OUTPUT | ||
| fi | ||
| - name: OpenShift Init | ||
| if: steps.triggers.outputs.core == 'true' || steps.triggers.outputs.sync == 'true' | ||
| uses: bcgov-nr/action-deployer-openshift@v3.0.1 | ||
| with: | ||
| oc_namespace: ${{ vars.OC_NAMESPACE }} | ||
| oc_server: ${{ vars.OC_SERVER }} | ||
| oc_token: ${{ secrets.OC_TOKEN }} | ||
| file: common/openshift.init.yml | ||
| overwrite: true | ||
| parameters: | ||
| -p ZONE=${{ inputs.target }} | ||
| -p DB_PASSWORD='${{ secrets.DB_PASSWORD }}' | ||
| -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}' | ||
| -p ORACLE_PASSWORD='${{ secrets.ORACLE_PASSWORD }}' | ||
| -p ORACLE_SERVICE='${{ vars.ORACLE_SERVICE }}' | ||
| -p ORACLE_USER='${{ vars.ORACLE_USER }}' | ||
| -p ORACLE_SYNC_USER='${{ vars.ORACLE_SYNC_USER }}' | ||
| -p ORACLE_SYNC_PASSWORD='${{ secrets.ORACLE_SYNC_PASSWORD }}' | ||
| -p ORACLE_CERT_SECRET='${{ secrets.ORACLE_CERT_SECRET }}' | ||
| -p ORACLE_HOST='${{ vars.ORACLE_HOST }}' | ||
| -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ secrets.VITE_USER_POOLS_WEB_CLIENT_ID }} | ||
|
|
||
| - name: Database | ||
| if: steps.triggers.outputs.core == 'true' || steps.triggers.outputs.sync == 'true' | ||
| uses: bcgov-nr/action-deployer-openshift@v3.0.1 | ||
| with: | ||
| oc_namespace: ${{ vars.OC_NAMESPACE }} | ||
| oc_server: ${{ vars.OC_SERVER }} | ||
| oc_token: ${{ secrets.OC_TOKEN }} | ||
| file: common/openshift.database.yml | ||
| overwrite: false | ||
| parameters: | ||
| -p ZONE=${{ inputs.target }} | ||
| ${{ github.event_name == 'pull_request' && '-p DB_PVC_SIZE=192Mi' || '' }} | ||
| ${{ github.event_name == 'pull_request' && '-p MEMORY_REQUEST=100Mi' || '' }} | ||
| ${{ github.event_name == 'pull_request' && '-p MEMORY_LIMIT=200Mi' || '' }} | ||
|
|
||
| deploy: | ||
| name: Deploy | ||
| environment: ${{ inputs.environment }} | ||
| if: needs.init.outputs.deploy_core == 'true' | ||
| needs: [init] | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 10 | ||
| strategy: | ||
| matrix: | ||
| name: [backend, frontend, oracle-api] | ||
| include: | ||
| - name: backend | ||
| file: backend/openshift.deploy.yml | ||
| overwrite: true | ||
| parameters: | ||
| -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.ca-central-1.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }} | ||
| verification_path: "health" | ||
| - name: frontend | ||
| file: frontend/openshift.deploy.yml | ||
| overwrite: true | ||
| parameters: | ||
| -p FAM_MODDED_ZONE=${{ needs.init.outputs.fam-modded-zone }} | ||
| -p VITE_SPAR_BUILD_VERSION=snapshot-${{ inputs.target || github.event.number }} | ||
| -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }} | ||
| - name: oracle-api | ||
| file: oracle-api/openshift.deploy.yml | ||
| overwrite: true | ||
| parameters: | ||
| -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.ca-central-1.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }} | ||
| ${{ github.event_name == 'pull_request' && '-p CPU_LIMIT=100m' || '' }} | ||
| ${{ inputs.target == 'prod' && '-p MIN_REPLICAS=3' || '' }} | ||
| ${{ inputs.target == 'prod' && '-p MAX_REPLICAS=5' || '' }} | ||
| verification_path: "actuator/health" | ||
|
|
||
| steps: | ||
| - uses: bcgov-nr/action-deployer-openshift@v3.0.1 | ||
| id: deploys | ||
| with: | ||
| file: ${{ matrix.file }} | ||
| oc_namespace: ${{ vars.OC_NAMESPACE }} | ||
| oc_server: ${{ vars.OC_SERVER }} | ||
| oc_token: ${{ secrets.OC_TOKEN }} | ||
| overwrite: ${{ matrix.overwrite }} | ||
| parameters: | ||
| -p TAG=${{ inputs.tag }} | ||
| -p ZONE=${{ inputs.target }} | ||
| ${{ github.event_name == 'pull_request' && '-p MIN_REPLICAS=1' || '' }} | ||
| ${{ github.event_name == 'pull_request' && '-p MAX_REPLICAS=1' || '' }} | ||
| ${{ matrix.parameters }} | ||
| verification_path: ${{ matrix.verification_path }} | ||
| verification_retry_attempts: 5 | ||
| verification_retry_seconds: 20 | ||
|
|
||
| # ETL testing will only run on Pull Requests if the sync/ directory is modified | ||
| sync: | ||
| name: Deploy (sync) | ||
| environment: ${{ inputs.environment }} | ||
| if: needs.init.outputs.deploy_sync == 'true' | ||
| needs: [init] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Deploy (sync) | ||
| uses: bcgov-nr/action-deployer-openshift@v3.0.1 | ||
| with: | ||
| file: sync/openshift.deploy.yml | ||
| oc_namespace: ${{ vars.OC_NAMESPACE }} | ||
| oc_server: ${{ vars.OC_SERVER }} | ||
| oc_token: ${{ secrets.OC_TOKEN }} | ||
| overwrite: true | ||
| parameters: | ||
| -p TAG=${{ inputs.tag }} | ||
| -p ZONE=${{ inputs.target }} | ||
| ${{ github.event_name == 'pull_request' && '-p TEST_MODE=true' || '' }} | ||
|
|
||
|
|
||
| - name: Override OpenShift version | ||
| if: github.event_name == 'pull_request' | ||
| env: | ||
| OC: https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.13/openshift-client-linux.tar.gz | ||
| run: | | ||
| # Download and extract with retry, continuing on error | ||
| (wget ${{ env.OC }} -qcO - | tar -xzvf - oc)|| !! || true | ||
| oc version | ||
| working-directory: /usr/local/bin/ | ||
|
|
||
| - name: Run sync ETL | ||
| if: github.event_name == 'pull_request' | ||
| run: ./sync/oc_run.sh ${{ inputs.tag }} ${{ secrets.oc_token }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
...c/main/java/ca/bc/gov/restapi/results/common/exception/UserFavoriteNotFoundException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package ca.bc.gov.restapi.results.common.exception; | ||
|
|
||
| public class UserFavoriteNotFoundException extends NotFoundGenericException { | ||
|
|
||
| public UserFavoriteNotFoundException() { | ||
| super("UserFavoriteEntity"); | ||
| } | ||
|
|
||
| } |
40 changes: 40 additions & 0 deletions
40
...nd/src/main/java/ca/bc/gov/restapi/results/postgres/endpoint/OpeningFavoriteEndpoint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package ca.bc.gov.restapi.results.postgres.endpoint; | ||
|
|
||
| import ca.bc.gov.restapi.results.postgres.service.UserOpeningService; | ||
| import java.util.List; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PutMapping; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.ResponseStatus; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| @RequestMapping(path = "/api/openings/favorites", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @RequiredArgsConstructor | ||
| public class OpeningFavoriteEndpoint { | ||
|
|
||
| private final UserOpeningService userOpeningService; | ||
|
|
||
| @GetMapping | ||
| public List<Long> getFavorites() { | ||
| return userOpeningService.listUserFavoriteOpenings(); | ||
| } | ||
|
|
||
| @PutMapping("/{id}") | ||
| @ResponseStatus(HttpStatus.ACCEPTED) | ||
| public void addToFavorites(@PathVariable Long id) { | ||
| userOpeningService.addUserFavoriteOpening(id); | ||
| } | ||
|
|
||
| @DeleteMapping("/{id}") | ||
| @ResponseStatus(HttpStatus.NO_CONTENT) | ||
| public void removeFromFavorites(@PathVariable Long id) { | ||
| userOpeningService.removeUserFavoriteOpening(id); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.