chore: executing merge

.github/workflows/04_release_and_deploy.yml

@@ -18,15 +18,13 @@ on:
           - dev
           - uat
           - prod
-      semver:
+      version:
         required: false
         type: choice
         description: Select the version
         options:
           - ''
-          - skip
-          - promote
-          - patch
+          - skip_or_promote
           - new_release
           - breaking_change
       beta:
@@ -40,10 +38,6 @@ on:
       environment:
         required: true
         type: string
-      semver:
-        required: true
-        type: string
-        default: skip
 
 permissions:
   packages: write
@@ -59,14 +53,47 @@ jobs:
     name: Setup
     runs-on: ubuntu-latest
     outputs:
-      semver: ${{ steps.semver_setup.outputs.semver }}
-      environment: ${{ steps.semver_setup.outputs.environment }}
+      semver: ${{ steps.get_semver.outputs.semver }}
+      environment: ${{ steps.get_env.outputs.environment }}
     steps:
-      - name: Semver setup
-        id: semver_setup
-        uses: pagopa/github-actions-template/nodo5-semver-setup@ce252c8501c9242bd6045f7cdd650736b2f38777
-        with:
-          semver: ${{ inputs.semver }}
+      - name: pull request rejected
+        if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged != true
+        run: |
+          echo "❌ PR was closed without a merge"
+          exit 1
+
+      # Set Semvar
+      - run: echo "SEMVER=patch" >> $GITHUB_ENV
+
+      - if: ${{ (github.event.pull_request.merged && contains(github.event.pull_request.labels.*.name, 'breaking-change')) }}
+        run: echo "SEMVER=major" >> $GITHUB_ENV
+
+      # force semver if dev, !=main or skip release
+      - if: ${{ inputs.version == 'new_release' }}
+        run: echo "SEMVER=minor" >> $GITHUB_ENV
+
+      - if: ${{ inputs.version == 'breaking_change' }}
+        run: echo "SEMVER=major" >> $GITHUB_ENV
+
+      - if: ${{ github.ref_name != 'main' }}
+        run: echo "SEMVER=buildNumber" >> $GITHUB_ENV
+
+      - if: ${{ inputs.version == 'skip_or_promote' }}
+        run: echo "SEMVER=skip" >> $GITHUB_ENV
+
+      - id: get_semver
+        name: Set Output
+        run: echo "semver=${{env.SEMVER}}" >> $GITHUB_OUTPUT
+
+      # Set Environment
+      - run: echo "ENVIRNOMENT=${{ inputs.environment}}" >> $GITHUB_ENV
+
+      - if: ${{ inputs.environment == null }}
+        run: echo "ENVIRNOMENT=dev" >> $GITHUB_ENV
+
+      - id: get_env
+        name: Set Output
+        run: echo "environment=${{env.ENVIRNOMENT}}" >> $GITHUB_OUTPUT
 
   release:
     needs: [setup]

.identity/00_data.tf

@@ -36,18 +36,14 @@ data "azurerm_key_vault" "nodo_key_vault" {
   resource_group_name = "pagopa-${var.env_short}-nodo-sec-rg"
 }
 
-data "azurerm_resource_group" "apim_resource_group" {
-  name = "${local.product}-api-rg"
-}
-
 data "azurerm_key_vault_secret" "key_vault_sonar" {
   name         = "sonar-token"
   key_vault_id = data.azurerm_key_vault.key_vault.id
 }
 
