Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ jobs:
message_format: '{emoji} <{run_url}|{workflow}> {status_message} in <{repo_url}|{repo}>'
footer: 'Linked to <{workflow_url}| workflow file>'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_INTEGRATION_TEST }}
2 changes: 1 addition & 1 deletion .github/workflows/release-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ jobs:
message_format: '{emoji} <{workflow_url}|{workflow}> {status_message} in <{repo_url}|{repo}>'
footer: 'Linked to Repo <{repo_url}|{repo}>'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_DEPLOY }}
16 changes: 9 additions & 7 deletions .identity/00_data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ data "github_organization_teams" "all" {
}

data "azurerm_key_vault" "key_vault_domain" {

name = "pagopa-${var.env_short}-${local.domain}-kv"
resource_group_name = "pagopa-${var.env_short}-${local.domain}-sec-rg"
}
Expand All @@ -30,14 +29,12 @@ data "azurerm_key_vault_secret" "key_vault_sonar" {
key_vault_id = data.azurerm_key_vault.key_vault.id
}

data "azurerm_key_vault_secret" "key_vault_bot_token" {

name = "bot-token-github"
key_vault_id = data.azurerm_key_vault.key_vault.id
data "azurerm_key_vault_secret" "key_vault_bot_cd_token" {
name = "pagopa-platform-domain-github-bot-cd-pat"
key_vault_id = data.azurerm_key_vault.key_vault_domain.id
}

data "azurerm_key_vault_secret" "key_vault_cucumber_token" {

name = "cucumber-token"
key_vault_id = data.azurerm_key_vault.key_vault.id
}
Expand All @@ -53,7 +50,12 @@ data "azurerm_cosmosdb_account" "bizevents_cosmos" {
}

data "azurerm_key_vault_secret" "key_vault_integration_test_webhook_slack" {
name = "webhook-slack"
name = "pagopa-pagamenti-integration-test-slack-webhook"
key_vault_id = data.azurerm_key_vault.key_vault_domain.id
}

data "azurerm_key_vault_secret" "key_vault_deploy_webhook_slack" {
name = "pagopa-pagamenti-deploy-slack-webhook"
key_vault_id = data.azurerm_key_vault.key_vault_domain.id
}

Expand Down
108 changes: 0 additions & 108 deletions .identity/02_application_action.tf

This file was deleted.

14 changes: 11 additions & 3 deletions .identity/03_github_environment.tf
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ resource "github_actions_environment_variable" "github_environment_runner_variab

repository = local.github.repository
secret_name = "BOT_TOKEN_GITHUB"
plaintext_value = data.azurerm_key_vault_secret.key_vault_bot_token.value
plaintext_value = data.azurerm_key_vault_secret.key_vault_bot_cd_token.value
}

#tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
Expand All @@ -91,9 +91,17 @@ resource "github_actions_environment_variable" "github_environment_runner_variab
}

#tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
resource "github_actions_secret" "secret_slack_webhook" {
resource "github_actions_secret" "secret_slack_webhook_integration_test" {

repository = local.github.repository
secret_name = "SLACK_WEBHOOK_URL"
secret_name = "SLACK_WEBHOOK_URL_INTEGRATION_TEST"
plaintext_value = data.azurerm_key_vault_secret.key_vault_integration_test_webhook_slack.value
}

#tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
resource "github_actions_secret" "secret_slack_webhook_deploy" {

repository = local.github.repository
secret_name = "SLACK_WEBHOOK_URL_DEPLOY"
plaintext_value = data.azurerm_key_vault_secret.key_vault_deploy_webhook_slack.value
}
Loading