diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml index 7a672ab3..00d2091a 100644 --- a/.github/workflows/deploy_with_github_runner.yml +++ b/.github/workflows/deploy_with_github_runner.yml @@ -50,7 +50,7 @@ jobs: environment: ${{ inputs.environment }} steps: - name: Deploy - uses: pagopa/github-actions-template/aks-deploy@main + uses: pagopa/github-actions-template/aks-deploy@5db4c9108164a07d96527978da1c3febec934f22 #v1.11.1 with: branch: ${{ github.ref_name }} client_id: ${{ secrets.CD_CLIENT_ID }} @@ -92,34 +92,26 @@ jobs: - name: Checkout id: checkout # from https://github.com/actions/checkout/commits/main - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4 with: persist-credentials: false + - name: Read current terraform version + run: | + VER=$(cat .terraform-version) + echo "TERRAFORM_VERSION=$VER" >> $GITHUB_ENV + - name: Setup Terraform # from https://github.com/hashicorp/setup-terraform/commits/main - uses: hashicorp/setup-terraform@8feba2b913ea459066180f9cb177f58a881cf146 + uses: hashicorp/setup-terraform@97f030cf6dc0b4f5e0da352c7bca9cca34579800 #v3.1.0 with: - terraform_version: "1.3.6" + terraform_version: "${{ env.TERRAFORM_VERSION }}" - - name: Login - id: login - # from https://github.com/Azure/login/commits/master - uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 + - name: Apply terraform.sh + uses: pagopa/eng-github-actions-iac-template/azure/terraform-sh-apply-azure-action@ae723dfbdc457ffa6b4acd99f2444fc08c1efb85 #v1.11.0 with: - client-id: ${{ secrets.CD_CLIENT_ID }} - tenant-id: ${{ secrets.TENANT_ID }} - subscription-id: ${{ secrets.SUBSCRIPTION_ID }} - - - - name: Terraform Apply - shell: bash - run: | - cd ./infra - export ARM_CLIENT_ID="${{ secrets.CD_CLIENT_ID }}" - export ARM_SUBSCRIPTION_ID=$(az account show --query id --output tsv) - export ARM_TENANT_ID=$(az account show --query tenantId --output tsv) - export ARM_USE_OIDC=true - export ARM_ACCESS_KEY=$(az storage account keys list --resource-group io-infra-rg --account-name pagopainfraterraform${{inputs.environment}} --query '[0].value' -o tsv) - bash ./terraform.sh init weu-${{ inputs.environment }} - bash ./terraform.sh apply weu-${{ inputs.environment }} -auto-approve + client_id: "${{ secrets.CD_CLIENT_ID }}" + tenant_id: "${{ secrets.TENANT_ID }}" + subscription_id: "${{ secrets.SUBSCRIPTION_ID }}" + tf_environment: "weu-${{ inputs.environment }}" + dir: "infra" diff --git a/.github/workflows/release_deploy.yml b/.github/workflows/release_deploy.yml index 17237219..c6673cf1 100644 --- a/.github/workflows/release_deploy.yml +++ b/.github/workflows/release_deploy.yml @@ -113,12 +113,12 @@ jobs: # branch: ${{ github.ref_name}} # github_token: ${{ secrets.GITHUB_TOKEN }} # tag: ${{ needs.release.outputs.version }} - - uses: actions/checkout@v3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #v4.1.4 with: ref: ${{ github.ref_name }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 #v3.1.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -126,7 +126,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v4.3.0 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 #v5.5.1 with: images: ghcr.io/${{ github.repository }} tags: | @@ -136,7 +136,7 @@ jobs: type=sha - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.3.0 with: context: . push: true @@ -166,7 +166,7 @@ jobs: steps: - name: Report Status if: ${{ needs.setup.outputs.environment == 'prod' }} - uses: ravsamhq/notify-slack-action@v2 + uses: ravsamhq/notify-slack-action@be814b201e233b2dc673608aa46e5447c8ab13f2 #v2.5.0 with: status: ${{ needs.deploy_aks.result }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 7a99478f..41a25f3e 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pagopa-api-cache-chart description: Microservice that handles calculation for pagoPA Advanced Fees Management type: application -version: 0.63.0 +version: 0.64.0 dependencies: - name: microservice-chart version: 3.0.0 @@ -54,4 +54,4 @@ dependencies: repository: "https://pagopa.github.io/aks-cron-chart-blueprint" alias: refresh-oprod condition: oracleprod.enabled -appVersion: 0.9.6 +appVersion: 0.9.6-1-github-terraform-apply-fix diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index dd23258e..f14bc715 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -2,7 +2,7 @@ microservice-chart: µservice-chart namespace: "apiconfig" image: repository: ghcr.io/pagopa/pagopa-api-config-cache - tag: 0.9.6 + tag: 0.9.6-1-github-terraform-apply-fix canaryDelivery: deployment: image: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 51dc94e3..5e3a4218 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -2,7 +2,7 @@ microservice-chart: µservice-chart namespace: "apiconfig" image: repository: ghcr.io/pagopa/pagopa-api-config-cache - tag: 0.9.6 + tag: 0.9.6-1-github-terraform-apply-fix canaryDelivery: deployment: image: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 12229973..99b3ffff 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -2,7 +2,7 @@ microservice-chart: µservice-chart namespace: "apiconfig" image: repository: ghcr.io/pagopa/pagopa-api-config-cache - tag: 0.9.6 + tag: 0.9.6-1-github-terraform-apply-fix canaryDelivery: deployment: image: diff --git a/infra/.terraform-version b/infra/.terraform-version new file mode 100644 index 00000000..83d1a5eb --- /dev/null +++ b/infra/.terraform-version @@ -0,0 +1 @@ +1.6.6 \ No newline at end of file diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl index 055d87e7..acabebd3 100644 --- a/infra/.terraform.lock.hcl +++ b/infra/.terraform.lock.hcl @@ -3,10 +3,9 @@ provider "registry.terraform.io/azure/azapi" { version = "1.3.0" - constraints = "1.3.0" + constraints = "<= 1.3.0" hashes = [ "h1:h/ZVYAapVQ+W0R4P5IK/Mvsi84jiYTggmgJHZgfVbfg=", - "h1:zpNS7i+p+MeA4h6xCbwXzcKtMeAn3je9k6J7DZQqReY=", "zh:0923b297c5b71ed584e5f3a0b2393e80244076e85102a90438159833353274b0", "zh:11fa2922aa98ca55beaf7cc33c7edbde81bbd405fdfea2955276c7f5a8537240", "zh:14af830fb6091d084bfc2711c8e9c7bf05aa3c56fe8fd8e2fb4eddeb345be88d", @@ -23,43 +22,41 @@ provider "registry.terraform.io/azure/azapi" { } provider "registry.terraform.io/hashicorp/azuread" { - version = "2.30.0" - constraints = "2.30.0" + version = "2.47.0" + constraints = "<= 2.47.0" hashes = [ - "h1:MimDtBEnmdMwbriZQzga/kCjDZ1G0+QLVQjrYdBEpdc=", - "h1:WnSPiREAFwnBUKREokMdHQ8Cjs47MzvS9pG8VS1ktec=", + "h1:iRwDQBdXBpVBoYwM9au2RG01RQuJSm3TGQ2kioFVAas=", + "zh:1372d81eb24ef3b4b00ea350fe87219f22da51691b8e42ce91d662f6c2a8af5e", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:2e62c193030e04ebb10cc0526119cf69824bf2d7e4ea5a2f45bd5d5fb7221d36", - "zh:2f3c7a35257332d68b778cefc5201a5f044e4914dd03794a4da662ddfe756483", - "zh:35d0d3a1b58fdb8b8c4462d6b7e7016042da43ea9cc734ce897f52a73407d9b0", - "zh:47ede0cd0206ec953d40bf4a80aa6e59af64e26cbbd877614ac424533dbb693b", - "zh:48c190307d4d42ea67c9b8cc544025024753f46cef6ea64db84735e7055a72da", - "zh:6fff9b2c6a962252a70a15b400147789ab369b35a781e9d21cce3804b04d29af", - "zh:7646980cf3438bff29c91ffedb74458febbb00a996638751fbd204ab1c628c9b", - "zh:77aa2fa7ca6d5446afa71d4ff83cb87b70a2f3b72110fc442c339e8e710b2928", - "zh:e20b2b2c37175b89dd0db058a096544d448032e28e3b56e2db368343533a9684", - "zh:eab175b1dfe9865ad9404dccb6d5542899f8c435095aa7c679314b811c717ce7", - "zh:efc862bd78c55d2ff089729e2a34c1831ab4b0644fc11b36ee4ebed00a4797ba", + "zh:1e654a74d171d6ff8f9f6f67e3ff1421d4c5e56a18607703626bf12cd23ba001", + "zh:35227fad617a0509c64ab5759a8b703b10d244877f1aa5416bfbcc100c96996f", + "zh:357f553f0d78d46a96c7b2ed06d25ee0fc60fc5be19812ccb5d969fa47d62e17", + "zh:58faa2940065137e3e87d02eba59ab5cd7137d7a18caf225e660d1788f274569", + "zh:7308eda0339620fa24f47cedd22221fc2c02cab9d5be1710c09a783aea84eb3a", + "zh:863eabf7f908a8263e28d8aa2ad1381affd6bb5c67755216781f674ef214100e", + "zh:8b95b595a7c14ed7b56194d03cdec253527e7a146c1c58961be09e6b5c50baee", + "zh:afbca6b4fac9a0a488bc22ff9e51a8f14e986137d25275068fd932f379a51d57", + "zh:c6aadec4c81a44c3ffc22c2d90ffc6706bf5a9a903a395d896477516f4be6cbb", + "zh:e54a59de7d4ef0f3a18f91fed0b54a2bce18257ae2ee1df8a88226e1023c5811", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.44.1" - constraints = ">= 3.30.0, <= 3.44.1, <= 3.53.0" + version = "3.95.0" + constraints = ">= 3.30.0, <= 3.95.0, <= 3.97.1" hashes = [ - "h1:7zeUPl2nDhKnWHpAeKy+7Cued79RDgwacN/qpTIim64=", - "h1:iqP1wYNUezvM7Ygx2RPT37XMa6M9BZMEo/ce2f7tEKw=", - "zh:0a1761b5aeec47d5019114976de5eb9832dea1d57d632ca6fa464b99b782d1c1", - "zh:0e9c96fa7ed6d55a3f3a646ff346298c8b7728331bb3a74875f78ecb7d245c16", - "zh:1aa953a692c7b5b10219343f0238f4624ac988e247721b6ec6b1bed2b81f7ceb", - "zh:237258af1a1ce8a0aed8f6cdb03c69ea83ff4f3a46d5bd1466cd503f0b5aded8", - "zh:542067eeeb3b4e286e92d646e0f40426e204ed268973343e585aa521f075f8dc", - "zh:8326d52460252fd335ae97d0fabd9f5d90061a4fbeb273618f4067be3eb4e75a", - "zh:97a2b802bf6e204476131ddb7a91e832568ee8da3b0515ed23361c9f72ca9706", - "zh:9ae5a52ec85e0ad218e2ce9d33859f17afbb2fb2a690bf60d5f48fc7680e7fb0", - "zh:b17e77aff310e232f541334ba1858b5125ea0e527a5d6824de017192d8d8a3a2", - "zh:c469ba6681535c07c58dad6c1b59b056912300a7c91137ddc0103ef16b1d5697", - "zh:cea6026ef8fb5512d14c1ba6fdf36b90a09de536d4e4afad96b926af39114f74", + "h1:ANXIxSiPQBeuD8c7QiLcfq189oBGO207JL4zh0YdTqc=", + "zh:36e96725fb5860b68c4f86d43988eadfe13ece7abfc3368bf01b2f4e253a05f8", + "zh:3f416b574518a63793dfda0efa588dd0d2432d4cbea5908d7a479f82f0a89a01", + "zh:3f94eb8dc1717bd5af524138258b65bb2011917e05db727a0696623d4a2cdf6f", + "zh:4fd395656aeb366830eebc11f10d29b2e9652b4d74e70bbe785768b7cbcf8d5c", + "zh:58bc5bd83a984f91faebbc71f27062d3a6ca4e3abfc2fe7fcd40833d8145c5a8", + "zh:5bfedb1592056da89c3cfa2cb409cdeadedc2d336a862d39c14a9a2a4424cb8a", + "zh:6135572aa2d99e95877a28deaa864742429ba7bba8ca39b5dd8261484d384c06", + "zh:8440dbc750cd06e51a640175acd2187ab2816e080c318ea278ef9657c3000675", + "zh:9dc9e301319f49c639535da6d5ed5d938a7c8153d4467816419466d343784d01", + "zh:e5c99bc6c960d0cc4f4aab4779ccb59ec8cc6802799f2fff9c41c945f2012f85", + "zh:e9d55f63a20054c3cbb95f14dc3670c89575893b9747eb2c2ee067e1bc521c48", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/infra/04_apim_api.tf b/infra/04_apim_api.tf index e655df09..1bcf78c6 100644 --- a/infra/04_apim_api.tf +++ b/infra/04_apim_api.tf @@ -10,7 +10,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_api_ } module "apim_api_apiconfig_cache_node_api_v1_p" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" name = format("%s-apiconfig-cache-node-%s-api", local.project, local.postgres) api_management_name = local.apim.name resource_group_name = local.apim.rg @@ -51,7 +51,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_api_ module "apim_api_apiconfig_cache_node_api_v1_o" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" name = format("%s-apiconfig-cache-node-%s-api", local.project, local.oracle) api_management_name = local.apim.name @@ -92,7 +92,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_nexi module "apim_api_apiconfig_cache_node_nexi_api_dev_v1" { count = var.env_short == "d" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" name = format("%s-apiconfig-cache-node-%s-api", local.project, "nexi") api_management_name = local.apim.name @@ -141,7 +141,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_replica_n module "apim_api_apiconfig_cache_replica_node_api_v1_p" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" count = var.env_short == "p" ? 0 : 1 name = format("%s-apiconfig-cache-replica-node-%s-api", local.project, "p") @@ -172,7 +172,7 @@ module "apim_api_apiconfig_cache_replica_node_api_v1_p" { } module "apim_api_apiconfig_cache_replica_node_api_v1_o" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" count = var.env_short == "p" ? 0 : 1 name = format("%s-apiconfig-cache-replica-node-%s-api", local.project, "o") diff --git a/infra/04_apim_export.tf b/infra/04_apim_export.tf index c55c08c6..c5333c3b 100644 --- a/infra/04_apim_export.tf +++ b/infra/04_apim_export.tf @@ -10,7 +10,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_export_no } module "apim_api_apiconfig_cache_export_node_api_v1_p" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" name = format("%s-apicfg-cache-export-%s-api", local.project, local.postgres) api_management_name = local.apim.name resource_group_name = local.apim.rg @@ -50,7 +50,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_export_no } module "apim_api_apiconfig_cache_export_node_api_v1_o" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" name = format("%s-apicfg-cache-export-%s-api", local.project, local.oracle) api_management_name = local.apim.name @@ -99,7 +99,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_replica_e } module "apim_api_apiconfig_cache_replica_export_node_api_v1_p" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" count = var.env_short == "p" ? 0 : 1 name = format("%s-apicfg-cache-replica-export-%s-api", local.project, "p") @@ -130,7 +130,7 @@ module "apim_api_apiconfig_cache_replica_export_node_api_v1_p" { } module "apim_api_apiconfig_cache_replica_export_node_api_v1_o" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v8.5.0" count = var.env_short == "p" ? 0 : 1 name = format("%s-apicfg-cache-replica-export-%s-api", local.project, "o") diff --git a/infra/99_main.tf b/infra/99_main.tf index c62f391c..4e2abd29 100644 --- a/infra/99_main.tf +++ b/infra/99_main.tf @@ -2,15 +2,15 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.30.0" + version = "<= 3.95.0" } azuread = { source = "hashicorp/azuread" - version = "2.30.0" + version = "<= 2.47.0" } azapi = { source = "Azure/azapi" - version = "= 1.3.0" + version = "<= 1.3.0" } } diff --git a/openapi/openapi.json b/openapi/openapi.json index 59ba68f7..303ef7f2 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/openapi/openapi_export.json b/openapi/openapi_export.json index 51e5fd86..15f69817 100644 --- a/openapi/openapi_export.json +++ b/openapi/openapi_export.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/openapi/openapi_fdrv1.json b/openapi/openapi_fdrv1.json index 92f4a3b5..3afaad57 100644 --- a/openapi/openapi_fdrv1.json +++ b/openapi/openapi_fdrv1.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/openapi/openapi_nodev1.json b/openapi/openapi_nodev1.json index 2f909353..885e8e5b 100644 --- a/openapi/openapi_nodev1.json +++ b/openapi/openapi_nodev1.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/openapi/openapi_standinv1.json b/openapi/openapi_standinv1.json index 176c1986..73b6b6e7 100644 --- a/openapi/openapi_standinv1.json +++ b/openapi/openapi_standinv1.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/openapi/openapi_verifierv1.json b/openapi/openapi_verifierv1.json index c8a6286c..a7561e87 100644 --- a/openapi/openapi_verifierv1.json +++ b/openapi/openapi_verifierv1.json @@ -4,7 +4,7 @@ "title": "@project.name@ ${service}", "description": "@project.description@", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.9.6" + "version": "0.9.6-1-github-terraform-apply-fix" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 2ffb6e6e..7a548b77 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config cache - 0.9.6 + 0.9.6-1-github-terraform-apply-fix API-Config Cache Generate cache for various microservices