Validation of codestart artifacts configured in extension descriptors

quarkusio · Mar 18, 2021 · d193de9 · d193de9
1 parent 7096c33
commit d193de9
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 19 deletions.
diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -12,4 +12,4 @@ metadata:
     name: "amazon-lambda"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -12,4 +12,4 @@ metadata:
     name: "azure-functions-http"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -14,4 +14,4 @@ metadata:
     languages:
       - "java"
       - "kotlin"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...ions/funqy/funqy-amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...ions/funqy/funqy-amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -14,4 +14,4 @@ metadata:
     name: "funqy-amazon-lambda"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...y/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...y/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -15,4 +15,4 @@ metadata:
     name: "funqy-google-cloud-functions-example"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/funqy/funqy-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -12,4 +12,4 @@ metadata:
     name: "funqy-http"
     kind: "example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...ons/funqy/funqy-knative-events/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...ons/funqy/funqy-knative-events/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -13,4 +13,4 @@ metadata:
     name: "funqy-knative-events"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...ns/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...ns/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -14,4 +14,4 @@ metadata:
     name: "google-cloud-functions-http"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -13,4 +13,4 @@ metadata:
     name: "google-cloud-functions"
     kind: "singleton-example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -9,4 +9,4 @@ metadata:
   codestart:
     name: "kotlin"
     kind: "core"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -15,4 +15,4 @@ metadata:
     languages:
       - "java"
       - "kotlin"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -13,4 +13,4 @@ metadata:
     languages:
       - "java"
       - "kotlin"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...teasy-classic/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...teasy-classic/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -18,4 +18,4 @@ metadata:
     languages:
       - "java"
       - "kotlin"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...resteasy-classic/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...resteasy-classic/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -15,4 +15,4 @@ metadata:
     languages:
       - "java"
       - "kotlin"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...ions/resteasy-classic/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...ions/resteasy-classic/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -17,4 +17,4 @@ metadata:
       - "java"
       - "kotlin"
       - "scala"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...tive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/...tive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -16,4 +16,4 @@ metadata:
       - "java"
       - "kotlin"
       - "scala"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -8,4 +8,4 @@ metadata:
   codestart:
     name: "scala"
     kind: "core"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -14,5 +14,5 @@ metadata:
       - "java"
       - "kotlin"
       - "scala"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
 
diff --git a/extensions/websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -15,4 +15,4 @@ metadata:
     name: "undertow-websockets"
     kind: "example"
     languages: "java"
-    artifact: "io.quarkus:quarkus-descriptor-json"
+    artifact: "io.quarkus:quarkus-platform-descriptor-json"
diff --git a/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -176,6 +176,9 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     @Parameter
     private List<String> dependencyCondition = new ArrayList<>(0);
 
+    @Parameter(property = "skipCodestartValidation")
+    boolean skipCodestartValidation;
+
     AppArtifactCoords deploymentCoords;
     CollectResult collectedDeploymentDeps;
 
@@ -353,6 +356,8 @@ public void execute() throws MojoExecutionException {
 
         setBuiltWithQuarkusCoreVersion(mapper, extObject);
 
+        completeCodestartArtifact(mapper, extObject);
+
         final DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
         prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);
 
@@ -365,6 +370,50 @@ public void execute() throws MojoExecutionException {
         }
     }
 
+    private void completeCodestartArtifact(ObjectMapper mapper, ObjectNode extObject) throws MojoExecutionException {
+        JsonNode mvalue = getJsonElement(extObject, METADATA, "codestart");
+        if (mvalue == null || !mvalue.isObject()) {
+            return;
+        }
+        final ObjectNode codestartObject = (ObjectNode) mvalue;
+        mvalue = mvalue.get("artifact");
+        if (mvalue == null) {
+            if (!skipCodestartValidation) {
+                throw new MojoExecutionException("Codestart artifact is missing from the " + extensionFile);
+            }
+            return;
+        }
+        org.eclipse.aether.artifact.Artifact codestartArtifact = DependencyNodeUtils.toArtifact(mvalue.asText());
+        if (codestartArtifact.getVersion() == null || codestartArtifact.getVersion().isEmpty()) {
+            codestartArtifact = codestartArtifact.setVersion(project.getVersion());
+            codestartObject.put("artifact",
+                    codestartArtifact.getGroupId() + ":" + codestartArtifact.getArtifactId() + ":"
+                            + codestartArtifact.getClassifier() + ":" + codestartArtifact.getExtension() + ":"
+                            + codestartArtifact.getVersion());
+        }
+        if (!skipCodestartValidation) {
+            try {
+                resolve(codestartArtifact);
+            } catch (MojoExecutionException e) {
+                throw new MojoExecutionException("Failed to resolve codestart artifact " + codestartArtifact, e);
+            }
+        }
+    }
+
+    private static JsonNode getJsonElement(ObjectNode extObject, String... elements) {
+        JsonNode mvalue = extObject.get(elements[0]);
+        int i = 1;
+        while (i < elements.length) {
+            if (mvalue == null || !mvalue.isObject()) {
+                return null;
+            }
+            final String element = elements[i++];
+            extObject = (ObjectNode) mvalue;
+            mvalue = extObject.get(element);
+        }
+        return mvalue;
+    }
+
     private void setBuiltWithQuarkusCoreVersion(ObjectMapper mapper, ObjectNode extObject) throws MojoExecutionException {
         final QuarkusCoreDeploymentVersionLocator coreVersionLocator = new QuarkusCoreDeploymentVersionLocator();
         collectDeploymentDeps().getRoot().accept(coreVersionLocator);

diff --git a/pom.xml b/pom.xml
@@ -124,6 +124,7 @@
                 <invoker.skip>true</invoker.skip>   <!-- maven-invoker-plugin -->
                 <jbang.skip>true</jbang.skip> <!-- jbang-maven-plugin -->
                 <forbiddenapis.skip>true</forbiddenapis.skip> <!-- forbidden-apis maven plugin -->
+                <skipCodestartValidation>true</skipCodestartValidation>
             </properties>
             <build>
                 <defaultGoal>clean install</defaultGoal>