Dev (#198)

Co-authored-by: GitHub Action <[email protected]> Co-authored-by: Simone Munao <[email protected]> Co-authored-by: LuciaM1 <[email protected]> Co-authored-by: LuciaM1 <[email protected]> Co-authored-by: ElisKina-dev <[email protected]> Co-authored-by: ElisKina-dev <[email protected]> Co-authored-by: Gabriele Maiocchi <[email protected]> Co-authored-by: Giacomo Brancazi <[email protected]>
pagopa · Oct 10, 2024 · 2f421e5 · 2f421e5
1 parent 80fb873
commit 2f421e5
Show file tree

Hide file tree

Showing 10 changed files with 14,872 additions and 14,757 deletions.
diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.33.0
+version: v1.33.0-dev.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/helm-chart/environments/values-dev.yaml b/helm-chart/environments/values-dev.yaml
@@ -43,11 +43,8 @@ objectStore:
   resource_template_path: RESOURCE/files/[RESOURCE_TYPE]
 
 cdn:
+  resourceBasePath: "https://resources.dev.atmlayer-pagopa.it"
   offset_path: RESOURCE/
-  credentialsSecretEnabled: true
-  credentialsSecretName: "pagopa-dev-atm-layer-model-cdn-base-path"
-  credentialsSecretKeys:
-    cdn_base_path: CDN_BASE_PATH
 
 secretProviderClass:
   enabled: true

diff --git a/helm-chart/environments/values-prod.yaml b/helm-chart/environments/values-prod.yaml
@@ -43,11 +43,8 @@ objectStore:
   resource_template_path: RESOURCE/files/[RESOURCE_TYPE]
 
 cdn:
+  resourceBasePath: "https://resources.atmlayer-pagopa.it"
   offset_path: RESOURCE/
-  credentialsSecretEnabled: true
-  credentialsSecretName: "pagopa-prod-atm-layer-model-cdn-base-path"
-  credentialsSecretKeys:
-    cdn_base_path: CDN_BASE_PATH
 
 secretProviderClass:
   enabled: true

diff --git a/helm-chart/environments/values-uat.yaml b/helm-chart/environments/values-uat.yaml
@@ -43,11 +43,9 @@ objectStore:
   resource_template_path: RESOURCE/files/[RESOURCE_TYPE]
 
 cdn:
+  resourceBasePath: "https://resources.uat.atmlayer-pagopa.it"
   offset_path: RESOURCE/
-  credentialsSecretEnabled: true
-  credentialsSecretName: "pagopa-uat-atm-layer-model-cdn-base-path"
-  credentialsSecretKeys:
-    cdn_base_path: CDN_BASE_PATH
+
 
 secretProviderClass:
   enabled: true

diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml
@@ -78,13 +78,9 @@ spec:
               value: "{{ .Values.tracing.endpointBasePath }}"
             - name: TRACING_ENABLE_JDBC_MONITORING
               value: "{{ .Values.tracing.enableJDBCMonitoring }}"
-            {{- if .Values.cdn.credentialsSecretEnabled }}
-            - name: CDN_BASE_PATH
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.cdn.credentialsSecretName }}
-                  key: {{ .Values.cdn.credentialsSecretKeys.cdn_base_path }}
-            {{- end }}
+            - name: RESOURCES_BASE_PATH
+              value: "{{ .Values.cdn.resourceBasePath }}"
+
           volumeMounts:
           {{- if .Values.secretProviderClass.enabled }}
           - name: secrets-store-inline

diff --git a/helm-chart/templates/secretproviderclass.yaml b/helm-chart/templates/secretproviderclass.yaml
@@ -14,11 +14,6 @@ spec:
                 objectAlias: username
               - path: password
                 objectAlias: password
-        - objectName: "pagopa-{{ .Values.secretProviderClass.env }}-atm-layer/cloudfront"
-          objectType: "secretsmanager"
-          jmesPath: 
-              - path: url
-                objectAlias: url
   secretObjects:
     - secretName: {{ .Values.database.credentialsSecretName }}
       type: Opaque
@@ -27,9 +22,4 @@ spec:
           key: {{ .Values.database.credentialsSecretKeys.username }}
         - objectName: "password"  # reference the corresponding parameter
           key: {{ .Values.database.credentialsSecretKeys.password }}
-    - secretName: {{ .Values.cdn.credentialsSecretName }}
-      type: Opaque
-      data:
-        - objectName: "url"  # reference the corresponding parameter
-          key: {{ .Values.cdn.credentialsSecretKeys.cdn_base_path }}
 {{- end }}
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>it.gov.pagopa</groupId>
     <artifactId>atm-layer-model</artifactId>
-    <version>1.33.0</version>
+    <version>1.33.0-dev.3</version>
     <name>atm-layer-model</name>
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -71,7 +71,7 @@ quarkus.rest-client.process-deploy.url=${MODEL_PROCESS_BASE_PATH:http://pagopa-d
 ###################
 # CDN
 ###################
-cdn.base-url=${CDN_BASE_PATH}
+cdn.base-url=${RESOURCES_BASE_PATH}
 cdn.offset-path=${CDN_OFFSET_PATH:RESOURCE/}
 #quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n
 ###################

diff --git a/src/test/resources/integration-test/output/result.html b/src/test/resources/integration-test/output/result.html