-data "azurerm_key_vault_secret" "key_vault_bot_token" {
-  name         = "bot-token-github"
-  key_vault_id = data.azurerm_key_vault.key_vault.id
+data "azurerm_key_vault_secret" "key_vault_bot_cd_token" {
+  name         = "pagopa-platform-domain-github-bot-cd-pat"
+  key_vault_id = data.azurerm_key_vault.domain_key_vault.id
 }
 
 data "azurerm_key_vault_secret" "key_vault_cucumber_token" {
@@ -96,7 +92,7 @@ data "azurerm_key_vault_secret" "opex_org_subscription_key" {
   key_vault_id = data.azurerm_key_vault.domain_key_vault.id
 }
 
-data "azurerm_key_vault_secret" "key_vault_slack_webhook_url" {
+data "azurerm_key_vault_secret" "key_vault_integration_test_slack_webhook_url" {
   name         = "slack-webhook-url"
   key_vault_id = data.azurerm_key_vault.domain_key_vault.id
 }
@@ -116,6 +112,6 @@ data "azurerm_user_assigned_identity" "identity_cd" {
 }
 
 data "azurerm_user_assigned_identity" "identity_ci" {
-  name = "${local.product}-${local.domain}-01-github-ci-identity"
+  name                = "${local.product}-${local.domain}-01-github-ci-identity"
   resource_group_name = "${local.product}-identity-rg"
 }

.identity/03_github_environment.tf

@@ -4,7 +4,9 @@ resource "github_repository_environment" "github_repository_environment" {
   # filter teams reviewers from github_organization_teams
   # if reviewers_teams is null no reviewers will be configured for environment
   dynamic "reviewers" {
-    for_each = (var.github_repository_environment.reviewers_teams == null || var.env_short != "p" ? [] : [1])
+    for_each = (var.github_repository_environment.reviewers_teams == null || var.env_short != "p" ? [] : [
+      1
+    ])
     content {
       teams = matchkeys(
         data.github_organization_teams.all.teams.*.id,
@@ -24,10 +26,10 @@ locals {
     "CD_CLIENT_ID" : data.azurerm_user_assigned_identity.identity_cd.client_id,
     "CI_CLIENT_ID" : data.azurerm_user_assigned_identity.identity_ci.client_id,
     "TENANT_ID" : data.azurerm_client_config.current.tenant_id,
-    "INTERNAL_SUBSCRIPTION_KEY": var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_internal_subscription_key[0].value : data.azurerm_key_vault_secret.opex_internal_subscription_key[0].value,
+    "INTERNAL_SUBSCRIPTION_KEY" : var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_internal_subscription_key[0].value : data.azurerm_key_vault_secret.opex_internal_subscription_key[0].value,
     "SUBSCRIPTION_ID" : data.azurerm_subscription.current.subscription_id,
-    "PSP_SUBSCRIPTION_KEY": var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_psp_subscription_key[0].value : ""
-    "ORG_SUBSCRIPTION_KEY": var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_org_subscription_key[0].value : ""
+    "PSP_SUBSCRIPTION_KEY" : var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_psp_subscription_key[0].value : ""
+    "ORG_SUBSCRIPTION_KEY" : var.env_short != "p" ? data.azurerm_key_vault_secret.integration_test_org_subscription_key[0].value : ""
   }
   env_variables = {
     "CONTAINER_APP_ENVIRONMENT_NAME" : local.container_app_environment.name,
@@ -36,8 +38,8 @@ locals {
     "CLUSTER_RESOURCE_GROUP" : local.aks_cluster.resource_group_name,
     "DOMAIN" : local.domain,
     "NAMESPACE" : local.domain,
-    "INTEGRATION_TEST_STORAGE_ACCOUNT_NAME": local.integration_test.storage_account_name
-    "INTEGRATION_TEST_REPORTS_FOLDER": local.integration_test.reports_folder
+    "INTEGRATION_TEST_STORAGE_ACCOUNT_NAME" : local.integration_test.storage_account_name
+    "INTEGRATION_TEST_REPORTS_FOLDER" : local.integration_test.reports_folder
   }
 }
 
@@ -71,30 +73,30 @@ resource "github_actions_environment_variable" "github_environment_runner_variab
 
 #tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
 resource "github_actions_secret" "secret_sonar_token" {
-  repository       = local.github.repository
-  secret_name      = "SONAR_TOKEN"
-  plaintext_value  = data.azurerm_key_vault_secret.key_vault_sonar.value
+  repository      = local.github.repository
+  secret_name     = "SONAR_TOKEN"
+  plaintext_value = data.azurerm_key_vault_secret.key_vault_sonar.value
 }
 
 #tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
 resource "github_actions_secret" "secret_bot_token" {
-  repository       = local.github.repository
-  secret_name      = "BOT_TOKEN_GITHUB"
-  plaintext_value  = data.azurerm_key_vault_secret.key_vault_bot_token.value
+  repository      = local.github.repository
+  secret_name     = "BOT_TOKEN_GITHUB"
+  plaintext_value = data.azurerm_key_vault_secret.key_vault_bot_cd_token.value
 }
 
 #tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
 resource "github_actions_secret" "secret_slack_webhook" {
-  repository       = local.github.repository
-  secret_name      = "SLACK_WEBHOOK_URL"
-  plaintext_value  = data.azurerm_key_vault_secret.key_vault_slack_webhook_url.value
+  repository      = local.github.repository
+  secret_name     = "SLACK_WEBHOOK_URL"
+  plaintext_value = data.azurerm_key_vault_secret.key_vault_slack_webhook_url.value
 }
 
 #tfsec:ignore:github-actions-no-plain-text-action-secrets # not real secret
 resource "github_actions_secret" "secret_integrationtest_slack_webhook" {
-  repository       = local.github.repository
-  secret_name      = "INTEGRATION_TEST_SLACK_WEBHOOK_URL"
-  plaintext_value  = data.azurerm_key_vault_secret.key_vault_integration_test_slack_webhook_url.value
+  repository      = local.github.repository
+  secret_name     = "INTEGRATION_TEST_SLACK_WEBHOOK_URL"
+  plaintext_value = data.azurerm_key_vault_secret.key_vault_integration_test_slack_webhook_url.value
 }
 
 ############

README.md

@@ -78,6 +78,11 @@ You can run your application in dev mode that enables live coding using:
 ```shell script
 ./mvnw compile quarkus:dev
 ```
+Otherwise, with quarkus CLI:
+```
+brew install quarkusio/tap/quarkus
+quarkus dev -DskipTests=true
+```
 
 > **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only
 > at http://localhost:8080/q/dev/.

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-fdr-chart
 description: Flussi di rendicontazioni
 type: application
-version: "1.30.0"
-appVersion: "1.0.23"
+version: "1.50.0"
+appVersion: "1.1.0"
 dependencies:
   - name: microservice-chart
     version: 3.0.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-fdr
-    tag: 1.0.23
+    tag: 1.1.0
     pullPolicy: Always
   readinessProbe:
     httpGet:

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-fdr
-    tag: 1.0.23
+    tag: 1.1.0
     pullPolicy: Always
   readinessProbe:
     httpGet:

openapi/openapi_internal.json

@@ -4,7 +4,7 @@
     "title": "FDR - Flussi di rendicontazione (local)",
     "description": "Manage FDR ( aka \"Flussi di Rendicontazione\" ) exchanged between PSP and EC",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "1.0.23"
+    "version": "1.1.0"
   },
   "servers": [
     {

openapi/openapi_organization.json

@@ -4,7 +4,7 @@
     "title": "FDR - Flussi di rendicontazione (local)",
     "description": "Manage FDR ( aka \"Flussi di Rendicontazione\" ) exchanged between PSP and EC",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "1.0.23"
+    "version": "1.1.0"
   },
   "servers": [
     {

openapi/openapi_psp.json

@@ -4,7 +4,7 @@
     "title": "FDR - Flussi di rendicontazione (local)",
     "description": "Manage FDR ( aka \"Flussi di Rendicontazione\" ) exchanged between PSP and EC",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "1.0.23"
+    "version": "1.1.0"
   },
   "servers": [
     {

performance-test/python-test/main.py

@@ -0,0 +1,44 @@
+import sys
+import logging, time
+import methods
+
+
+NUMBER_OF_PAYMENTS = 300
+MAX_PAYMENTS_PER_ADD_OPERATION = 100
+
+def main(URL, subkey):
+    logging.basicConfig(level=logging.INFO)
+
+    flow_date = "2024-10-30"
+    tmstmp = timestamp = int(time.time())
+    flow_name = f"{flow_date}88888888888-{tmstmp}"
+
+    create_url = URL + f"/psps/88888888888/fdrs/{flow_name}"
+    methods.create_empty_flow(create_url, flow_name, flow_date, NUMBER_OF_PAYMENTS, subkey)
+
+
+    add_url = URL + f"/psps/88888888888/fdrs/{flow_name}/payments/add"
+    methods.add_payments(add_url, NUMBER_OF_PAYMENTS, MAX_PAYMENTS_PER_ADD_OPERATION, flow_date, subkey)
+
+
+    publish_url = URL + f"/psps/88888888888/fdrs/{flow_name}/publish"
+    methods.publish_payments(publish_url, subkey)
+
+def get_url(env):
+    if env == 'dev':
+        return "https://api.dev.platform.pagopa.it/fdr-psp/service/v1"
+    elif env == 'uat':
+        return "https://upload.uat.platform.pagopa.it/fdr-psp/service/v1"
+    else:
+        raise ValueError(f"Invalid environment: {env}. Please use 'dev' or 'uat'.")
+
+if __name__ == "__main__":
+    try:
+        env = sys.argv[1]
+        key = sys.argv[2]
+        url = get_url(env)
+        main(url, key)
+    except IndexError:
+        print("Usage: python3 main.py <environment> <sukey> \ni.e. python3 main.py dev your-key")
+    except ValueError as e:
+        print(e)