Merge pull request #10 from spyrkob/warn_if_artifact_not_in_pnc

Warn if artifact is not in PNC
jboss-set · Jan 9, 2025 · e6314b8 · e6314b8
2 parents 078c6f7 + 99e47df
commit e6314b8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/src/main/java/org/jboss/set/components/ManifestVerifier.java b/src/main/java/org/jboss/set/components/ManifestVerifier.java
@@ -34,6 +34,7 @@ public VerificationResult verifyComponents(URL manifestURL) throws MalformedURLE
         final BuildRecorder recorder = new BuildRecorder();
 
         final Collection<ArtifactCoordinate> imported = new ConcurrentLinkedQueue<>();
+        final List<ArtifactCoordinate> missingArtifacts = new ArrayList<>();
         final Collection<ArtifactCoordinate> ungrouped = new ArrayList<>();
 
         // record all artifacts from resolved builds, so that we don't need to resolve them twice
@@ -53,6 +54,11 @@ public VerificationResult verifyComponents(URL manifestURL) throws MalformedURLE
 
                 final PncArtifact artifact = pncManager.getArtifact(artifactCoordinate);
 
+                if (artifact == null) {
+                    missingArtifacts.add(artifactCoordinate);
+                    return;
+                }
+
                 if (artifact.isImported()) {
                     imported.add(artifact.getCoordinate());
                     return;
@@ -95,6 +101,10 @@ public VerificationResult verifyComponents(URL manifestURL) throws MalformedURLE
             }
         }
 
+        if (!missingArtifacts.isEmpty()) {
+            res.addWarning(new Warning("[WARN] Artifacts not build in PNC:", missingArtifacts));
+        }
+
 
         if (!imported.isEmpty()) {
             res.addWarning(new Warning("[WARN] Ignored imported artifacts:", new ArrayList<>(imported)));

diff --git a/src/main/java/org/jboss/set/components/pnc/PncManagerImpl.java b/src/main/java/org/jboss/set/components/pnc/PncManagerImpl.java
@@ -11,6 +11,7 @@
 
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 public class PncManagerImpl implements PncManager {
@@ -33,9 +34,12 @@ public PncArtifact getArtifact(ArtifactCoordinate coordinate) {
             final var allFiltered = artifactClient.getAllFiltered(coordinate.getGroupId() + ":" + coordinate.getArtifactId() + ":*:" + coordinate.getVersion(),
                     null, null, null);
 
-//            allFiltered.forEach(System.out::println);
-            // TODO: check that all artifacts are coming from the same build
-            final ArtifactInfo artifact = allFiltered.iterator().next();
+            final Iterator<ArtifactInfo> iterator = allFiltered.iterator();
+            if (!iterator.hasNext()) {
+                return null;
+            }
+
+            final ArtifactInfo artifact = iterator.next();
             final var artifactInfo = artifactClient.getSpecific(artifact.getId());
             return new PncArtifact(new PncArtifact.Id(artifact.getId()), parseIdentifier(artifact.getIdentifier()), StringUtils.isNotEmpty(artifactInfo.getOriginUrl()));
         } catch (RemoteResourceException e) {

diff --git a/src/test/java/org/jboss/set/components/ManifestVerifierTest.java b/src/test/java/org/jboss/set/components/ManifestVerifierTest.java
@@ -112,4 +112,27 @@ public void differentComponentVersionsFromTheDifferentBuild_Violation() throws E
                 )));
     }
 
+    @Test
+    public void nonExistingArtifactVersion_Warning() throws Exception {
+        final ManifestVerifier manifestVerifier = new ManifestVerifier(pncManager);
+        final PncArtifact pncArtifactBuild = new PncArtifact(
+                new PncArtifact.Id("abcd1"),
+                new ArtifactCoordinate("io.opentelemetry", "opentelemetry-context", null, null, "1.29.0"),
+                false);
+        when(pncManager.getArtifact(pncArtifactBuild.getCoordinate())).thenReturn(null);
+
+        final ChannelManifest manifest = new ChannelManifest.Builder()
+                .setSchemaVersion(ChannelManifestMapper.SCHEMA_VERSION_1_1_0)
+                .addStreams(new Stream("io.opentelemetry", "opentelemetry-context", "1.29.0"))
+                .build();
+        final Path manifestFile = tempDir.resolve("test-manifest.yaml");
+        Files.writeString(manifestFile, ChannelManifestMapper.toYaml(manifest));
+
+        final VerificationResult verificationResult = manifestVerifier.verifyComponents(manifestFile.toUri().toURL());
+
+        assertThat(verificationResult.getViolations()).isEmpty();
+        assertThat(verificationResult.getWarnings())
+                .map(Warning::getMessage)
+                .containsOnly("[WARN] Artifacts not build in PNC:");
+    }
 }