Commit 5a2d2359 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/gcp-variant' into 'master' 

fix(gcp): reduce scope of GCP App Default Creds script to template

See merge request to-be-continuous/dbt!37
parents 18a69b2c d61e8724

templates/gitlab-ci-dbt-gcp.yml

+40 −42
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ variables: 
  GCP_PROD_OIDC_ACCOUNT: $[[ inputs.gcp-prod-oidc-account ]]

  GCP_PROD_OIDC_PROVIDER: $[[ inputs.gcp-prod-oidc-provider ]]



.gcp-provider-auth:

  before_script:

.dbt-gcp-adc:

  - echo "Installing GCP authentication with env GOOGLE_APPLICATION_CREDENTIALS file"

  - echo $GCP_JWT > "$CI_BUILDS_DIR/.auth_token.jwt"

  - |-
@@ -89,15 +88,14 @@ variables: 
    EOF

  - export GOOGLE_APPLICATION_CREDENTIALS="$CI_BUILDS_DIR/google_application_credentials.json"





.dbt-build:

  extends: .dbt-base

  id_tokens:

    GCP_JWT:

      aud: "$GCP_OIDC_AUD"

  before_script:

    - !reference [.gcp-provider-auth, before_script]

    - !reference [.dbt-base, before_script]

    - !reference [.dbt-gcp-adc]

    

.dbt-test:

  extends: .dbt-base
@@ -105,8 +103,8 @@ variables: 
    GCP_JWT:

      aud: "$GCP_OIDC_AUD"

  before_script:

    - !reference [.gcp-provider-auth, before_script]      

    - !reference [.dbt-base, before_script]

    - !reference [.dbt-gcp-adc]      



.dbt-deploy:

  extends: .dbt-base
@@ -114,6 +112,6 @@ variables: 
    GCP_JWT:

      aud: "$GCP_OIDC_AUD"

  before_script:

    - !reference [.gcp-provider-auth, before_script]

    - !reference [.dbt-base, before_script]

    - !reference [.dbt-gcp-adc]