Merge pull request #5 from pagopa/fix-deploy

Fix Deploy
pagopa · Sep 13, 2024 · 049177a · 049177a
2 parents cc70fe6 + dea29c0
commit 049177a
Show file tree

Hide file tree

Showing 10 changed files with 226 additions and 55 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-calculator
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 0.14.0
-appVersion: 1.0.2
+version: 0.19.0
+appVersion: 1.0.2-5-fix-deploy
 dependencies:
   - name: microservice-chart
     version: 5.9.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,22 +4,22 @@ microservice-chart:
   fullnameOverride: "pagopa-biz-pm-ingestion"
   image:
     repository: ghcr.io/pagopa/pagopa-biz-pm-ingestion
-    tag: "1.0.2"
+    tag: "1.0.2-5-fix-deploy"
     pullPolicy: Always
   livenessProbe:
     httpGet:
       path: /actuator/health/liveness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   readinessProbe:
     httpGet:
       path: /actuator/health/readiness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   deployment:
     create: true
   service:
@@ -49,14 +49,14 @@ microservice-chart:
   resources:
     requests:
       memory: "512Mi"
-      cpu: "0.25"
+      cpu: "0.3"
     limits:
-      memory: "512Mi"
-      cpu: "0.25"
+      memory: "1024Mi"
+      cpu: "0.5"
   autoscaling:
     enable: true
     minReplica: 1
-    maxReplica: 10
+    maxReplica: 1
     pollingInterval: 10 # seconds
     cooldownPeriod: 50 # seconds
     triggers:
@@ -78,7 +78,7 @@ microservice-chart:
     COSMOS_DB_VIEW_GENERAL_CONTAINER_NAME: 'biz-events-view-general'
     COSMOS_DB_VIEW_CART_CONTAINER_NAME: 'biz-events-view-cart'
     COSMOS_QUERY_METRICS: 'false'
-    ORACLE_PM_DB_USER: 'PAGOPA_READER'
+    ORACLE_PM_DB_USER: 'AGID_USER'
     ORACLE_SCHEMA: 'AGID_USER'
     OTEL_SERVICE_NAME: 'pagopabizpmingestion'
     OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=dev"

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,22 +4,22 @@ microservice-chart:
   fullnameOverride: "pagopa-biz-pm-ingestion"
   image:
     repository: ghcr.io/pagopa/pagopa-biz-pm-ingestion
-    tag: "1.0.2"
+    tag: "1.0.2-5-fix-deploy"
     pullPolicy: Always
   livenessProbe:
     httpGet:
       path: /actuator/health/liveness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   readinessProbe:
     httpGet:
       path: /actuator/health/readiness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   deployment:
     create: true
   service:
@@ -49,14 +49,14 @@ microservice-chart:
   resources:
     requests:
       memory: "512Mi"
-      cpu: "0.25"
+      cpu: "0.5"
     limits:
-      memory: "512Mi"
-      cpu: "0.25"
+      memory: "2048Mi"
+      cpu: "1.0"
   autoscaling:
     enable: true
-    minReplica: 3
-    maxReplica: 10
+    minReplica: 1
+    maxReplica: 1
     pollingInterval: 10 # seconds
     cooldownPeriod: 50 # seconds
     triggers:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,22 +4,22 @@ microservice-chart:
   fullnameOverride: "pagopa-biz-pm-ingestion"
   image:
     repository: ghcr.io/pagopa/pagopa-biz-pm-ingestion
-    tag: "1.0.2"
+    tag: "1.0.2-5-fix-deploy"
     pullPolicy: Always
   livenessProbe:
     httpGet:
       path: /actuator/health/liveness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   readinessProbe:
     httpGet:
       path: /actuator/health/readiness
       port: 8080
-    initialDelaySeconds: 90
+    initialDelaySeconds: 180
     failureThreshold: 6
-    periodSeconds: 10
+    periodSeconds: 30
   deployment:
     create: true
   service:
@@ -49,14 +49,14 @@ microservice-chart:
   resources:
     requests:
       memory: "512Mi"
-      cpu: "0.25"
+      cpu: "0.3"
     limits:
