Merge pull request #64 from pagopa/PAGOPA-2614-improve-integration-test

[PAGOPA-2614] chore: Improved integration test
pagopa · Jan 30, 2025 · d784df5 · d784df5
2 parents 4f6047f + 68cc7be
commit d784df5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/.github/workflows/06_integration_test.yml b/.github/workflows/06_integration_test.yml
@@ -13,7 +13,7 @@ on:
         options:
           - dev
           - uat
-        default: dev
+        default: uat
       tags:
         description: 'run the tests tagged with'
         required: false
@@ -22,10 +22,7 @@ on:
       junit:
         description: 'enable junit'
         required: false
-        type: choice
-        options:
-          - true
-          - false
+        type: boolean
         default: false
 
 
@@ -34,12 +31,11 @@ permissions:
   contents: read
   deployments: write
 
-
 jobs:
   integration_test:
-    name: Test ${{(github.event.inputs == null && 'dev') || inputs.environment }}
+    name: Test ${{(github.event.inputs == null && 'uat') || inputs.environment }}
     runs-on: ubuntu-latest
-    environment: ${{(github.event.inputs == null && 'dev') || inputs.environment }}
+    environment: ${{(github.event.inputs == null && 'uat') || inputs.environment }}
     steps:
       - name: Checkout
         id: checkout
@@ -83,8 +79,8 @@ jobs:
           docker run \
           -e INTEGRATION_TEST_SUBSCRIPTION_KEY="${{ secrets.INTEGRATION_TEST_SUBSCRIPTION_KEY }}" \
           -e TAGS="${{ inputs.tags }}" \
-          -e ENV="${{( github.event.inputs == null && 'dev') || inputs.environment }}" \
-          -e CONFIG_FILE="/config/${{( github.event.inputs == null && 'dev') || inputs.environment }}.json" \
+          -e ENV="${{(github.event.inputs == null && 'uat') || inputs.environment }}" \
+          -e CONFIG_FILE="/config/${{(github.event.inputs == null && 'uat') || inputs.environment }}.json" \
           -v  ./reports:/app/reports fdr1_test
 
       - name: Login
@@ -140,7 +136,7 @@ jobs:
           status: ${{ needs.integration_test.result }}
           token: ${{ secrets.GITHUB_TOKEN }}
           notify_when: 'failure,skipped'
-          notification_title: '<{run_url}|Scheduled Integration Test> has {status_message}'
+          notification_title: "<{run_url}|Scheduled Integration Test> has {status_message} in ${{(github.event.inputs == null && 'uat') || inputs.environment }}"
           message_format: '{emoji} <{run_url}|{workflow}> {status_message} in <{repo_url}|{repo}>'
           footer: 'Linked to <{workflow_url}| workflow file>'
         env:

diff --git a/.identity/00_data.tf b/.identity/00_data.tf
@@ -27,11 +27,6 @@ data "azurerm_key_vault" "domain_key_vault" {
   resource_group_name = "pagopa-${var.env_short}-${local.domain}-sec-rg"
 }
 
-data "azurerm_key_vault" "nodo_key_vault" {
-  name                = "pagopa-${var.env_short}-nodo-kv"
-  resource_group_name = "pagopa-${var.env_short}-nodo-sec-rg"
-}
-
 data "azurerm_resource_group" "apim_resource_group" {
   name = "${local.product}-api-rg"
 }
@@ -46,14 +41,14 @@ data "azurerm_key_vault_secret" "key_vault_bot_token" {
   key_vault_id = data.azurerm_key_vault.key_vault.id
 }
 
-data "azurerm_key_vault_secret" "key_vault_slack_webhook_url" {
-  name         = "slack-webhook-url"
+data "azurerm_key_vault_secret" "key_vault_pagopa-pagamenti-deploy-slack-webhook" {
+  name         = "pagopa-pagamenti-deploy-slack-webhook"
   key_vault_id = data.azurerm_key_vault.domain_key_vault.id
 }
 
 data "azurerm_key_vault_secret" "key_vault_integration_test_slack_webhook_url" {
-  name         = "integrationtest-slack-webhook-url"
-  key_vault_id = data.azurerm_key_vault.nodo_key_vault.id
+  name         = "pagopa-pagamenti-integration-test-slack-webhook"
+  key_vault_id = data.azurerm_key_vault.domain_key_vault.id
 }
 
 data "azurerm_user_assigned_identity" "identity_cd" {

diff --git a/.identity/03_github_environment.tf b/.identity/03_github_environment.tf
@@ -83,7 +83,7 @@ resource "github_actions_secret" "secret_slack_webhook" {
 
   repository       = local.github.repository
   secret_name      = "SLACK_WEBHOOK_URL"
-  plaintext_value  = data.azurerm_key_vault_secret.key_vault_slack_webhook_url.value
+  plaintext_value  = data.azurerm_key_vault_secret.key_vault_pagopa-pagamenti-deploy-slack-webhook.value
 }
 
 #tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret