review fixes

TouK · Mar 4, 2024 · 8445dee · 8445dee
1 parent 75b0e3d
commit 8445dee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/bats-suites/rr-only.bats b/src/bats-suites/rr-only.bats
@@ -58,7 +58,7 @@ function setup() {
   INPUT_MESSAGE='{"productId":10}'
   EXPECTED_OUTPUT_MESSAGE='{"productId":20}'
 
-  if [[ $(curl $SCENARIO_URL -d $INPUT_MESSAGE) == $EXPECTED_OUTPUT_MESSAGE ]]; then echo ok; else exit 1; fi
+  if [[ $(curl $RR_SCENARIO_INPUT_URL -d $INPUT_MESSAGE) == $EXPECTED_OUTPUT_MESSAGE ]]; then echo ok; else exit 1; fi
 
   cancel_process "$PROCESS_NAME"
   wait_for_status "$PROCESS_NAME" "CANCELED"

diff --git a/src/templates/configmap.yaml b/src/templates/configmap.yaml
@@ -164,15 +164,15 @@ data:
     {{- if .Values.grafana.enabled }}
     metricsSettings: {
       url: "{{ include "nussknacker.grafanaUrl" .}}/d/$dashboard?theme=dark&var-scenarioName=$scenarioName&var-env="${environment}
-        defaultDashboard: ""
-        scenarioTypeToDashboard: {
-          {{- if .Values.nussknacker.streaming.enabled }}
-          "streaming": "{{ include "nussknacker.streaming.dashboard" .}}"
-          {{- end }}
-          {{- if and (.Values.nussknacker.requestResponse.enabled) (eq .Values.nussknacker.mode "lite-k8s") }}
-          "request-response": "{{ .Values.nussknacker.requestResponse.dashboard }}"
-          {{- end }}
-        }
+      defaultDashboard: ""
+      scenarioTypeToDashboard: {
+        {{- if .Values.nussknacker.streaming.enabled }}
+        "streaming": "{{ include "nussknacker.streaming.dashboard" .}}"
+        {{- end }}
+        {{- if and (.Values.nussknacker.requestResponse.enabled) (eq .Values.nussknacker.mode "lite-k8s") }}
+        "request-response": "{{ .Values.nussknacker.requestResponse.dashboard }}"
+        {{- end }}
+      }
     }
     {{- end }}
 

diff --git a/src/templates/tests/test-job.yaml b/src/templates/tests/test-job.yaml
@@ -42,7 +42,7 @@ spec:
               value: "{{ include "nussknacker.streamingScenarioType" . }}"
             - name: SCHEMA_REGISTRY_URL
               value: "{{ include "nussknacker.schemaRegistryUrl" . }}"
-            - name: SCENARIO_URL
+            - name: RR_SCENARIO_INPUT_URL
               value: "http://{{ .Release.Name }}-test-scenario-for-rr-only:{{ .Values.nussknacker.requestResponse.servicePort }}"
           volumeMounts:
             - name: suites

diff --git a/src/values.yaml b/src/values.yaml
@@ -145,8 +145,6 @@ nussknacker:
   configFile: /etc/nussknacker/application.conf
   flinkConfig:
     jobManagerTimeout: "1m"
-    #Have to be provided if Flink not enabled
-    #restUrl:
   useDefaultScenarioType: true
   modelConfig: {}
   configExecutionOverrides: {}