Merge pull request #2085 from beyonnex-io/bugfix/helm-wot-fixes

fix configuration bug in WoT validation-context and log-warning-instead-of-failing-api-calls setting

Author: thjaeckle

deployment/helm/ditto/Chart.yaml

@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.6.4  # chart version is effectively set by release-job
+version: 3.6.5  # chart version is effectively set by release-job
 appVersion: 3.6.4
 keywords:
   - iot-chart

deployment/helm/ditto/service-config/things-extension.conf.tpl

@@ -77,7 +77,6 @@ ditto {
                 "{{$thingDefinitionPattern}}"
               {{- end }}
               ]
-            }
             {{- end }}
             {{- end }}
             {{- if $dynamicWotTmValidationConfig.validationContext.featureDefinitionPatterns }}
@@ -87,9 +86,9 @@ ditto {
                 "{{$featureDefinitionPattern}}"
               {{- end }}
               ]
-            }
             {{- end }}
             {{- end }}
+            }
             config-overrides {
             {{- range $configOverridesKey, $configOverridesValue := $dynamicWotTmValidationConfig.configOverrides }}
             {{- if or (eq (kindOf $configOverridesValue) "map") (eq (kindOf $configOverridesValue) "slice") }}

deployment/helm/ditto/templates/things-deployment.yaml

@@ -268,7 +268,7 @@ spec:
             - name: THINGS_WOT_TM_MODEL_VALIDATION_ENABLED
               value: "{{ .Values.things.config.wot.tmValidation.enabled }}"
             - name: THINGS_WOT_TM_MODEL_VALIDATION_LOG_WARNING_INSTEAD_OF_FAILING_API_CALLS
-              value: "{{ .Values.things.config.wot.tmValidation.enabled }}"
+              value: "{{ index .Values.things.config.wot.tmValidation "log-warning-instead-of-failing-api-calls" }}"
             - name: THINGS_WOT_TM_MODEL_VALIDATION_THING_ENFORCE_TD_MODIFICATION
               value: "{{ index .Values.things.config.wot.tmValidation.thing.enforce "thing-description-modification" }}"
             - name: THINGS_WOT_TM_MODEL_VALIDATION_THING_ENFORCE_ATTRIBUTES