feat(crd-generator): Add CRD-Generator CLI

crd-generator/api-v2/src/main/java/io/fabric8/crdv2/generator/CRDGenerator.java

@@ -32,6 +32,7 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -42,7 +43,6 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class CRDGenerator {
 
@@ -112,7 +112,27 @@ Map<String, AbstractCustomResourceHandler> getHandlers() {
   // (we also cannot use @SafeVarargs, because that requires the method to be final, which is another signature change)
   @SuppressWarnings("unchecked")
   public final CRDGenerator customResourceClasses(Class<? extends HasMetadata>... crClasses) {
-    return customResources(Stream.of(crClasses).map(CustomResourceInfo::fromClass).toArray(CustomResourceInfo[]::new));
+    if (crClasses == null) {
+      return this;
+    }
+    return customResourceClasses(Arrays.asList(crClasses));
+  }
+
+  public CRDGenerator customResourceClasses(Collection<Class<? extends HasMetadata>> crClasses) {
+    if (crClasses == null) {
+      return this;
+    }
+    return customResources(crClasses.stream()
+        .filter(Objects::nonNull)
+        .map(CustomResourceInfo::fromClass)
+        .toArray(CustomResourceInfo[]::new));
+  }
+
+  public CRDGenerator customResources(Collection<CustomResourceInfo> infos) {
+    if (infos == null) {
+      return this;
+    }
+    return customResources(infos.toArray(new CustomResourceInfo[0]));
   }
 
   public CRDGenerator customResources(CustomResourceInfo... infos) {

crd-generator/api-v2/src/test/java/io/fabric8/crdv2/generator/CRDGeneratorTest.java

@@ -29,6 +29,7 @@
 import io.fabric8.crdv2.example.nocyclic.NoCyclic;
 import io.fabric8.crdv2.example.simplest.Simplest;
 import io.fabric8.crdv2.generator.CRDGenerator.AbstractCRDOutput;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames;
@@ -51,6 +52,7 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -109,12 +111,27 @@ void addingCustomResourceInfosShouldWork() {
     generator.customResources();
     assertTrue(generator.getCustomResourceInfos().isEmpty());
 
-    generator.customResources(null);
+    generator.customResources((CustomResourceInfo[]) null);
+    assertTrue(generator.getCustomResourceInfos().isEmpty());
+
+    generator.customResources((CustomResourceInfo) null);
+    assertTrue(generator.getCustomResourceInfos().isEmpty());
+
+    generator.customResources((Collection<CustomResourceInfo>) null);
     assertTrue(generator.getCustomResourceInfos().isEmpty());
 
     generator.customResources(null, null);
     assertTrue(generator.getCustomResourceInfos().isEmpty());
 
+    generator.customResourceClasses((Class<? extends HasMetadata>[]) null);
+    assertTrue(generator.getCustomResourceInfos().isEmpty());
+
+    generator.customResourceClasses((Class<? extends HasMetadata>) null);
+    assertTrue(generator.getCustomResourceInfos().isEmpty());
+
+    generator.customResourceClasses((Collection<Class<? extends HasMetadata>>) null);
+    assertTrue(generator.getCustomResourceInfos().isEmpty());
+
     generator.customResourceClasses(Simplest.class);
     assertEquals(1, generator.getCustomResourceInfos().size());
     assertTrue(generator.getCustomResourceInfos().stream().allMatch(cri -> cri.crClassName().equals(Simplest.class.getName())));

crd-generator/cli/README.md

@@ -0,0 +1,65 @@
+# CRD-Generator CLI
+
+Generate CRDs from Java model.
+
+## Install
+
+The CRD-Generator CLI is available for download on Sonatype at the link:
+
+```
+https://oss.sonatype.org/content/repositories/releases/io/fabric8/crd-generator-cli/<version>/crd-generator-cli-<version>.sh
+```
+
+you can get it working locally with few lines:
+
+```bash
+export VERSION=$(wget -q -O - https://github.com/fabric8io/kubernetes-client/releases/latest --header "Accept: application/json" | jq -r '.tag_name' | cut -c 2-)
+wget https://oss.sonatype.org/content/repositories/releases/io/fabric8/crd-generator-cli/$VERSION/crd-generator-cli-$VERSION.sh
+chmod a+x crd-generator-cli-$VERSION.sh
+./crd-generator-cli-$VERSION.sh --version
+```
+
+Alternatively, if you already have [jbang](https://www.jbang.dev/) installed, you can run the CLI by using the following command:
+
+```bash
+jbang io.fabric8:crd-generator-cli:<version>
+```
+
+## Usage
+
+```
+Usage: crd-gen [-hVv] [--force-index] [--force-scan]
+               [--implicit-preserve-unknown-fields] [--no-parallel]
+               [-o=<outputDirectory>] [--classpath=<classpathElements>]...
+               [--exclude-package=<excludedPackages>]...
+               [--include-package=<includedPackages>]... <source>...
+
+Fabric8 CRD-Generator:
+Generate Custom Resource Definitions (CRD) for Kubernetes from Java model.
+
+      <source>...     A directory or JAR file to scan for Custom Resource
+                        classes, or a full qualified Custom Resource class name.
+      --classpath=<classpathElements>
+                      Additional classpath elements, e.g. a dependency packaged
+                        as JAR file or a directory of class files.
+  -o, --output-dir=<outputDirectory>
+                      The output directory for the generated CRDs.
+                        Default: .
+      --force-index   Create Jandex index even if the directory or JAR file
+                        contains an existing index.
+      --force-scan    Create Jandex index even if the directory or JAR file
+                        contains an existing index.
+      --no-parallel   Disable parallel generation.
+      --implicit-preserve-unknown-fields
+                      `x-kubernetes-preserve-unknown-fields: true` will be
+                        added to objects which contain an any-setter or
+                        any-getter
+      --include-package=<includedPackages>
+                      Use only Custom Resource classes of one or more packages.
+      --exclude-package=<excludedPackages>
+                      Exclude Custom Resource classes by package.
+  -v                  Verbose mode. Helpful for troubleshooting. Multiple -v
+                        options increase the verbosity.
+  -h, --help          Show this help message and exit.
+  -V, --version       Print version information and exit.
+```

crd-generator/cli/pom.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015 Red Hat, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>crd-generator-parent</artifactId>
+    <groupId>io.fabric8</groupId>
+    <version>7.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>crd-generator-cli</artifactId>
+  <name>Fabric8 :: CRD generator :: CLI</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>crd-generator-collector</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>info.picocli</groupId>
+      <artifactId>picocli</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>info.picocli</groupId>
+              <artifactId>picocli-codegen</artifactId>
+              <version>${picocli.version}</version>
+            </path>
+          </annotationProcessorPaths>
+          <compilerArgs>
+            <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.5.2</version>
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <goals>
+                    <goal>shade</goal>
+                </goals>
+                <configuration>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>io.fabric8.crd.generator.cli.CRDGeneratorCLI</mainClass>
+                        </transformer>
+                    </transformers>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </execution>
+        </executions>
+    </plugin>
+
+    <!-- now make the jar chmod +x style executable -->
+    <plugin>
+        <groupId>org.skife.maven</groupId>
+        <artifactId>really-executable-jar-maven-plugin</artifactId>
+        <version>2.1.1</version>
+        <configuration>
+            <flags>-Xmx1G</flags>
+            <programFile>crd-gen</programFile>
+            <attachProgramFile>true</attachProgramFile>
+        </configuration>
+
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <goals>
+                    <goal>really-executable-jar</goal>
+                </goals>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>