Merge pull request eclipse-tractusx#636 from catenax-ng/feat/eclipse-…

…tractusx#210-extend-helm-config feat(irs-api):[eclipse-tractusx#244] Fixed chron duration to be in ISO format, added …
ds-jhartmann · Nov 17, 2023 · efcd7da · efcd7da
2 parents 1fa8ef5 + 1e9ed38
commit efcd7da
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - IRS can now check the readiness of external services. Use the new ``management.health.dependencies.enabled`` config entry to determine if external dependencies health checks should be checked (false by default).
   - The map of external services healthcheck endpoints can be configured with ``management.health.dependencies.urls`` property, eg. ``service_name: http://service_name_host/health``
+- Added cache mechanism for ConnectorEndpointService for fetchConnectorEndpoints method cache
 
 ### Changed
 - Changed name of spring's OAuth2 client registration from 'keycloak' to 'common' like below:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -64,10 +64,12 @@ For more information on the tool and how to acquire the token, check https://git
 
 ### Commit messages
 The commit messages have to match a pattern in the form of:  
-``< type >(optional scope):[<Ticket_ID>] < description >``
+``< type >(scope):[<Ticket_ID>] < description >``  
+where type is: `build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test`
 
 Example:  
-``chore(api):[TRI-123] some text``
+``chore(api):[#123] some text``
+``chore(api): some text``
 
 Detailed pattern can be found here: [commit-msg](local/development/commit-msg)
 

diff --git a/charts/irs-helm/templates/configmap-spring-app-config.yaml b/charts/irs-helm/templates/configmap-spring-app-config.yaml
@@ -115,7 +115,7 @@ data:
             rightOperand: {{ .rightOperand | quote }}
           {{- end }}
       connectorEndpointService:
-        cacheTTL: {{ .Values.edc.connectorEndpointService.cacheTTL | int64 }}
+        cacheTTL: {{ .Values.edc.connectorEndpointService.cacheTTL | quote }}
     ess:
       localBpn: {{ tpl (.Values.bpn | default "") . | quote }}
       localEdcEndpoint: {{ tpl (.Values.edc.provider.host | default "") . | quote }}

diff --git a/charts/irs-helm/values.yaml b/charts/irs-helm/values.yaml
@@ -203,7 +203,7 @@ edc:
         operator: "eq"
         rightOperand: "active"
   connectorEndpointService:
-    cacheTTL: 86400000
+    cacheTTL: PT24H  # Time to live for ConnectorEndpointService for fetchConnectorEndpoints method cache
 discovery:
   oAuthClientId: portal  # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
 

diff --git a/irs-api/src/main/resources/application.yml b/irs-api/src/main/resources/application.yml
@@ -173,7 +173,7 @@ irs-edc-client:
         operator: "eq"
         rightOperand: "active"
   connectorEndpointService:
-    cacheTTL: 86400000
+    cacheTTL: PT24H  # Time to live for ConnectorEndpointService for fetchConnectorEndpoints method cache
 
 digitalTwinRegistry:
   type: ${DIGITALTWINREGISTRY_TYPE:decentral} # The type of DTR. This can be either "central" or "decentral". If "decentral", descriptorEndpoint, shellLookupEndpoint and oAuthClientId is not required.

diff --git a/local/development/commit-msg b/local/development/commit-msg
@@ -16,7 +16,7 @@ fi
 url="$(git remote get-url origin | sed 's/\.git/#commit-messages/')"
 
 # check semantic versioning scheme
-if ! echo "$commitTitle" | grep -qE '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\([a-z0-9/-]+\)\:\[[#0-9]+\].*$'; then
+if ! echo "$commitTitle" | grep -qE '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\([a-z0-9/-]+\)\:(\[#[0-9]+\])?.*$'; then
 	echo "Your commit title did not follow semantic versioning: $commitTitle"
 	echo "Please see $url"
 	exit 1