-      memory: "512Mi"
-      cpu: "0.25"
+      memory: "1024Mi"
+      cpu: "0.7"
   autoscaling:
     enable: true
-    minReplica: 3
-    maxReplica: 10
+    minReplica: 1
+    maxReplica: 1
     pollingInterval: 10 # seconds
     cooldownPeriod: 50 # seconds
     triggers:
@@ -78,7 +78,7 @@ microservice-chart:
     COSMOS_DB_VIEW_GENERAL_CONTAINER_NAME: 'biz-events-view-general'
     COSMOS_DB_VIEW_CART_CONTAINER_NAME: 'biz-events-view-cart'
     COSMOS_QUERY_METRICS: 'false'
-    ORACLE_PM_DB_USER: 'PAGOPA_READER'
+    ORACLE_PM_DB_USER: 'AGID_USER'
     ORACLE_SCHEMA: 'AGID_USER'
     OTEL_SERVICE_NAME: 'pagopabizpmingestion'
     OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=uat"

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -1,13 +1,33 @@
 {
   "openapi": "3.0.1",
   "info": {
-    "title": "OpenAPI definition",
-    "version": "1.0.2"
+    "title": "bizpmingestion",
+    "description": "Microservice for retrieving payment receipts from the PM.",
+    "termsOfService": "https://www.pagopa.gov.it/",
+    "version": "1.0.2-5-fix-deploy"
   },
   "servers": [
     {
-      "url": "http://localhost",
-      "description": "Generated server url"
+      "url": "http://localhost:8080"
+    },
+    {
+      "url": "https://{host}{basePath}",
+      "variables": {
+        "host": {
+          "default": "api.dev.platform.pagopa.it",
+          "enum": [
+            "api.dev.platform.pagopa.it",
+            "api.uat.platform.pagopa.it",
+            "api.platform.pagopa.it"
+          ]
+        },
+        "basePath": {
+          "default": "/pm-ingestion/v1",
+          "enum": [
+            "/pm-ingestion/v1"
+          ]
+        }
+      }
     }
   ],
   "paths": {
@@ -44,8 +64,8 @@
           "required": true
         },
         "responses": {
-          "404": {
-            "description": "Not found.",
+          "409": {
+            "description": "Conflict.",
             "content": {
               "application/json": {
                 "schema": {
@@ -64,8 +84,8 @@
               }
             }
           },
-          "400": {
-            "description": "Malformed request.",
+          "404": {
+            "description": "Not found.",
             "content": {
               "application/json": {
                 "schema": {
@@ -74,12 +94,6 @@
               }
             }
           },
-          "401": {
-            "description": "Wrong or missing function key."
-          },
-          "200": {
-            "description": "Request paid."
-          },
           "500": {
             "description": "Service unavailable.",
             "content": {
@@ -90,23 +104,26 @@
               }
             }
           },
-          "409": {
-            "description": "Conflict.",
+          "200": {
+            "description": "Request paid."
+          },
+          "400": {
+            "description": "Malformed request.",
             "content": {
               "application/json": {
                 "schema": {
                   "$ref": "#/components/schemas/ProblemJson"
                 }
               }
             }
+          },
+          "401": {
+            "description": "Wrong or missing function key."
           }
         },
         "security": [
           {
             "ApiKey": []
-          },
-          {
-            "Authorization": []
           }
         ]
       }
@@ -159,6 +176,14 @@
           }
         }
       }
+    },
+    "securitySchemes": {
+      "ApiKey": {
+        "type": "apiKey",
+        "description": "The API key to access this function app.",
+        "name": "Ocp-Apim-Subscription-Key",
+        "in": "header"
+      }
     }
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>it.gov.pagopa</groupId>
 	<artifactId>bizpmingestion</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.2-5-fix-deploy</version>
 	<name>Biz PM Ingestion</name>
 	<description>Microservice for retrieving payment receipts from the PM.</description>
 
@@ -105,6 +105,12 @@
 			<version>${springdoc-openapi-ui-version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-ui</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+
 		<!-- utilities -->
 		<dependency>
 			<groupId>org.modelmapper</groupId>