Merge branch 'release/0.9.85'

aklivity · Jul 10, 2024 · 9fa3e70 · 9fa3e70
2 parents 53f3fea + d74e879
commit 9fa3e70
Show file tree

Hide file tree

Showing 234 changed files with 4,384 additions and 1,047 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,24 @@
 
 ## [Unreleased](https://github.com/aklivity/zilla/tree/HEAD)
 
-[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.83...HEAD)
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.84...HEAD)
+
+**Implemented enhancements:**
+
+- add option to print version information to the cli tools [\#1066](https://github.com/aklivity/zilla/issues/1066)
+
+**Fixed bugs:**
+
+- Support key validation in kafka asyncapi generation [\#1105](https://github.com/aklivity/zilla/issues/1105)
+- Asyncapi doesn't generate schema for catalog with avro format [\#1104](https://github.com/aklivity/zilla/issues/1104)
+
+**Closed issues:**
+
+- Add more context to the Kafka API event code log formatter. [\#1126](https://github.com/aklivity/zilla/issues/1126)
+
+## [0.9.84](https://github.com/aklivity/zilla/tree/0.9.84) (2024-06-29)
+
+[Full Changelog](https://github.com/aklivity/zilla/compare/0.9.83...0.9.84)
 
 **Implemented enhancements:**
 
@@ -12,6 +29,15 @@
 
 - feat: improve troubleshooting capabilities [\#903](https://github.com/aklivity/zilla/issues/903)
 
+**Merged pull requests:**
+
+- Use default config when missing [\#1118](https://github.com/aklivity/zilla/pull/1118) ([jfallows](https://github.com/jfallows))
+- Require test exporter event properties via test schema [\#1117](https://github.com/aklivity/zilla/pull/1117) ([jfallows](https://github.com/jfallows))
+- Include engine test sources JAR in release [\#1116](https://github.com/aklivity/zilla/pull/1116) ([jfallows](https://github.com/jfallows))
+- Generate asyncapi  schema catalog with avro, protobuf format support [\#1113](https://github.com/aklivity/zilla/pull/1113) ([akrambek](https://github.com/akrambek))
+- Add logging of cluster authorization failed error to kafka binding [\#1112](https://github.com/aklivity/zilla/pull/1112) ([attilakreiner](https://github.com/attilakreiner))
+- Verify public-private tls key pair [\#1108](https://github.com/aklivity/zilla/pull/1108) ([attilakreiner](https://github.com/attilakreiner))
+
 ## [0.9.83](https://github.com/aklivity/zilla/tree/0.9.83) (2024-06-28)
 
 [Full Changelog](https://github.com/aklivity/zilla/compare/0.9.82...0.9.83)

diff --git a/build/flyweight-maven-plugin/pom.xml b/build/flyweight-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cloud/docker-image/pom.xml b/cloud/docker-image/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -217,6 +217,12 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>command-version</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>command-tune</artifactId>

diff --git a/cloud/docker-image/src/main/docker/alpine.Dockerfile b/cloud/docker-image/src/main/docker/alpine.Dockerfile
@@ -27,7 +27,7 @@ RUN apk add --no-cache wget
 RUN ./zpmw install --debug --exclude-remote-repositories
 RUN ./zpmw clean --keep-image
 
-FROM alpine:3.20.0
+FROM alpine:3.20.1
 
 ENV ZILLA_VERSION ${project.version}
 

diff --git a/cloud/docker-image/src/main/docker/zpm.json.template b/cloud/docker-image/src/main/docker/zpm.json.template
@@ -45,6 +45,7 @@
     "io.aklivity.zilla:command-metrics",
     "io.aklivity.zilla:command-start",
     "io.aklivity.zilla:command-stop",
+    "io.aklivity.zilla:command-version",
     "io.aklivity.zilla:command-tune",
     "io.aklivity.zilla:engine",
     "io.aklivity.zilla:exporter-otlp",

diff --git a/cloud/helm-chart/pom.xml b/cloud/helm-chart/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>cloud</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -65,8 +65,8 @@
         </configuration>
         <executions>
           <execution>
-            <phase>deploy</phase>
             <goals>
+              <goal>lint</goal>
               <goal>push</goal>
             </goals>
           </execution>

diff --git a/cloud/helm-chart/src/main/helm/zilla/templates/NOTES.txt b/cloud/helm-chart/src/main/helm/zilla/templates/NOTES.txt
@@ -1,4 +1,4 @@
-1. Get the application URL by running these commands:
+Connect to Zilla by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
@@ -17,8 +17,6 @@
   echo http://$SERVICE_IP:{{ $port.port }}
   {{- end }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "zilla.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  export SERVICE_PORTS=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zilla.fullname" . }} --template "{{"{{ range .spec.ports }}{{.port}} {{ end }}"}}")
+  eval "kubectl port-forward --namespace {{ .Release.Namespace }} service/{{ include "zilla.fullname" . }} $SERVICE_PORTS"
 {{- end }}
diff --git a/cloud/helm-chart/src/main/helm/zilla/templates/deployment.yaml b/cloud/helm-chart/src/main/helm/zilla/templates/deployment.yaml
@@ -19,6 +19,9 @@ spec:
       {{- end }}
       labels:
         {{- include "zilla.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+        {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -93,6 +96,7 @@ spec:
           readinessProbe:
             tcpSocket:
               port: {{ .Values.readinessProbePort }}
+            initialDelaySeconds: 3
           {{- end}}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

diff --git a/cloud/pom.xml b/cloud/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,21 +18,6 @@
 
   <modules>
     <module>docker-image</module>
+    <module>helm-chart</module>
   </modules>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <activation>
-        <property>
-          <name>release</name>
-          <value>true</value>
-        </property>
-      </activation>
-
-      <modules>
-        <module>helm-chart</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/conf/pom.xml b/conf/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp.spec/pom.xml b/incubator/binding-amqp.spec/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/binding-amqp/pom.xml b/incubator/binding-amqp/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-dump/pom.xml b/incubator/command-dump/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-log/pom.xml b/incubator/command-log/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/command-tune/pom.xml b/incubator/command-tune/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>incubator</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/incubator/pom.xml b/incubator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/manager/pom.xml b/manager/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>zilla</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.aklivity.zilla</groupId>
   <artifactId>zilla</artifactId>
-  <version>0.9.84</version>
+  <version>0.9.85</version>
   <packaging>pom</packaging>
   <name>zilla</name>
   <url>https://github.com/aklivity/zilla</url>
@@ -611,6 +611,8 @@
         <docker.skip.push>true</docker.skip.push>
         <docker.skip.tag>true</docker.skip.tag>
         <docker.latest.tag></docker.latest.tag>
+        <helm.push.skip>true</helm.push.skip>
+        <helm.package.skip>true</helm.package.skip>
       </properties>
 
       <build>

diff --git a/runtime/binding-asyncapi/pom.xml b/runtime/binding-asyncapi/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.aklivity.zilla</groupId>
     <artifactId>runtime</artifactId>
-    <version>0.9.84</version>
+    <version>0.9.85</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -107,6 +107,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>io.aklivity.zilla</groupId>
+      <artifactId>catalog-karapace</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>io.aklivity.zilla</groupId>
       <artifactId>model-core</artifactId>

diff --git a/...java/io/aklivity/zilla/runtime/binding/asyncapi/internal/config/AsyncapiHttpProtocol.java b/...java/io/aklivity/zilla/runtime/binding/asyncapi/internal/config/AsyncapiHttpProtocol.java
@@ -28,7 +28,6 @@
 import io.aklivity.zilla.runtime.binding.asyncapi.internal.model.AsyncapiSchema;
 import io.aklivity.zilla.runtime.binding.asyncapi.internal.model.AsyncapiServer;
 import io.aklivity.zilla.runtime.binding.asyncapi.internal.view.AsyncapiChannelView;
-import io.aklivity.zilla.runtime.binding.asyncapi.internal.view.AsyncapiMessageView;
 import io.aklivity.zilla.runtime.binding.asyncapi.internal.view.AsyncapiServerView;
 import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
 import io.aklivity.zilla.runtime.binding.http.config.HttpConditionConfig;
@@ -148,6 +147,7 @@ else if ("sse".equals(server.protocol()))
                                 .exit("sse_server0")
                                 .when(HttpConditionConfig::builder)
                                     .header(":path", path)
+                                    .header(":method", "GET")
                                     .build()
                                 .build();
                         }
@@ -209,18 +209,13 @@ private <C> HttpRequestConfigBuilder<C> injectContent(
     {
         if (messages != null)
         {
-            for (Map.Entry<String, AsyncapiMessage> messageEntry : messages.entrySet())
-            {
-                AsyncapiMessageView message =
-                    AsyncapiMessageView.of(asyncapi.components.messages, messageEntry.getValue());
-                request.
+            request.
                 content(JsonModelConfig::builder)
-                   .catalog()
-                        .name(INLINE_CATALOG_NAME)
-                        .inject(cataloged -> injectSchema(cataloged, asyncapi, message))
-                        .build()
-                    .build();
-            }
+                .catalog()
+                .name(INLINE_CATALOG_NAME)
+                .inject(cataloged -> injectValueSchemas(cataloged, asyncapi, messages))
+                .build()
+                .build();
         }
         return request;
     }