Merge branch 'main' into CHK-3348-remove-infra-wallet-domain-refs

pagopa · Dec 12, 2024 · c41e0e5 · c41e0e5
2 parents d270b47 + fcc2dab
commit c41e0e5
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 10 deletions.
diff --git a/azure-devops/ebollo/00_secrets_ebollo.tf b/azure-devops/ebollo/00_secrets_ebollo.tf
@@ -13,6 +13,7 @@ module "ebollo_dev_secrets" {
     "pagopa-d-itn-dev-aks-azure-devops-sa-token",
     "pagopa-d-itn-dev-aks-azure-devops-sa-cacrt",
     "pagopa-d-itn-dev-aks-apiserver-url",
+    "apikey-gps-mbd-integration-test"
   ]
 }
 
@@ -31,6 +32,7 @@ module "ebollo_uat_secrets" {
     "pagopa-u-itn-uat-aks-azure-devops-sa-token",
     "pagopa-u-itn-uat-aks-azure-devops-sa-cacrt",
     "pagopa-u-itn-uat-aks-apiserver-url",
+    "apikey-gps-mbd-integration-test"
   ]
 }
 

diff --git a/azure-devops/ebollo/06_pagopa-gps-mbd-service.tf b/azure-devops/ebollo/06_pagopa-gps-mbd-service.tf
@@ -0,0 +1,65 @@
+variable "pagopa-gps-mbd-service" {
+  default = {
+    repository = {
+      organization    = "pagopa"
+      name            = "pagopa-gps-mbd-service"
+      branch_name     = "refs/heads/main"
+      pipelines_path  = ".devops"
+      yml_prefix_name = null
+    }
+    pipeline = {
+      performance_test = {
+        enabled               = true
+        name                  = "performance-test-pipeline"
+        pipeline_yml_filename = "performance-test-pipelines.yml"
+      }
+    }
+  }
+}
+
+locals {
+  # global vars
+  pagopa-gps-mbd-service-variables = {
+    cache_version_id = "v1"
+    default_branch   = var.pagopa-gps-mbd-service.repository.branch_name
+  }
+  # global secrets
+  pagopa-gps-mbd-service-variables_secret = {
+  }
+  # performance vars
+  pagopa-gps-mbd-service-variables_performance_test = {
+  }
+  # performance secrets
+  pagopa-gps-mbd-service-variables_secret_performance_test = {
+    DEV_API_SUBSCRIPTION_KEY  = module.ebollo_dev_secrets.values["apikey-gps-mbd-integration-test"].value
+    UAT_API_SUBSCRIPTION_KEY  = module.ebollo_uat_secrets.values["apikey-gps-mbd-integration-test"].value
+  }
+
+}
+
+module "pagopa-gps-mbd-service_performance_test" {
+  source = "./.terraform/modules/__azdo__/azuredevops_build_definition_generic"
+
+  count  = var.pagopa-gps-mbd-service.pipeline.performance_test.enabled == true ? 1 : 0
+
+  project_id                   = data.azuredevops_project.project.id
+  repository                   = var.pagopa-gps-mbd-service.repository
+  github_service_connection_id = data.azuredevops_serviceendpoint_github.github_ro.id
+  path                         = "${local.domain}\\pagopa-gps-mbd-service"
+  pipeline_name                = var.pagopa-gps-mbd-service.pipeline.performance_test.name
+  pipeline_yml_filename        = var.pagopa-gps-mbd-service.pipeline.performance_test.pipeline_yml_filename
+
+  variables = merge(
+    local.pagopa-gps-mbd-service-variables,
+    local.pagopa-gps-mbd-service-variables_performance_test,
+  )
+
+  variables_secret = merge(
+    local.pagopa-gps-mbd-service-variables_secret,
+    local.pagopa-gps-mbd-service-variables_secret_performance_test,
+  )
+
+  service_connection_ids_authorization = [
+    data.azuredevops_serviceendpoint_github.github_ro.id,
+  ]
+}
diff --git a/azure-devops/pay-wallet/00_secrets_wallet.tf b/azure-devops/pay-wallet/00_secrets_wallet.tf
@@ -35,7 +35,9 @@ module "wallet_uat_secrets" {
     "pagopa-u-itn-uat-aks-azure-devops-sa-token",
     "pagopa-u-itn-uat-aks-azure-devops-sa-cacrt",
     "pagopa-u-itn-uat-aks-apiserver-url",
-    "wallet-token-test-key"
+    "wallet-token-test-key",
+    "wallet-storage-connection-string",
+    "receiver-evt-rx-event-hub-connection-string-test"
   ]
 }
 
