diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index fc12d5cc66..1d26ca460e 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -135,25 +135,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - name: Broker - id: broker - uses: bcgov-nr/action-vault-broker-approle@v0.0.5 - with: - broker_jwt: ${{ secrets.BROKER_JWT }} - provision_role_id: ${{ secrets.PROVISION_ROLE_ID }} - project_name: client - app_name: app-client - environment: test - - name: Import Secrets - id: secrets - uses: hashicorp/vault-action@v2.5.0 - with: - url: https://vault-iit.apps.silver.devops.gov.bc.ca - token: ${{ steps.broker.outputs.vault_token }} - exportEnv: 'false' - secrets: | - apps/data/test/client/app-client/db_proxy_read_only db_username | VAULT_DB_USER; - apps/data/test/client/app-client/db_proxy_read_only db_password | VAULT_DB_PASS; - name: Deploys uses: bcgov-nr/action-deployer-openshift@v1.0.2 with: @@ -164,8 +145,8 @@ jobs: overwrite: false parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }} - -p ORACLEDB_USER=${{ steps.secrets.outputs.VAULT_DB_USER }} - -p ORACLEDB_PASSWORD=${{ steps.secrets.outputs.VAULT_DB_PASS }} + -p ORACLEDB_USER=${{ secrets.ORACLEDB_USERNAME }} + -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }} -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }} -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }} -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }} diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 098a70c38b..26f3bba38e 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -177,25 +177,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - name: Broker - id: broker - uses: bcgov-nr/action-vault-broker-approle@v0.0.5 - with: - broker_jwt: ${{ secrets.BROKER_JWT }} - provision_role_id: ${{ secrets.PROVISION_ROLE_ID }} - project_name: client - app_name: app-client - environment: development - - name: Import Secrets - id: secrets - uses: hashicorp/vault-action@v2.5.0 - with: - url: https://vault-iit.apps.silver.devops.gov.bc.ca - token: ${{ steps.broker.outputs.vault_token }} - exportEnv: "false" - secrets: | - apps/data/dev/client/app-client/db_proxy_read_only db_username | VAULT_DB_USER; - apps/data/dev/client/app-client/db_proxy_read_only db_password | VAULT_DB_PASS; - name: Deploys uses: bcgov-nr/action-deployer-openshift@v1.0.2 with: @@ -206,8 +187,8 @@ jobs: overwrite: false parameters: -p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }} - -p ORACLEDB_USER=${{ steps.secrets.outputs.VAULT_DB_USER }} - -p ORACLEDB_PASSWORD=${{ steps.secrets.outputs.VAULT_DB_PASS }} + -p ORACLEDB_USER=${{ secrets.ORACLEDB_USERNAME }} + -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }} -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }} -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }} -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }}