Handle empty YAML documents in v1 API conversion (#12326)

Signed-off-by: Jakub Scholz <www@scholzj.com>

Author: scholzj

v1-api-conversion/src/main/java/io/strimzi/kafka/api/conversion/v1/cli/ConvertFileCommand.java

@@ -94,7 +94,9 @@ protected String run(byte[] data) throws IOException {
         for (JsonNode doc : docs)   {
             JsonNode result;
 
-            if (isStrimziResource(doc)) {
+            if (doc.isNull() || doc.isEmpty()) {
+                continue;
+            } else if (isStrimziResource(doc)) {
                 result = run(doc);
             } else {
                 result = doc;

v1-api-conversion/src/test/java/io/strimzi/kafka/api/conversion/v1/cli/ConvertFileCommandTest.java

@@ -171,7 +171,11 @@ private static Stream<Arguments> correctSamples()    {
                 Arguments.of("mm2-many-mirrors.yaml", "mm2-many-mirrors.out"),
                 Arguments.of("kafka-v1beta2.yaml", "kafka-v1beta2.out"),
                 Arguments.of("kafka-all-out.yaml", "kafka-all-out.out"),
-                Arguments.of("kafka-up-to-date.yaml", "kafka-up-to-date.out")
+                Arguments.of("kafka-up-to-date.yaml", "kafka-up-to-date.out"),
+                Arguments.of("empty-yaml.yaml", "empty-yaml.out"),
+                Arguments.of("empty-yaml-with-doc-marker.yaml", "empty-yaml-with-doc-marker.out"),
+                Arguments.of("strimzi-resource-with-empty-document.yaml", "strimzi-resource-with-empty-document.out"),
+                Arguments.of("strimzi-resource-with-kubernetes-resource-and-empty-document.yaml", "strimzi-resource-with-kubernetes-resource-and-empty-document.out")
         );
     }
 

v1-api-conversion/src/test/resources/io/strimzi/kafka/api/conversion/v1/cli/empty-yaml-with-doc-marker.out

@@ -0,0 +1 @@
+---

v1-api-conversion/src/test/resources/io/strimzi/kafka/api/conversion/v1/cli/empty-yaml-with-doc-marker.yaml

@@ -0,0 +1,55 @@
+---
+apiVersion: kafka.strimzi.io/v1
+kind: KafkaUser
+metadata:
+  name: my-user
+  labels:
+    strimzi.io/cluster: my-cluster
+spec:
+  authentication:
+    type: tls
+  authorization:
+    type: simple
+    acls:
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Read
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Describe
+    - resource:
+        type: group
+        name: my-group
+      operations:
+      - Read
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Write
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Create
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Describe
+    - resource:
+        type: transactionalId
+        name: schema-registry-
+        patternType: prefix
+      operations:
+      - Describe
+    - resource:
+        type: transactionalId
+        name: schema-registry-
+        patternType: prefix
+      operations:
+      - Write

v1-api-conversion/src/test/resources/io/strimzi/kafka/api/conversion/v1/cli/empty-yaml.out

@@ -0,0 +1,56 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  name: my-user
+  labels:
+    strimzi.io/cluster: my-cluster
+spec:
+  authentication:
+    type: tls
+  authorization:
+    type: simple
+    acls:
+      # Example consumer Acls for topic my-topic using consumer group my-group
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Read
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Describe
+      - resource:
+          type: group
+          name: my-group
+          patternType: literal
+        operation: Read
+      # Example Producer Acls for topic my-topic
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Write
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Create
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Describe
+      # transactionalId resources
+      - resource:
+          type: transactionalId
+          name: schema-registry-
+          patternType: prefix
+        operation: Describe
+      - resource:
+          type: transactionalId
+          name: schema-registry-
+          patternType: prefix
+        operation: Write
+---

v1-api-conversion/src/test/resources/io/strimzi/kafka/api/conversion/v1/cli/empty-yaml.yaml

@@ -0,0 +1,62 @@
+---
+apiVersion: kafka.strimzi.io/v1
+kind: KafkaUser
+metadata:
+  name: my-user
+  labels:
+    strimzi.io/cluster: my-cluster
+spec:
+  authentication:
+    type: tls
+  authorization:
+    type: simple
+    acls:
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Read
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Describe
+    - resource:
+        type: group
+        name: my-group
+      operations:
+      - Read
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Write
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Create
+    - resource:
+        type: topic
+        name: my-topic
+      operations:
+      - Describe
+    - resource:
+        type: transactionalId
+        name: schema-registry-
+        patternType: prefix
+      operations:
+      - Describe
+    - resource:
+        type: transactionalId
+        name: schema-registry-
+        patternType: prefix
+      operations:
+      - Write
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: connector-configuration
+data:
+  hello: world

v1-api-conversion/src/test/resources/io/strimzi/kafka/api/conversion/v1/cli/strimzi-resource-with-empty-document.out

@@ -0,0 +1,64 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  name: my-user
+  labels:
+    strimzi.io/cluster: my-cluster
+spec:
+  authentication:
+    type: tls
+  authorization:
+    type: simple
+    acls:
+      # Example consumer Acls for topic my-topic using consumer group my-group
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Read
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Describe
+      - resource:
+          type: group
+          name: my-group
+          patternType: literal
+        operation: Read
+      # Example Producer Acls for topic my-topic
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Write
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Create
+      - resource:
+          type: topic
+          name: my-topic
+          patternType: literal
+        operation: Describe
+      # transactionalId resources
+      - resource:
+          type: transactionalId
+          name: schema-registry-
+          patternType: prefix
+        operation: Describe
+      - resource:
+          type: transactionalId
+          name: schema-registry-
+          patternType: prefix
+        operation: Write
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: connector-configuration
+data:
+  hello: "world"
+---