Merge pull request #75 from jfdenise/main

Fix issues when using WildFly channel
wildfly · May 22, 2024 · ebbd17a · ebbd17a
2 parents 56400a0 + 7349b5e
commit ebbd17a
Show file tree

Hide file tree

Showing 5 changed files with 2,284 additions and 9 deletions.
diff --git a/core/src/main/java/org/wildfly/glow/GlowSession.java b/core/src/main/java/org/wildfly/glow/GlowSession.java
@@ -62,6 +62,7 @@
 import org.jboss.galleon.api.config.GalleonProvisioningConfig;
 import org.jboss.galleon.universe.UniverseResolver;
 import org.wildfly.channel.ChannelSession;
+import org.wildfly.channel.NoStreamFoundException;
 import org.wildfly.channel.VersionResult;
 import static org.wildfly.glow.error.ErrorLevel.ERROR;
 import org.wildfly.plugin.tools.bootablejar.BootableJarSupport;
@@ -164,9 +165,9 @@ public ScanResults scan() throws Exception {
             } else {
                 provisioning = provider.newProvisioningBuilder(config).setInstallationHome(fakeHome).build();
             }
-            GalleonProvisioningConfig inputConfig = config;
             // Channel handling
             Map<ProducerSpec, FPID> fpVersions = new HashMap<>();
