secret

Dynatrace · Feb 13, 2025 · a53d238 · a53d238
1 parent 8b3fc84
commit a53d238
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/pr_validation.yaml b/.github/workflows/pr_validation.yaml
@@ -125,10 +125,8 @@ jobs:
       dt_url_gen3: ${{ needs.set_env_vars.outputs.dt_url_gen3 }}
       dt_oauth_sso_endpoint: ${{ vars.DT_OAUTH_SSO_ENDPOINT }}
       dt_oauth_account_urn: ${{ vars.DT_OAUTH_ACCOUNT_URN }}
-      # dt_api_token: ${{ needs.set_env_vars.outputs.dt_api_token }}      
     secrets:
+      dt_api_token: ${{ secrets.DT_API_TOKEN }}
       gcp_credentials_json: ${{ secrets.GCP_CREDENTIALS_JSON }}
       dt_oauth_client_id: ${{ secrets.DT_OAUTH_CLIENT_ID }}
       dt_oauth_client_secret: ${{ secrets.DT_OAUTH_CLIENT_SECRET }}
-    env:
-      DT_API_TOKEN: ${{ needs.set_env_vars.outputs.dt_api_token }}
diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml
@@ -41,12 +41,12 @@ on:
         description: "Dynatrace OAuth Account URN"
         required: false
         type: string
+
+    secrets:
       dt_api_token:
         description: "Dynatrace API Token"
         required: false
         type: string
-
-    secrets:
       gcp_credentials_json:
         description: "GCP Credentials JSON"
         required: false
@@ -71,7 +71,6 @@ jobs:
     outputs:
       use_cases: ${{ steps.set_outputs.outputs.use_cases }}
       providers: ${{ steps.set_outputs.outputs.providers }}
-      TF_VAR_dt_api_token: ${{ steps.set_outputs.outputs.TF_VAR_dt_api_token }}
     steps:
       - name: Parse Inputs
         id: parse_inputs
@@ -80,15 +79,13 @@ jobs:
           echo ${{ env.DEFAULT_USE_CASES }}
           echo "use_cases=$(echo '${{ inputs.use_cases }}' )" >> "$GITHUB_ENV"
           echo "providers=$(echo '${{ inputs.providers }}' )" >> "$GITHUB_ENV"
-          echo "TF_VAR_dt_api_token=$(echo '${{ inputs.dt_api_token }}' )" >> "$GITHUB_ENV"
         shell: bash
 
       - name: Set Outputs
         id: set_outputs
         run: |
           echo "use_cases=$(echo '${{ inputs.use_cases }}' )" >> "$GITHUB_OUTPUT"
           echo "providers=$(echo '${{ inputs.providers }}' )" >> "$GITHUB_OUTPUT"
-          echo "TF_VAR_dt_api_token=$(echo '${{ inputs.dt_api_token }}' )" >> "$GITHUB_OUTPUT"
         shell: bash
 
   apply:
@@ -98,7 +95,7 @@ jobs:
     env:
       # DESTROY_RESOURCES: ${{ inputs.destroy_resources }} # Set to "true" to enable resource destruction
       TF_VAR_dt_tenant: ${{ inputs.dt_tenant != '' && inputs.dt_tenant || vars.DT_TENANT }}
-      TF_VAR_dt_api_token: ${{ needs.preparation.outputs.TF_VAR_dt_api_token }}
+      TF_VAR_dt_api_token: ${{ secrets.dt_api_token }}
       TF_VAR_custom_domain: ${{ inputs.custom_domain != '' && inputs.custom_domain || '' }}
       TF_VAR_otel_export_enable: "true"
       TF_VAR_name_prefix: "gh-actions-ace-box"