diff --git a/.github/workflows/create_dashboard.yaml b/.github/workflows/create_dashboard.yaml index 8982a3f94..eae4efb61 100644 --- a/.github/workflows/create_dashboard.yaml +++ b/.github/workflows/create_dashboard.yaml @@ -26,7 +26,8 @@ jobs: strategy: matrix: environment: [prod] - product: [apim_v1, apim_v2] + infra: [apim_v1, apim_v2] + product: [redirect, trx_v1, trx_v2] max-parallel: 1 environment: name: ${{ matrix.environment }} @@ -43,8 +44,8 @@ jobs: - uses: pagopa/opex-dashboard-azure-action@v1.1.2 with: environment: ${{ matrix.environment }} - api-name: ${{ matrix.product }} # empty to have `.opex/env` directory structure - config: .opex/${{ matrix.product }}/env/${{ matrix.environment }}/config.yaml + api-name: ${{ matrix.infra }}/${{ matrix.product }} # empty to have `.opex/env` directory structure + config: .opex/${{ matrix.infra }}/${{ matrix.product }}/env/${{ matrix.environment }}/config.yaml client-id: ${{ secrets.CLIENT_ID }} tenant-id: ${{ secrets.TENANT_ID }} subscription-id: ${{ secrets.SUBSCRIPTION_ID }} diff --git a/.opex/apim_v1/env/uat/backend.ini b/.opex/apim_v1/env/uat/backend.ini deleted file mode 100644 index 1a014151d..000000000 --- a/.opex/apim_v1/env/uat/backend.ini +++ /dev/null @@ -1 +0,0 @@ -subscription=UAT-pagoPA diff --git a/.opex/apim_v1/env/uat/backend.tfvars b/.opex/apim_v1/env/uat/backend.tfvars deleted file mode 100644 index 86249c402..000000000 --- a/.opex/apim_v1/env/uat/backend.tfvars +++ /dev/null @@ -1,4 +0,0 @@ -resource_group_name = "terraform-state-rg" -storage_account_name = "tfappuatpagopa" -container_name = "terraform-state" -key = "opex.pagopa-ecommerce-transactions-service.terraform.tfstate" diff --git a/.opex/apim_v1/env/uat/config.yaml b/.opex/apim_v1/env/uat/config.yaml deleted file mode 100644 index 1752276e4..000000000 --- a/.opex/apim_v1/env/uat/config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -oa3_spec: ./api-spec/transactions-api.yaml # If start with http the file would be downloaded from the internet -name: opex_pagopa-ecommerce-transactions-service -location: West Europe -timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan -data_source: /subscriptions/26abc801-0d8f-4a6e-ac5f-8e81bcc09112/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim -resource_type: api-management -overrides: - hosts: # Use these hosts instead of those inside the OpenApi spec - - api.uat.platform.pagopa.it diff --git a/.opex/apim_v1/env/prod/backend.ini b/.opex/apim_v1/redirect/env/prod/backend.ini similarity index 100% rename from .opex/apim_v1/env/prod/backend.ini rename to .opex/apim_v1/redirect/env/prod/backend.ini diff --git a/.opex/apim_v1/env/prod/backend.tfvars b/.opex/apim_v1/redirect/env/prod/backend.tfvars similarity index 85% rename from .opex/apim_v1/env/prod/backend.tfvars rename to .opex/apim_v1/redirect/env/prod/backend.tfvars index 2a1b505a5..391355989 100644 --- a/.opex/apim_v1/env/prod/backend.tfvars +++ b/.opex/apim_v1/redirect/env/prod/backend.tfvars @@ -1,4 +1,4 @@ resource_group_name = "terraform-state-rg" storage_account_name = "tfappprodpagopa" container_name = "terraform-state" -key = "opex.pagopa-ecommerce-transactions-service.terraform.tfstate" +key = "opex.pagopa-ecommerce-transactions-service-redirect.terraform.tfstate" diff --git a/.opex/apim_v1/redirect/env/prod/config.yaml b/.opex/apim_v1/redirect/env/prod/config.yaml new file mode 100644 index 000000000..7c95f96a0 --- /dev/null +++ b/.opex/apim_v1/redirect/env/prod/config.yaml @@ -0,0 +1,12 @@ +oa3_spec: ./api-spec/client/openapi/redirect/redirect-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-redirect-service +location: West Europe +timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan +data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim +resource_type: api-management +action_groups: + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA +overrides: + hosts: # Use these hosts instead of those inside the OpenApi spec + - api.platform.pagopa.it diff --git a/.opex/apim_v1/env/prod/terraform.tfvars b/.opex/apim_v1/redirect/env/prod/terraform.tfvars similarity index 100% rename from .opex/apim_v1/env/prod/terraform.tfvars rename to .opex/apim_v1/redirect/env/prod/terraform.tfvars diff --git a/.opex/apim_v2/env/prod/backend.ini b/.opex/apim_v1/trx_v1/env/prod/backend.ini similarity index 100% rename from .opex/apim_v2/env/prod/backend.ini rename to .opex/apim_v1/trx_v1/env/prod/backend.ini diff --git a/.opex/apim_v1/trx_v1/env/prod/backend.tfvars b/.opex/apim_v1/trx_v1/env/prod/backend.tfvars new file mode 100644 index 000000000..6425ba68e --- /dev/null +++ b/.opex/apim_v1/trx_v1/env/prod/backend.tfvars @@ -0,0 +1,4 @@ +resource_group_name = "terraform-state-rg" +storage_account_name = "tfappprodpagopa" +container_name = "terraform-state" +key = "opex.pagopa-ecommerce-transactions-v1-service.terraform.tfstate" diff --git a/.opex/apim_v1/env/prod/config.yaml b/.opex/apim_v1/trx_v1/env/prod/config.yaml similarity index 81% rename from .opex/apim_v1/env/prod/config.yaml rename to .opex/apim_v1/trx_v1/env/prod/config.yaml index 30b339eda..cee22c30e 100644 --- a/.opex/apim_v1/env/prod/config.yaml +++ b/.opex/apim_v1/trx_v1/env/prod/config.yaml @@ -1,5 +1,5 @@ -oa3_spec: ./api-spec/transactions-api.yaml # If start with http the file would be downloaded from the internet -name: opex_pagopa-ecommerce-transactions-service +oa3_spec: ./api-spec/v1/transactions-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-v1-service location: West Europe timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim diff --git a/.opex/apim_v2/env/prod/terraform.tfvars b/.opex/apim_v1/trx_v1/env/prod/terraform.tfvars similarity index 100% rename from .opex/apim_v2/env/prod/terraform.tfvars rename to .opex/apim_v1/trx_v1/env/prod/terraform.tfvars diff --git a/.opex/apim_v1/trx_v2/env/prod/backend.ini b/.opex/apim_v1/trx_v2/env/prod/backend.ini new file mode 100644 index 000000000..631842534 --- /dev/null +++ b/.opex/apim_v1/trx_v2/env/prod/backend.ini @@ -0,0 +1 @@ +subscription=PROD-pagoPA diff --git a/.opex/apim_v1/trx_v2/env/prod/backend.tfvars b/.opex/apim_v1/trx_v2/env/prod/backend.tfvars new file mode 100644 index 000000000..6425ba68e --- /dev/null +++ b/.opex/apim_v1/trx_v2/env/prod/backend.tfvars @@ -0,0 +1,4 @@ +resource_group_name = "terraform-state-rg" +storage_account_name = "tfappprodpagopa" +container_name = "terraform-state" +key = "opex.pagopa-ecommerce-transactions-v1-service.terraform.tfstate" diff --git a/.opex/apim_v1/trx_v2/env/prod/config.yaml b/.opex/apim_v1/trx_v2/env/prod/config.yaml new file mode 100644 index 000000000..d6f7193e7 --- /dev/null +++ b/.opex/apim_v1/trx_v2/env/prod/config.yaml @@ -0,0 +1,12 @@ +oa3_spec: ./api-spec/v2/transactions-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-v2-service +location: West Europe +timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan +data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim +resource_type: api-management +action_groups: + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA +overrides: + hosts: # Use these hosts instead of those inside the OpenApi spec + - api.platform.pagopa.it diff --git a/.opex/apim_v1/env/uat/terraform.tfvars b/.opex/apim_v1/trx_v2/env/prod/terraform.tfvars similarity index 84% rename from .opex/apim_v1/env/uat/terraform.tfvars rename to .opex/apim_v1/trx_v2/env/prod/terraform.tfvars index e581a38b5..6b2ba130d 100644 --- a/.opex/apim_v1/env/uat/terraform.tfvars +++ b/.opex/apim_v1/trx_v2/env/prod/terraform.tfvars @@ -1,10 +1,10 @@ prefix = "pagopa" -env_short = "u" +env_short = "p" tags = { CreatedBy = "Terraform" - Environment = "UAT" + Environment = "Prod" Owner = "pagoPA" Source = "https://github.com/pagopa/pagopa-ecommerce-transactions-service" CostCenter = "TS310 - PAGAMENTI & SERVIZI" diff --git a/.opex/apim_v2/redirect/env/prod/backend.ini b/.opex/apim_v2/redirect/env/prod/backend.ini new file mode 100644 index 000000000..631842534 --- /dev/null +++ b/.opex/apim_v2/redirect/env/prod/backend.ini @@ -0,0 +1 @@ +subscription=PROD-pagoPA diff --git a/.opex/apim_v2/env/prod/backend.tfvars b/.opex/apim_v2/redirect/env/prod/backend.tfvars similarity index 83% rename from .opex/apim_v2/env/prod/backend.tfvars rename to .opex/apim_v2/redirect/env/prod/backend.tfvars index d5f5fe18d..e6133c198 100644 --- a/.opex/apim_v2/env/prod/backend.tfvars +++ b/.opex/apim_v2/redirect/env/prod/backend.tfvars @@ -1,4 +1,4 @@ resource_group_name = "terraform-state-rg" storage_account_name = "tfappprodpagopa" container_name = "terraform-state" -key = "opex.pagopa-ecommerce-transactions-service-apimv2.terraform.tfstate" +key = "opex.pagopa-ecommerce-transactions-service-redirect-apimv2.terraform.tfstate" diff --git a/.opex/apim_v2/redirect/env/prod/config.yaml b/.opex/apim_v2/redirect/env/prod/config.yaml new file mode 100644 index 000000000..d6cb48b3b --- /dev/null +++ b/.opex/apim_v2/redirect/env/prod/config.yaml @@ -0,0 +1,13 @@ +oa3_spec: ./api-spec/client/openapi/redirect/redirect-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-redirect-service-apimv2 +location: West Europe +timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan +# data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim +data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-weu-core-apim-v2 +resource_type: api-management +action_groups: + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA +overrides: + hosts: # Use these hosts instead of those inside the OpenApi spec + - api.platform.pagopa.it diff --git a/.opex/apim_v2/redirect/env/prod/terraform.tfvars b/.opex/apim_v2/redirect/env/prod/terraform.tfvars new file mode 100644 index 000000000..6b2ba130d --- /dev/null +++ b/.opex/apim_v2/redirect/env/prod/terraform.tfvars @@ -0,0 +1,11 @@ +prefix = "pagopa" +env_short = "p" + + +tags = { + CreatedBy = "Terraform" + Environment = "Prod" + Owner = "pagoPA" + Source = "https://github.com/pagopa/pagopa-ecommerce-transactions-service" + CostCenter = "TS310 - PAGAMENTI & SERVIZI" +} diff --git a/.opex/apim_v2/trx_v1/env/prod/backend.ini b/.opex/apim_v2/trx_v1/env/prod/backend.ini new file mode 100644 index 000000000..631842534 --- /dev/null +++ b/.opex/apim_v2/trx_v1/env/prod/backend.ini @@ -0,0 +1 @@ +subscription=PROD-pagoPA diff --git a/.opex/apim_v2/trx_v1/env/prod/backend.tfvars b/.opex/apim_v2/trx_v1/env/prod/backend.tfvars new file mode 100644 index 000000000..47461359c --- /dev/null +++ b/.opex/apim_v2/trx_v1/env/prod/backend.tfvars @@ -0,0 +1,4 @@ +resource_group_name = "terraform-state-rg" +storage_account_name = "tfappprodpagopa" +container_name = "terraform-state" +key = "opex.pagopa-ecommerce-transactions-v1-service-apimv2.terraform.tfstate" diff --git a/.opex/apim_v2/env/prod/config.yaml b/.opex/apim_v2/trx_v1/env/prod/config.yaml similarity index 84% rename from .opex/apim_v2/env/prod/config.yaml rename to .opex/apim_v2/trx_v1/env/prod/config.yaml index 37144aef0..ec0ace69e 100644 --- a/.opex/apim_v2/env/prod/config.yaml +++ b/.opex/apim_v2/trx_v1/env/prod/config.yaml @@ -1,5 +1,5 @@ -oa3_spec: ./api-spec/transactions-api.yaml # If start with http the file would be downloaded from the internet -name: opex_pagopa-ecommerce-transactions-service-apimv2 +oa3_spec: ./api-spec/v1/transactions-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-v1-service-apimv2 location: West Europe timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan # data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim diff --git a/.opex/apim_v2/trx_v1/env/prod/terraform.tfvars b/.opex/apim_v2/trx_v1/env/prod/terraform.tfvars new file mode 100644 index 000000000..6b2ba130d --- /dev/null +++ b/.opex/apim_v2/trx_v1/env/prod/terraform.tfvars @@ -0,0 +1,11 @@ +prefix = "pagopa" +env_short = "p" + + +tags = { + CreatedBy = "Terraform" + Environment = "Prod" + Owner = "pagoPA" + Source = "https://github.com/pagopa/pagopa-ecommerce-transactions-service" + CostCenter = "TS310 - PAGAMENTI & SERVIZI" +} diff --git a/.opex/apim_v2/trx_v2/env/prod/backend.ini b/.opex/apim_v2/trx_v2/env/prod/backend.ini new file mode 100644 index 000000000..631842534 --- /dev/null +++ b/.opex/apim_v2/trx_v2/env/prod/backend.ini @@ -0,0 +1 @@ +subscription=PROD-pagoPA diff --git a/.opex/apim_v2/trx_v2/env/prod/backend.tfvars b/.opex/apim_v2/trx_v2/env/prod/backend.tfvars new file mode 100644 index 000000000..002d4ffe5 --- /dev/null +++ b/.opex/apim_v2/trx_v2/env/prod/backend.tfvars @@ -0,0 +1,4 @@ +resource_group_name = "terraform-state-rg" +storage_account_name = "tfappprodpagopa" +container_name = "terraform-state" +key = "opex.pagopa-ecommerce-transactions-v2-service-apimv2.terraform.tfstate" diff --git a/.opex/apim_v2/trx_v2/env/prod/config.yaml b/.opex/apim_v2/trx_v2/env/prod/config.yaml new file mode 100644 index 000000000..557c90d81 --- /dev/null +++ b/.opex/apim_v2/trx_v2/env/prod/config.yaml @@ -0,0 +1,13 @@ +oa3_spec: ./api-spec/v2/transactions-api.yaml # If start with http the file would be downloaded from the internet +name: opex_pagopa-ecommerce-transactions-v2-service-apimv2 +location: West Europe +timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan +# data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-apim +data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-api-rg/providers/Microsoft.ApiManagement/service/pagopa-p-weu-core-apim-v2 +resource_type: api-management +action_groups: + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA + - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA +overrides: + hosts: # Use these hosts instead of those inside the OpenApi spec + - api.platform.pagopa.it diff --git a/.opex/apim_v2/trx_v2/env/prod/terraform.tfvars b/.opex/apim_v2/trx_v2/env/prod/terraform.tfvars new file mode 100644 index 000000000..6b2ba130d --- /dev/null +++ b/.opex/apim_v2/trx_v2/env/prod/terraform.tfvars @@ -0,0 +1,11 @@ +prefix = "pagopa" +env_short = "p" + + +tags = { + CreatedBy = "Terraform" + Environment = "Prod" + Owner = "pagoPA" + Source = "https://github.com/pagopa/pagopa-ecommerce-transactions-service" + CostCenter = "TS310 - PAGAMENTI & SERVIZI" +}