@@ -53,6 +55,6 @@ module "wallet_prod_secrets" {
   secrets = [
     "pagopa-p-itn-prod-aks-azure-devops-sa-token",
     "pagopa-p-itn-prod-aks-azure-devops-sa-cacrt",
-    "pagopa-p-itn-prod-aks-apiserver-url",
+    "pagopa-p-itn-prod-aks-apiserver-url"
   ]
 }
diff --git a/azure-devops/pay-wallet/06_pagopa-payment-wallet-cdc-service.tf b/azure-devops/pay-wallet/06_pagopa-payment-wallet-cdc-service.tf
@@ -40,7 +40,6 @@ locals {
   }
   # code_review secrets
   pagopa-payment-wallet-cdc-service-variables_secret_code_review = {
-
   }
   # deploy vars
   pagopa-payment-wallet-cdc-service-variables_deploy = {
@@ -67,9 +66,11 @@ locals {
   }
   # deploy secrets
   pagopa-payment-wallet-cdc-service-variables_secret_deploy = {
-    git_mail     = module.secrets.values["azure-devops-github-EMAIL"].value
-    git_username = module.secrets.values["azure-devops-github-USERNAME"].value
-    tenant_id    = data.azurerm_client_config.current.tenant_id
+    git_mail                         = module.secrets.values["azure-devops-github-EMAIL"].value
+    git_username                     = module.secrets.values["azure-devops-github-USERNAME"].value
+    tenant_id                        = data.azurerm_client_config.current.tenant_id
+    wallet_token_test                = module.wallet_uat_secrets.values["wallet-token-test-key"].value
+    azure_eventhub_connection_string = module.wallet_uat_secrets.values["receiver-evt-rx-event-hub-connection-string-test"].value
   }
 }
 

diff --git a/azure-devops/pay-wallet/06_pagopa-payment-wallet-scheduler-service.tf b/azure-devops/pay-wallet/06_pagopa-payment-wallet-scheduler-service.tf
@@ -40,7 +40,6 @@ locals {
   }
   # code_review secrets
   pagopa-payment-wallet-scheduler-service-variables_secret_code_review = {
-
   }
   # deploy vars
   pagopa-payment-wallet-scheduler-service-variables_deploy = {
@@ -67,9 +66,10 @@ locals {
   }
   # deploy secrets
   pagopa-payment-wallet-scheduler-service-variables_secret_deploy = {
-    git_mail     = module.secrets.values["azure-devops-github-EMAIL"].value
-    git_username = module.secrets.values["azure-devops-github-USERNAME"].value
-    tenant_id    = data.azurerm_client_config.current.tenant_id
+    git_mail                              = module.secrets.values["azure-devops-github-EMAIL"].value
+    git_username                          = module.secrets.values["azure-devops-github-USERNAME"].value
+    tenant_id                             = data.azurerm_client_config.current.tenant_id
+    scheduler_cdc_queue_connection_string = module.wallet_uat_secrets.values["wallet-storage-connection-string"].value
   }
 }
 

diff --git a/azure-devops/pay-wallet/99_main.tf b/azure-devops/pay-wallet/99_main.tf
@@ -13,10 +13,12 @@ terraform {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {}
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {
     key_vault {
       purge_soft_delete_on_destroy = false
@@ -27,6 +29,7 @@ provider "azurerm" {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {
     key_vault {
       purge_soft_delete_on_destroy = false
@@ -37,6 +40,7 @@ provider "azurerm" {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {
     key_vault {
       purge_soft_delete_on_destroy = false