[crd-generator] Fix inconsistent additionalPrinterColumns jsonPath

fabric8io · Nov 29, 2022 · 12e5932 · 12e5932
1 parent 009974f
commit 12e5932
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/...rc/main/java/io/fabric8/crd/generator/v1/decorator/AddAdditionPrinterColumnDecorator.java b/...rc/main/java/io/fabric8/crd/generator/v1/decorator/AddAdditionPrinterColumnDecorator.java
@@ -43,7 +43,7 @@ public AddAdditionPrinterColumnDecorator(String name, String version, String typ
   @Override
   public void andThenVisit(CustomResourceDefinitionVersionFluent<?> spec) {
     Predicate<CustomResourceColumnDefinitionBuilder> matchingColumn = col -> col.getName() != null
-        && col.getName().equals(columnName);
+        && col.getName().equals(columnName) && col.getJsonPath() != null && col.getJsonPath().equals(path);
     spec.removeMatchingFromAdditionalPrinterColumns(matchingColumn);
 
     spec.addNewAdditionalPrinterColumn()

diff --git a/...in/java/io/fabric8/crd/generator/v1beta1/decorator/AddAdditionPrinterColumnDecorator.java b/...in/java/io/fabric8/crd/generator/v1beta1/decorator/AddAdditionPrinterColumnDecorator.java
@@ -43,7 +43,7 @@ public AddAdditionPrinterColumnDecorator(String resourceName, String resourceVer
   @Override
   public void andThenVisit(CustomResourceDefinitionVersionFluent<?> spec) {
     Predicate<CustomResourceColumnDefinitionBuilder> matchingColumn = col -> col.getName() != null
-        && col.getName().equals(columnName);
+        && col.getName().equals(columnName) && col.getJSONPath() != null && col.getJSONPath().equals(path);
     spec.removeMatchingFromAdditionalPrinterColumns(matchingColumn);
 
     spec.addNewAdditionalPrinterColumn()

diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestStatus.java b/crd-generator/api/src/test/java/io/fabric8/crd/example/joke/JokeRequestStatus.java
@@ -15,6 +15,8 @@
  */
 package io.fabric8.crd.example.joke;
 
+import io.fabric8.kubernetes.model.annotation.PrinterColumn;
+
 public class JokeRequestStatus {
   public enum State {
     CREATED,
@@ -28,6 +30,9 @@ public enum State {
   private boolean error;
   private String message;
 
+  @PrinterColumn(name = "jokeCategory")
+  private JokeRequestSpec.Category category = JokeRequestSpec.Category.Any;
+
   public State getState() {
     return state;
   }
@@ -51,4 +56,12 @@ public String getMessage() {
   public void setMessage(String message) {
     this.message = message;
   }
+
+  public JokeRequestSpec.Category getCategory() {
+    return category;
+  }
+
+  public void setCategory(JokeRequestSpec.Category category) {
+    this.category = category;
+  }
 }
diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/generator/CRDGeneratorTest.java b/crd-generator/api/src/test/java/io/fabric8/crd/generator/CRDGeneratorTest.java
@@ -347,7 +347,7 @@ void jokerequestCRDShouldWork() {
       // printer columns should be ordered in the alphabetical order of their json path
       final List<CustomResourceColumnDefinition> printerColumns = version
           .getAdditionalPrinterColumns();
-      assertEquals(2, printerColumns.size());
+      assertEquals(3, printerColumns.size());
       CustomResourceColumnDefinition columnDefinition = printerColumns.get(0);
       assertEquals("string", columnDefinition.getType());
       assertEquals(".spec.category", columnDefinition.getJsonPath());
@@ -356,6 +356,10 @@ void jokerequestCRDShouldWork() {
       assertEquals("string", columnDefinition.getType());
       assertEquals(".spec.excluded", columnDefinition.getJsonPath());
       assertEquals("excludedTopics", columnDefinition.getName());
+      columnDefinition = printerColumns.get(2);
+      assertEquals("string", columnDefinition.getType());
+      assertEquals(".status.category", columnDefinition.getJsonPath());
+      assertEquals("jokeCategory", columnDefinition.getName());
       CustomResourceValidation schema = version.getSchema();
       assertNotNull(schema);
       Map<String, JSONSchemaProps> properties = schema.getOpenAPIV3Schema().getProperties();