From 80074668c42963f13baad1cbb0d49c79ab2eb443 Mon Sep 17 00:00:00 2001 From: Andrea Grillo Date: Thu, 8 Aug 2024 10:47:21 +0200 Subject: [PATCH] [EC-394] Remove westeurope folder from CGN configuration (#1122) --- .github/workflows/cgn_cd.yaml | 4 ++-- .github/workflows/cgn_ci.yaml | 4 ++-- .github/workflows/static_analysis.yml | 2 +- .../storage_accounts/storage_account_cgn.tf | 2 +- .../cgn/prod/{westeurope => }/.terraform.lock.hcl | 0 src/domains/cgn/prod/{westeurope => }/README.md | 14 +++++++------- src/domains/cgn/prod/{westeurope => }/apim.tf | 2 +- src/domains/cgn/prod/{westeurope => }/cosmos.tf | 2 +- .../cgn/prod/{westeurope => }/functions_apps.tf | 2 +- src/domains/cgn/prod/{westeurope => }/locals.tf | 0 src/domains/cgn/prod/{westeurope => }/main.tf | 0 .../cgn/prod/{westeurope => }/networking.tf | 2 +- src/domains/cgn/prod/{westeurope => }/outputs.tf | 0 src/domains/cgn/prod/{westeurope => }/redis.tf | 2 +- .../cgn/prod/{westeurope => }/resource_groups.tf | 2 +- .../cgn/prod/{westeurope => }/storage_accounts.tf | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename src/domains/cgn/prod/{westeurope => }/.terraform.lock.hcl (100%) rename src/domains/cgn/prod/{westeurope => }/README.md (76%) rename src/domains/cgn/prod/{westeurope => }/apim.tf (87%) rename src/domains/cgn/prod/{westeurope => }/cosmos.tf (89%) rename src/domains/cgn/prod/{westeurope => }/functions_apps.tf (94%) rename src/domains/cgn/prod/{westeurope => }/locals.tf (100%) rename src/domains/cgn/prod/{westeurope => }/main.tf (100%) rename src/domains/cgn/prod/{westeurope => }/networking.tf (88%) rename src/domains/cgn/prod/{westeurope => }/outputs.tf (100%) rename src/domains/cgn/prod/{westeurope => }/redis.tf (89%) rename src/domains/cgn/prod/{westeurope => }/resource_groups.tf (70%) rename src/domains/cgn/prod/{westeurope => }/storage_accounts.tf (85%) diff --git a/.github/workflows/cgn_cd.yaml b/.github/workflows/cgn_cd.yaml index f6f5c8e88..7fadbe164 100644 --- a/.github/workflows/cgn_cd.yaml +++ b/.github/workflows/cgn_cd.yaml @@ -6,7 +6,7 @@ on: branches: - main paths: - - "src/domains/cgn**" + - "src/domains/cgn/**" jobs: release_prod: @@ -15,5 +15,5 @@ jobs: secrets: inherit with: environment: prod - dir: "src/domains/cgn/prod/westeurope" + dir: "src/domains/cgn/prod" use_private_agent: true diff --git a/.github/workflows/cgn_ci.yaml b/.github/workflows/cgn_ci.yaml index 3af0b6ed7..604357281 100644 --- a/.github/workflows/cgn_ci.yaml +++ b/.github/workflows/cgn_ci.yaml @@ -10,7 +10,7 @@ on: - reopened - ready_for_review paths: - - "src/domains/cgn**" + - "src/domains/cgn/**" - ".github/workflows/cgn_**" jobs: @@ -20,5 +20,5 @@ jobs: secrets: inherit with: environment: prod - dir: "src/domains/cgn/prod/westeurope" + dir: "src/domains/cgn/prod" use_private_agent: true diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index ff4eab078..4336bb405 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -30,7 +30,7 @@ jobs: newmap[src/.template-app]="." newmap[src/.template-common]="." newmap[src/aks-platform]="." - newmap[src/domains/cgn]="./prod/westeurope" + newmap[src/domains/cgn]="./prod" newmap[src/domains/selfcare]="./prod/westeurope" newmap[src/domains/citizen-auth-app]="." newmap[src/domains/citizen-auth-common]="." diff --git a/src/domains/cgn/_modules/storage_accounts/storage_account_cgn.tf b/src/domains/cgn/_modules/storage_accounts/storage_account_cgn.tf index 27e8e0af3..6ce40420d 100644 --- a/src/domains/cgn/_modules/storage_accounts/storage_account_cgn.tf +++ b/src/domains/cgn/_modules/storage_accounts/storage_account_cgn.tf @@ -8,7 +8,7 @@ module "storage_account_cgn" { account_kind = "StorageV2" account_tier = "Standard" access_tier = "Hot" - account_replication_type = "GRS" + account_replication_type = "GZRS" public_network_access_enabled = true tags = var.tags diff --git a/src/domains/cgn/prod/westeurope/.terraform.lock.hcl b/src/domains/cgn/prod/.terraform.lock.hcl similarity index 100% rename from src/domains/cgn/prod/westeurope/.terraform.lock.hcl rename to src/domains/cgn/prod/.terraform.lock.hcl diff --git a/src/domains/cgn/prod/westeurope/README.md b/src/domains/cgn/prod/README.md similarity index 76% rename from src/domains/cgn/prod/westeurope/README.md rename to src/domains/cgn/prod/README.md index 31a1fc628..6581caaff 100644 --- a/src/domains/cgn/prod/westeurope/README.md +++ b/src/domains/cgn/prod/README.md @@ -10,13 +10,13 @@ | Name | Source | Version | |------|--------|---------| -| [apim](#module\_apim) | ../../_modules/apim | n/a | -| [cosmos](#module\_cosmos) | ../../_modules/cosmos | n/a | -| [functions](#module\_functions) | ../../_modules/functions_apps | n/a | -| [networking](#module\_networking) | ../../_modules/networking | n/a | -| [redis](#module\_redis) | ../../_modules/redis | n/a | -| [resource\_groups](#module\_resource\_groups) | ../../_modules/resource_groups | n/a | -| [storage\_accounts](#module\_storage\_accounts) | ../../_modules/storage_accounts | n/a | +| [apim](#module\_apim) | ../_modules/apim | n/a | +| [cosmos](#module\_cosmos) | ../_modules/cosmos | n/a | +| [functions](#module\_functions) | ../_modules/functions_apps | n/a | +| [networking](#module\_networking) | ../_modules/networking | n/a | +| [redis](#module\_redis) | ../_modules/redis | n/a | +| [resource\_groups](#module\_resource\_groups) | ../_modules/resource_groups | n/a | +| [storage\_accounts](#module\_storage\_accounts) | ../_modules/storage_accounts | n/a | ## Resources diff --git a/src/domains/cgn/prod/westeurope/apim.tf b/src/domains/cgn/prod/apim.tf similarity index 87% rename from src/domains/cgn/prod/westeurope/apim.tf rename to src/domains/cgn/prod/apim.tf index a83f553ab..f01affedd 100644 --- a/src/domains/cgn/prod/westeurope/apim.tf +++ b/src/domains/cgn/prod/apim.tf @@ -1,5 +1,5 @@ module "apim" { - source = "../../_modules/apim" + source = "../_modules/apim" project = local.project env_short = local.env_short diff --git a/src/domains/cgn/prod/westeurope/cosmos.tf b/src/domains/cgn/prod/cosmos.tf similarity index 89% rename from src/domains/cgn/prod/westeurope/cosmos.tf rename to src/domains/cgn/prod/cosmos.tf index f2ddf73bc..59f84c807 100644 --- a/src/domains/cgn/prod/westeurope/cosmos.tf +++ b/src/domains/cgn/prod/cosmos.tf @@ -1,5 +1,5 @@ module "cosmos" { - source = "../../_modules/cosmos" + source = "../_modules/cosmos" project = local.project location = local.location diff --git a/src/domains/cgn/prod/westeurope/functions_apps.tf b/src/domains/cgn/prod/functions_apps.tf similarity index 94% rename from src/domains/cgn/prod/westeurope/functions_apps.tf rename to src/domains/cgn/prod/functions_apps.tf index b3832d28b..acef1cb6e 100644 --- a/src/domains/cgn/prod/westeurope/functions_apps.tf +++ b/src/domains/cgn/prod/functions_apps.tf @@ -1,5 +1,5 @@ module "functions" { - source = "../../_modules/functions_apps" + source = "../_modules/functions_apps" project = local.project location = local.location diff --git a/src/domains/cgn/prod/westeurope/locals.tf b/src/domains/cgn/prod/locals.tf similarity index 100% rename from src/domains/cgn/prod/westeurope/locals.tf rename to src/domains/cgn/prod/locals.tf diff --git a/src/domains/cgn/prod/westeurope/main.tf b/src/domains/cgn/prod/main.tf similarity index 100% rename from src/domains/cgn/prod/westeurope/main.tf rename to src/domains/cgn/prod/main.tf diff --git a/src/domains/cgn/prod/westeurope/networking.tf b/src/domains/cgn/prod/networking.tf similarity index 88% rename from src/domains/cgn/prod/westeurope/networking.tf rename to src/domains/cgn/prod/networking.tf index 6131357b2..7d3feed76 100644 --- a/src/domains/cgn/prod/westeurope/networking.tf +++ b/src/domains/cgn/prod/networking.tf @@ -1,5 +1,5 @@ module "networking" { - source = "../../_modules/networking" + source = "../_modules/networking" project = local.project diff --git a/src/domains/cgn/prod/westeurope/outputs.tf b/src/domains/cgn/prod/outputs.tf similarity index 100% rename from src/domains/cgn/prod/westeurope/outputs.tf rename to src/domains/cgn/prod/outputs.tf diff --git a/src/domains/cgn/prod/westeurope/redis.tf b/src/domains/cgn/prod/redis.tf similarity index 89% rename from src/domains/cgn/prod/westeurope/redis.tf rename to src/domains/cgn/prod/redis.tf index ab5ce2bfa..30d13881d 100644 --- a/src/domains/cgn/prod/westeurope/redis.tf +++ b/src/domains/cgn/prod/redis.tf @@ -1,5 +1,5 @@ module "redis" { - source = "../../_modules/redis" + source = "../_modules/redis" project = local.project location = local.location diff --git a/src/domains/cgn/prod/westeurope/resource_groups.tf b/src/domains/cgn/prod/resource_groups.tf similarity index 70% rename from src/domains/cgn/prod/westeurope/resource_groups.tf rename to src/domains/cgn/prod/resource_groups.tf index 515d69b9f..c0d557e12 100644 --- a/src/domains/cgn/prod/westeurope/resource_groups.tf +++ b/src/domains/cgn/prod/resource_groups.tf @@ -1,5 +1,5 @@ module "resource_groups" { - source = "../../_modules/resource_groups" + source = "../_modules/resource_groups" location = local.location project = local.project diff --git a/src/domains/cgn/prod/westeurope/storage_accounts.tf b/src/domains/cgn/prod/storage_accounts.tf similarity index 85% rename from src/domains/cgn/prod/westeurope/storage_accounts.tf rename to src/domains/cgn/prod/storage_accounts.tf index 7ff4d055c..343854e6c 100644 --- a/src/domains/cgn/prod/westeurope/storage_accounts.tf +++ b/src/domains/cgn/prod/storage_accounts.tf @@ -1,5 +1,5 @@ module "storage_accounts" { - source = "../../_modules/storage_accounts" + source = "../_modules/storage_accounts" project = local.project location = local.location