improve regions handling logic to allow override region specific settings without setting region to custom

Author: maratsal

charts/shield/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - name: mavimo
     email: marcovito.moscaritolo@sysdig.com
 type: application
-version: 1.3.1
+version: 1.3.2
 appVersion: "1.0.0"

charts/shield/templates/common/_regions.tpl

@@ -180,16 +180,16 @@
 
 {{- define "common.collector_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
-    {{- get (get $regions .Values.sysdig_endpoint.region) "collector_endpoint"  }}
+  {{- if and (ne "custom" .Values.sysdig_endpoint.region) (not .Values.sysdig_endpoint.collector.host) }}
+    {{- get (get $regions .Values.sysdig_endpoint.region) "collector_endpoint" }}
   {{- else }}
     {{- .Values.sysdig_endpoint.collector.host }}
   {{- end }}
 {{- end }}
 
 {{- define "common.monitor_api_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if hasKey $regions .Values.sysdig_endpoint.region }}
+  {{- if and (ne "custom" .Values.sysdig_endpoint.region) (not .Values.sysdig_endpoint.api_url) }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "monitor_api_endpoint" }}
   {{- else }}
     {{- .Values.sysdig_endpoint.api_url }}
@@ -198,18 +198,18 @@
 
 {{- define "common.secure_api_endpoint" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
+  {{- if and (ne "custom" .Values.sysdig_endpoint.region) (not .Values.sysdig_endpoint.api_url) }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "secure_api_endpoint" }}
   {{- else }}
-    {{- .Values.sysdig_endpoint.api_url }}
+    {{- .Values.sysdig_endpoint.api_url  }}
   {{- end }}
 {{- end }}
 
 {{- define "common.secure_ui" }}
   {{- $regions := fromYaml (include "common.regions" .) }}
-  {{- if ne "custom" .Values.sysdig_endpoint.region }}
+  {{- if and (ne "custom" .Values.sysdig_endpoint.region) (not .Values.sysdig_endpoint.api_url) }}
     {{- get (get $regions .Values.sysdig_endpoint.region) "secure_ui" }}
   {{- else }}
-    {{- .Values.sysdig_endpoint.api_url}}
+    {{- .Values.sysdig_endpoint.api_url }}
   {{- end }}
 {{- end }}

charts/shield/tests/common/regions_test.yaml

@@ -11,19 +11,59 @@ tests:
     set:
       sysdig_endpoint:
         region: "eu1"
+        api_url:
+        collector:
+          host:
+          port:
     asserts:
       - matchRegex:
           path: data["dragent.yaml"]
           pattern: |
             collector: ingest-eu1.app.sysdig.com
-            collector_port: 6443
 
   - it: API endpoint validation
     set:
       sysdig_endpoint:
         region: "us1"
+        api_url:
+        collector:
+          host:
+          port:
     asserts:
       - matchRegex:
           path: data["dragent.yaml"]
           pattern: |
             sysdig_api_endpoint: secure.sysdig.com
+
+  - it: Collector and API endpoint validation when collector host and port set, but region is not custom and api_url is not set.
+    set:
+      cluster_config:
+        name: test-cluster
+      sysdig_endpoint:
+        region: "us2"
+        collector:
+          host: ingest-alt-us2.app.sysdig.com
+          port: 443
+        api_url:
+    asserts:
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            collector: ingest-alt-us2.app.sysdig.com
+            collector_port: 443
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            sysdig_api_endpoint: us2.app.sysdig.com
+
+  - it: Collector host, port and API endpoint validation when region is custom.
+    asserts:
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            collector: example.com
+            collector_port: 6443
+      - matchRegex:
+          path: data["dragent.yaml"]
+          pattern: |
+            sysdig_api_endpoint: https://www.example.com