[VAS-733] fix

pagopa · Apr 10, 2024 · c59c739 · c59c739
1 parent 6c7a531
commit c59c739
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/code_review.yml b/.github/workflows/code_review.yml
@@ -60,7 +60,7 @@ jobs:
         # from https://github.com/Azure/login/commits/master
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2
         with:
-          client-id: ${{ secrets.CLIENT_ID }}
+          client-id: ${{ secrets.CD_CLIENT_ID }}
           tenant-id: ${{ secrets.TENANT_ID }}
           subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
 
@@ -80,11 +80,14 @@ jobs:
           export GPD_PULL_API_SUBSCRIPTION_KEY=${{ secrets.PULL_SUBKEY }}
           export CANARY=${{ inputs.canary }}
           export CUCUMBER_PUBLISH_TOKEN=${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
+          export SUBKEY=${{ secrets.SUBKEY }}
+          export GPD_API_SUBSCRIPTION_KEY=${{ secrets.SUBKEY }}
+          export GPD_PULL_API_SUBSCRIPTION_KEY=${{ secrets.SUBKEY }}
 
           cd ./integration-test
           chmod +x ./run_integration_test.sh
           ./run_integration_test.sh local
-
+  
 
   delete_github_deployments:
     runs-on: ubuntu-latest

diff --git a/.identity/00_data.tf b/.identity/00_data.tf
@@ -1,6 +1,5 @@
-
-data "azurerm_user_assigned_identity" "identity_cd_01"{
-  name = "${local.prefix}-${var.env_short}-${local.domain}-01-github-cd-identity"
+data "azurerm_user_assigned_identity" "identity_cd_01" {
+  name                = "${local.prefix}-${var.env_short}-${local.domain}-01-github-cd-identity"
   resource_group_name = "${local.prefix}-${var.env_short}-identity-rg"
 }
 
@@ -39,8 +38,3 @@ data "azurerm_key_vault_secret" "key_vault_integration_test_subkey" {
   name         = "integration-test-subkey"
   key_vault_id = data.azurerm_key_vault.key_vault.id
 }
-
-data "azurerm_key_vault_secret" "key_vault_integration_test_pull_subkey" {
-  name         = "integration-test-pull-subkey"
-  key_vault_id = data.azurerm_key_vault.key_vault.id
-}
diff --git a/.identity/01_github_environment.tf b/.identity/01_github_environment.tf
@@ -22,11 +22,10 @@ resource "github_repository_environment" "github_repository_environment" {
 locals {
   env_secrets = {
     "CD_CLIENT_ID" : data.azurerm_user_assigned_identity.identity_cd_01.client_id,
-#    "CLIENT_ID" : module.github_runner_app.application_id,
+    #    "CLIENT_ID" : module.github_runner_app.application_id,
     "TENANT_ID" : data.azurerm_client_config.current.tenant_id,
     "SUBSCRIPTION_ID" : data.azurerm_subscription.current.subscription_id,
     "SUBKEY" : data.azurerm_key_vault_secret.key_vault_integration_test_subkey.value,
-    "PULL_SUBKEY" : data.azurerm_key_vault_secret.key_vault_integration_test_pull_subkey.value,
 
   }
   env_variables = {