From 6d26bd3d90dc2103d4a0f1cb8212bddfc1af5340 Mon Sep 17 00:00:00 2001 From: Andrea Grillo Date: Wed, 3 Jan 2024 10:38:00 +0100 Subject: [PATCH] [EC-43] Remove other repos federation from io-infra managed identity (#809) --- .identity/04_github_identity.tf | 6 ++++-- .identity/99_variables.tf | 5 +++++ .identity/env/prod/terraform.tfvars | 17 +---------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.identity/04_github_identity.tf b/.identity/04_github_identity.tf index be627288d..679facce6 100644 --- a/.identity/04_github_identity.tf +++ b/.identity/04_github_identity.tf @@ -6,10 +6,11 @@ resource "azurerm_resource_group" "identity_rg" { } module "identity_ci" { - source = "github.com/pagopa/terraform-azurerm-v3//github_federated_identity?ref=v7.34.0" + source = "github.com/pagopa/terraform-azurerm-v3//github_federated_identity?ref=v7.35.0" prefix = var.prefix env_short = var.env_short + domain = var.domain identity_role = "ci" @@ -28,10 +29,11 @@ module "identity_ci" { } module "identity_cd" { - source = "github.com/pagopa/terraform-azurerm-v3//github_federated_identity?ref=v7.34.0" + source = "github.com/pagopa/terraform-azurerm-v3//github_federated_identity?ref=v7.35.0" prefix = var.prefix env_short = var.env_short + domain = var.domain identity_role = "cd" diff --git a/.identity/99_variables.tf b/.identity/99_variables.tf index 9a1bb2998..0720725b5 100644 --- a/.identity/99_variables.tf +++ b/.identity/99_variables.tf @@ -19,6 +19,11 @@ variable "prefix" { } } +variable "domain" { + type = string + description = "Managed identities scope names" +} + variable "location" { type = string description = "One of westeurope, northeurope" diff --git a/.identity/env/prod/terraform.tfvars b/.identity/env/prod/terraform.tfvars index 27599a52c..1e5e26665 100644 --- a/.identity/env/prod/terraform.tfvars +++ b/.identity/env/prod/terraform.tfvars @@ -2,6 +2,7 @@ prefix = "io" env_short = "p" env = "prod" location = "westeurope" +domain = "infra" github_repository_environment_ci = { protected_branches = false @@ -22,14 +23,6 @@ ci_github_federations = [ { repository = "io-infra" subject = "prod-ci" - }, - { - repository = "io-sign" # TODO: move. https://github.com/pagopa/io-infra/pull/745#discussion_r1410721348 - subject = "prod-ci" - }, - { - repository = "io-services-metadata" - subject = "prod-ci" } ] @@ -37,14 +30,6 @@ cd_github_federations = [ { repository = "io-infra" subject = "prod-ci" - }, - { - repository = "io-sign" # TODO: move. https://github.com/pagopa/io-infra/pull/745#discussion_r1410721348 - subject = "prod-ci" - }, - { - repository = "io-services-metadata" - subject = "prod-cd" } ]