Fixed the codestarts artifactId

quarkusio · Apr 1, 2021 · 3ddbe97 · 3ddbe97
1 parent e51b06d
commit 3ddbe97
Show file tree

Hide file tree

Showing 22 changed files with 81 additions and 25 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/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/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/extensions/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/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/...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/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/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/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
@@ -16,6 +16,7 @@
 import io.quarkus.bootstrap.model.AppModel;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.DeploymentInjectingDependencyVisitor;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -90,7 +91,7 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     RemoteRepositoryManager remoteRepoManager;
 
     @Component
-    BootstrapWorkspaceProvider workpaceProvider;
+    BootstrapWorkspaceProvider workspaceProvider;
 
     /**
      * The current repository/network configuration of Maven.
@@ -167,6 +168,9 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion")
     boolean ignoreNotDetectedQuarkusCoreVersion;
 
+    @Parameter(property = "skipCodestartValidation")
+    boolean skipCodestartValidation;
+
     AppArtifactCoords deploymentCoords;
     CollectResult collectedDeploymentDeps;
 
@@ -291,6 +295,8 @@ public void execute() throws MojoExecutionException {
 
         setBuiltWithQuarkusCoreVersion(mapper, extObject);
 
+        completeCodestartArtifact(mapper, extObject);
+
         final DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
         prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);
 
@@ -303,6 +309,56 @@ 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 = DeploymentInjectingDependencyVisitor
+                .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) {
+            // first we look for it in the workspace, if it's in there we don't need to actually resolve the artifact, because it might not have been built yet
+            if (this.workspaceProvider.workspace().getProject(codestartArtifact.getGroupId(),
+                    codestartArtifact.getArtifactId()) == null) {
+                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);
@@ -826,7 +882,7 @@ private MavenArtifactResolver resolver() throws MojoExecutionException {
                         .setRemoteRepositoryManager(remoteRepoManager)
                         .setRepositorySystemSession(repoSession)
                         .setRemoteRepositories(repos)
-                        .setCurrentProject(workpaceProvider.origin()));
+                        .setCurrentProject(workspaceProvider.origin()));
                 resolver = new MavenArtifactResolver(ctx);
             } catch (BootstrapMavenException e) {
                 throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);

diff --git a/independent-projects/tools/codestarts/README.adoc b/independent-projects/tools/codestarts/README.adoc
@@ -104,10 +104,10 @@ metadata:
       - "java"
       - "kotlin"
       - "scala"
-    artifact: "io.quarkus:quarkus-descriptor-json" # The artifact in which the codestart is located
+    artifact: "io.quarkus:quarkus-platform-descriptor-json" # The artifact in which the codestart is located
 ----
 
-*NOTE* Using "io.quarkus:quarkus-descriptor-json" as artifact is temporary, extension codestarts will soon live alongside the extension.
+*NOTE* Using "io.quarkus:quarkus-platform-descriptor-json" as artifact is temporary, extension codestarts will soon live alongside the extension.
 
 === Tests
 

diff --git a/...tion-tests/devtools/src/test/java/io/quarkus/platform/catalog/ExtensionProcessorTest.java b/...tion-tests/devtools/src/test/java/io/quarkus/platform/catalog/ExtensionProcessorTest.java
@@ -24,7 +24,7 @@ void testRESTEasyMetadata() {
         assertThat(extensionProcessor.getCategories()).contains("web");
         assertThat(extensionProcessor.getCodestartKind()).isEqualTo(ExtensionProcessor.CodestartKind.EXAMPLE);
         assertThat(extensionProcessor.getCodestartName()).isEqualTo("resteasy");
-        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-descriptor-json");
+        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-platform-descriptor-json");
         assertThat(extensionProcessor.getCodestartLanguages()).contains("java", "kotlin", "scala");
         assertThat(extensionProcessor.getKeywords()).contains("resteasy", "jaxrs", "web", "rest");
         assertThat(extensionProcessor.getExtendedKeywords()).contains("resteasy", "jaxrs", "web", "rest");
@@ -42,7 +42,7 @@ void testKotlinMetadata() {
         assertThat(extensionProcessor.getCodestartKind()).isEqualTo(ExtensionProcessor.CodestartKind.CORE);
         assertThat(extensionProcessor.getCodestartName()).isEqualTo("kotlin");
         assertThat(extensionProcessor.getCodestartLanguages()).isEmpty();
-        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-descriptor-json");
+        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-platform-descriptor-json");
         assertThat(extensionProcessor.getKeywords()).contains("kotlin");
         assertThat(extensionProcessor.getExtendedKeywords()).contains("kotlin", "quarkus-kotlin", "services", "write");
         assertThat(extensionProcessor.getGuide()).isEqualTo("https://quarkus.io/guides/kotlin");