+            Map<ProducerSpec, FPID> resolvedInChannel = new HashMap<>();
             if (arguments.getChannelSession() != null) {
                 ChannelSession channelSession = arguments.getChannelSession();
                 // Compute versions based on channel.
@@ -176,11 +177,18 @@ public ScanResults scan() throws Exception {
                     String[] coordinates = fpid.toString().split(":");
                     String groupId = coordinates[0];
                     String artifactId = coordinates[1];
-                    VersionResult res = channelSession.findLatestMavenArtifactVersion(groupId, artifactId,
+                    FeaturePackLocation loc;
+                    try {
+                        VersionResult res = channelSession.findLatestMavenArtifactVersion(groupId, artifactId,
                             "zip", null, null);
-                    FeaturePackLocation loc = dep.getLocation().replaceBuild(res.getVersion());
+                        loc = dep.getLocation().replaceBuild(res.getVersion());
+                    } catch(NoStreamFoundException ex) {
+                       writer.warn("WARNING: Feature-pack " + dep.getLocation() + " is not present in the configured channel, ignoring it.");
+                       continue;
+                    }
                     outputConfigBuilder.addFeaturePackDep(loc);
                     fpVersions.put(fpid.getProducer(), loc.getFPID());
+                    resolvedInChannel.put(fpid.getProducer(), loc.getFPID());
                 }
                 config = outputConfigBuilder.build();
             } else {
@@ -527,8 +535,8 @@ public ScanResults scan() throws Exception {
                 envs.addAll(stronglySuggestConfigFixes.get(l));
             }
             // Identify the active feature-packs.
-            GalleonProvisioningConfig activeConfig = buildProvisioningConfig(inputConfig,
-                    universeResolver, allBaseLayers, baseLayer, decorators, excludedLayers, fpDependencies, arguments.getConfigName(), arguments.getConfigStability(), arguments.getPackageStability());
+            GalleonProvisioningConfig activeConfig = buildProvisioningConfig(config,
+                    universeResolver, allBaseLayers, baseLayer, decorators, excludedLayers, fpDependencies, arguments.getConfigName(), arguments.getConfigStability(), arguments.getPackageStability(), resolvedInChannel);
 
             // Handle stability
             if (arguments.getConfigStability() != null) {
@@ -954,7 +962,7 @@ private static GalleonProvisioningConfig buildProvisioningConfig(GalleonProvisio
             Set<Layer> decorators,
             Set<Layer> excludedLayers,
             Map<FeaturePackLocation.FPID, Set<FeaturePackLocation.ProducerSpec>> fpDependencies,
-            String configName, String configStability, String packageStability) throws ProvisioningException {
+            String configName, String configStability, String packageStability, Map<ProducerSpec, FPID> channelVersions) throws ProvisioningException {
         Map<ProducerSpec, GalleonFeaturePackConfig> map = new HashMap<>();
         Map<ProducerSpec, FPID> universeToGav = new HashMap<>();
         for (GalleonFeaturePackConfig cfg : input.getFeaturePackDeps()) {
@@ -986,6 +994,11 @@ private static GalleonProvisioningConfig buildProvisioningConfig(GalleonProvisio
             FeaturePackLocation.FPID gav = universeToGav.get(cfg.getLocation().getProducer());
             FeaturePackLocation.FPID fpid = tmpFps.get(gav.getProducer());
             if (fpid != null) {
+                // Reset the version if ruled by channel
+                FPID orig = channelVersions.get(cfg.getLocation().getProducer());
+                if ( orig != null && orig.getLocation().isMavenCoordinates()) {
+                    gav = gav.getLocation().replaceBuild("").getFPID();
+                }
                 activeFeaturePacks.add(gav);
             }
         }

diff --git a/...-resolver/src/main/java/org/wildfly/glow/maven/ChannelMavenArtifactRepositoryManager.java b/...-resolver/src/main/java/org/wildfly/glow/maven/ChannelMavenArtifactRepositoryManager.java
@@ -76,7 +76,9 @@ private void resolveFromChannels(MavenArtifact artifact) throws UnresolvedMavenA
 
     @Override
     public void resolveLatestVersion(MavenArtifact artifact) throws MavenUniverseException {
-        throw new MavenUniverseException("Channel resolution can't be applied to Galleon universe");
+        // To resolve community universe
+        MavenRepoManager resolver = MavenResolver.newMavenResolver();
+        resolver.resolveLatestVersion(artifact);
     }
 
     @Override
@@ -92,13 +94,17 @@ public boolean isLatestVersionResolved(MavenArtifact artifact, String lowestQual
     @Override
     public void resolveLatestVersion(MavenArtifact artifact, String lowestQualifier, Pattern includeVersion,
             Pattern excludeVersion) throws MavenUniverseException {
-        throw new MavenUniverseException("Channel resolution can't be applied to Galleon universe");
+         // To resolve community universe
+        MavenRepoManager resolver = MavenResolver.newMavenResolver();
+        resolver.resolveLatestVersion(artifact, lowestQualifier, includeVersion, excludeVersion);
     }
 
     @Override
     public void resolveLatestVersion(MavenArtifact artifact, String lowestQualifier, boolean locallyAvailable)
             throws MavenUniverseException {
-        throw new MavenUniverseException("Channel resolution can't be applied to Galleon universe");
+        // To resolve community universe
+        MavenRepoManager resolver = MavenResolver.newMavenResolver();
+        resolver.resolveLatestVersion(artifact, lowestQualifier, locallyAvailable);
     }
 
     @Override

diff --git a/tests/run-cli-tests.sh b/tests/run-cli-tests.sh
@@ -124,6 +124,14 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+echo Provision a server with a channel
+java -jar $jar scan examples/war/kitchensink.war --provision=SERVER --channels tests/wildfly-29.0.0.Final-channel.yaml
+
+if [ $? -ne 0 ]; then
+    echo "Error, check log"
+    exit 1
+fi
+
 echo Provision a bootable JAR
 java -jar $jar scan examples/war/kitchensink.war --provision=BOOTABLE_JAR
 

diff --git a/tests/wildfly-29.0.0.Final-channel.yaml b/tests/wildfly-29.0.0.Final-channel.yaml
@@ -0,0 +1,9 @@
+schemaVersion: "2.0.0"
+name: wildfly-test
+repositories:
+  - id: "central"
+    url: "https://repo1.maven.org/maven2/"
+  - id: "jboss-public"
+    url: "https://repository.jboss.org/nexus/content/groups/public/"
+manifest:
+  url: "file:tests/wildfly-29.0.0.Final-manifest.yaml"