Skip to content
Open
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
28 changes: 14 additions & 14 deletions infra/identity/prod/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions infra/identity/prod/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@

| Name | Version |
|------|---------|
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | <= 3.108.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | <= 3.116.0 |

## Providers

No providers.
| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.116.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_federated_identities"></a> [federated\_identities](#module\_federated\_identities) | github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github | main |
| <a name="module_federated_identities_opex"></a> [federated\_identities\_opex](#module\_federated\_identities\_opex) | github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github | main |
| <a name="module_federated_identities_web_apps"></a> [federated\_identities\_web\_apps](#module\_federated\_identities\_web\_apps) | github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github | main |
| <a name="module_roles_ci"></a> [roles\_ci](#module\_roles\_ci) | github.com/pagopa/dx//infra/modules/azure_role_assignments | main |
| <a name="module_federated_identities"></a> [federated\_identities](#module\_federated\_identities) | pagopa-dx/azure-federated-identity-with-github/azurerm | ~> 0.0 |
| <a name="module_federated_identities_opex"></a> [federated\_identities\_opex](#module\_federated\_identities\_opex) | pagopa-dx/azure-federated-identity-with-github/azurerm | ~> 0.0 |
| <a name="module_federated_identities_web_apps"></a> [federated\_identities\_web\_apps](#module\_federated\_identities\_web\_apps) | pagopa-dx/azure-federated-identity-with-github/azurerm | ~> 0.0 |
| <a name="module_roles_ci"></a> [roles\_ci](#module\_roles\_ci) | pagopa-dx/azure-role-assignments/azurerm | ~>0.0 |

## Resources

No resources.
| Name | Type |
|------|------|
| [azurerm_subscription.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subscription) | data source |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion infra/identity/prod/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ locals {
env = "prod"
project = "${local.prefix}-${local.env_short}"
domain = "sign"

location = "westeurope"
repo_name = "io-sign"

tags = {
Expand Down
23 changes: 17 additions & 6 deletions infra/identity/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "<= 3.108.0"
version = "<= 3.116.0"
}
}

Expand All @@ -19,13 +19,17 @@ provider "azurerm" {
}
}

data "azurerm_subscription" "current" {}

module "federated_identities" {
source = "github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github?ref=main"
source = "pagopa-dx/azure-federated-identity-with-github/azurerm"
version = "~> 0.0"

prefix = local.prefix
env_short = local.env_short
env = local.env
domain = local.domain
location = local.location

repositories = [local.repo_name]

Expand Down Expand Up @@ -62,6 +66,7 @@ module "federated_identities" {
"Storage Queue Data Contributor",
"Storage Table Data Contributor",
"Key Vault Contributor",
"User Access Administrator",
]
resource_groups = {}
}
Expand All @@ -72,12 +77,15 @@ module "federated_identities" {
}

module "federated_identities_web_apps" {
source = "github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github?ref=main"
source = "pagopa-dx/azure-federated-identity-with-github/azurerm"
version = "~> 0.0"

prefix = local.prefix
env_short = local.env_short
env = "app-${local.env}"
domain = "${local.domain}-app"
location = local.location


repositories = [local.repo_name]
continuos_integration = {
Expand All @@ -104,12 +112,15 @@ module "federated_identities_web_apps" {
}

module "federated_identities_opex" {
source = "github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github?ref=main"
source = "pagopa-dx/azure-federated-identity-with-github/azurerm"
version = "~> 0.0"

prefix = local.prefix
env_short = local.env_short
env = "opex-${local.env}"
domain = "${local.domain}-opex"
location = local.location


repositories = [local.repo_name]
continuos_integration = {
Expand Down Expand Up @@ -151,9 +162,9 @@ module "federated_identities_opex" {

# Access Policy
module "roles_ci" {
source = "github.com/pagopa/dx//infra/modules/azure_role_assignments?ref=main"
source = "pagopa-dx/azure-role-assignments/azurerm"
version = "~>0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "~>0.0"
version = "~>1.0"

suggestion: The latest is 1.2.1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the same as above

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The role assignment should work with the latest version of pagopa-dx/azure-role-assignments, which is currently at minor version 3.114

principal_id = module.federated_identities.federated_ci_identity.id

key_vault = [
{
name = "io-p-sign-kv"
Expand Down