Fix loading of Red Hat artifacts for catalog

io.kaoto.camelcatalog.maven.CamelCatalogVersionLoader.configureRepositories(String)
is called too late for Camel Yaml DSL loading. it is called when loading
Camel Catalogs.
Quickfix provided: calling the CamelCatalog which is configuring the
repositories at first
not perfect as note all versions are aligned and some others might need
it but should be enough to unblock current situation

note that the provided is not efficient because the camel-yaml-dsl test
dependency is leaking in the other tests, thus even without the fix the
test is passing... I guess it would require to create a separate module
for the test or to ensure a specific version is picked (see also next
paragraph)

Another note: when several catalog are generated at same time, I'm not
sure that we can ensure that it picks the exact correct version of the
camel-yaml-dsl, it might be the first one found, whatever version it is;
To be checked. In practice I think that most of the time there are no
differences.

fixes #1597

Signed-off-by: Aurélien Pupier <[email protected]>

packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/generator/CatalogGenerator.java

@@ -58,12 +58,12 @@ public class CatalogGenerator {
 
     public CatalogDefinition generate() {
         camelCatalogVersionLoader.loadKameletBoundaries();
+        camelCatalogVersionLoader.loadCamelCatalog(camelCatalogVersion);
         camelCatalogVersionLoader.loadKamelets(kameletsVersion);
         camelCatalogVersionLoader.loadKubernetesSchema();
         camelCatalogVersionLoader.loadCamelKCRDs(camelKCRDsVersion);
         camelCatalogVersionLoader.loadLocalSchemas();
         camelCatalogVersionLoader.loadCamelYamlDsl(camelCatalogVersion);
-        camelCatalogVersionLoader.loadCamelCatalog(camelCatalogVersion);
 
         var catalogDefinition = new CatalogDefinition();
         var yamlDslSchemaProcessor = processCamelSchema(catalogDefinition);

packages/catalog-generator/src/main/java/io/kaoto/camelcatalog/maven/CamelCatalogVersionLoader.java

@@ -131,6 +131,7 @@ public boolean loadCamelYamlDsl(String version) {
         ClassLoader classLoader = kaotoVersionManager.getClassLoader();
         URL resourceURL = classLoader.getResource(Constants.CAMEL_YAML_DSL_ARTIFACT);
         if (resourceURL == null) {
+        	LOGGER.log(Level.SEVERE, "No " + Constants.CAMEL_YAML_DSL_ARTIFACT + " file found in the classpath");
             return false;
         }
 

packages/catalog-generator/src/test/java/io/kaoto/camelcatalog/commands/GenerateCatalogWithRedHatVersionTest.java

@@ -0,0 +1,49 @@
+package io.kaoto.camelcatalog.commands;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import io.kaoto.camelcatalog.beans.ConfigBean;
+import io.kaoto.camelcatalog.model.CatalogCliArgument;
+import io.kaoto.camelcatalog.model.CatalogDefinition;
+import io.kaoto.camelcatalog.model.CatalogRuntime;
+
+class GenerateCatalogWithRedHatVersionTest {
+
+    @TempDir
+    File tempDir;
+
+	@Test
+	void testOK() throws Exception {
+        CatalogDefinition catalogDefinition = new CatalogDefinition();
+        catalogDefinition.setFileName("index.json");
+        catalogDefinition.setName("test-camel-catalog");
+        catalogDefinition.setVersion("4.4.0.redhat-00045");
+        catalogDefinition.setRuntime(CatalogRuntime.Main);
+
+        CatalogCliArgument catalogCliArg = new CatalogCliArgument();
+        catalogCliArg.setRuntime(CatalogRuntime.Main);
+        catalogCliArg.setCatalogVersion("4.4.0.redhat-00045");
+
+        ConfigBean configBean = new ConfigBean();
+        configBean.setOutputFolder(tempDir.toString());
+        configBean.setCatalogsName("test-camel-catalog");
+        configBean.addCatalogVersion(catalogCliArg);
+        configBean.setKameletsVersion("1.0.0");
+
+        GenerateCommand generateCommand = new GenerateCommand(configBean);
+
+        generateCommand.run();
+
+        assertTrue(new File(tempDir, "camel-main/4.4.0.redhat-00045").exists(), "The folder for the catalog wasn't created");
+        assertEquals(34, new File(tempDir, "camel-main/4.4.0.redhat-00045").listFiles().length, "The folder for the catalog doesn't contain the correct number of files");
+	}
+
+}