fix: update remaining port mappings and format yaml (#130)

aklivity · May 1, 2024 · 4368a59 · 4368a59
1 parent 9c6ff10
commit 4368a59
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 109 deletions.
diff --git a/http.filesystem.config.server/README.md b/http.filesystem.config.server/README.md
@@ -92,15 +92,16 @@ bindings:
     kind: server
     options:
       host: 0.0.0.0
-      port: 7114
-    exit: north_http_server
-  tcp_server1:
-    type: tcp
-    kind: server
-    options:
-      host: 0.0.0.0
-      port: 7143
-    exit: north_tls_server
+      port:
+        - 7114
+        - 7143
+    routes:
+      - when:
+          - port: 7114
+        exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.filesystem.config.server/www-updated/zilla.yaml b/http.filesystem.config.server/www-updated/zilla.yaml
@@ -14,15 +14,16 @@ bindings:
     kind: server
     options:
       host: 0.0.0.0
-      port: 7114
-    exit: north_http_server
-  tcp_server1:
-    type: tcp
-    kind: server
-    options:
-      host: 0.0.0.0
-      port: 7143
-    exit: north_tls_server
+      port:
+        - 7114
+        - 7143
+    routes:
+      - when:
+          - port: 7114
+        exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.filesystem.config.server/www/zilla.yaml b/http.filesystem.config.server/www/zilla.yaml
@@ -14,15 +14,16 @@ bindings:
     kind: server
     options:
       host: 0.0.0.0
-      port: 7114
-    exit: north_http_server
-  tcp_server1:
-    type: tcp
-    kind: server
-    options:
-      host: 0.0.0.0
-      port: 7143
-    exit: north_tls_server
+      port:
+        - 7114
+        - 7143
+    routes:
+      - when:
+          - port: 7114
+        exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.async/zilla.yaml b/http.kafka.async/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.cache/zilla.yaml b/http.kafka.cache/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.crud/zilla.yaml b/http.kafka.crud/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.karapace/zilla.yaml b/http.kafka.karapace/zilla.yaml
@@ -24,12 +24,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.oneway/zilla.yaml b/http.kafka.oneway/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.sasl.scram/zilla.yaml b/http.kafka.sasl.scram/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/http.kafka.sync/zilla.yaml b/http.kafka.sync/zilla.yaml
@@ -30,12 +30,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
     telemetry:
       metrics:
         - stream.*

diff --git a/http.redpanda.sasl.scram/zilla.yaml b/http.redpanda.sasl.scram/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/mqtt.kafka.broker/zilla.yaml b/mqtt.kafka.broker/zilla.yaml
@@ -16,28 +16,16 @@ bindings:
       - when:
           - port: 7114
         exit: north_http_server
-      - when:
-          - port: 7143
-        exit: north_wss_tls_server
       - when:
           - port: 7183
         exit: north_mqtt_server
       - when:
+          - port: 7143
           - port: 7883
-        exit: north_mqtts_tls_server
+        exit: north_tls_server
 
   # TLS decrypting
-  north_mqtts_tls_server:
-    type: tls
-    kind: server
-    vault: my_servers
-    options:
-      keys:
-        - localhost
-      sni:
-        - localhost
-    exit: north_mqtt_server
-  north_wss_tls_server:
+  north_tls_server:
     type: tls
     kind: server
     vault: my_servers
@@ -46,7 +34,13 @@ bindings:
         - localhost
       sni:
         - localhost
-    exit: north_http_server
+    routes:
+      - when:
+          - port: 7143
+        exit: north_http_server
+      - when:
+          - port: 7883
+        exit: north_mqtt_server
 
   # WebSocket server
   north_http_server:

diff --git a/sse.kafka.fanout/zilla.yaml b/sse.kafka.fanout/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/ws.echo/zilla.yaml b/ws.echo/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server

diff --git a/ws.reflect/zilla.yaml b/ws.reflect/zilla.yaml
@@ -18,12 +18,12 @@ bindings:
         - 7143
         - 7114
     routes:
-        - when:
-            - port: 7143
-          exit: north_tls_server
-        - when:
-            - port: 7114
-          exit: north_http_server
+      - when:
+          - port: 7143
+        exit: north_tls_server
+      - when:
+          - port: 7114
+        exit: north_http_server
   north_tls_server:
     type: tls
     kind: server