refactor: move provider name warning outside of constructor

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java

@@ -53,6 +53,7 @@ public class BundleProcessor {
     private static final DotName SHARED_CSV_METADATA = DotName.createSimple(SharedCSVMetadata.class.getName());
     private static final DotName CSV_METADATA = DotName.createSimple(CSVMetadata.class.getName());
     private static final String BUNDLE = "bundle";
+    private static final String DEFAULT_PROVIDER_NAME = System.getProperty("user.name");
     public static final String CRD_DISPLAY_NAME = "CRD_DISPLAY_NAME";
     public static final String CRD_DESCRIPTION = "CRD_DESCRIPTION";
 
@@ -85,8 +86,9 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
 
         final var defaultReplaces = bundleConfiguration.replaces.orElse(null);
 
-        final var vcsUrl = getDefaultProviderURLFromSCMInfo(appConfiguration, jarBuildItem);
-        final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index, vcsUrl);
+        final var defaultProviderURL = getDefaultProviderURLFromSCMInfo(appConfiguration, jarBuildItem);
+        final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index,
+                defaultProviderURL);
         final var csvGroups = new HashMap<CSVMetadataHolder, List<ReconcilerAugmentedClassInfo>>();
 
         ClassUtils.getKnownReconcilers(index, log)
@@ -118,7 +120,13 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
                             }
                         }
                         csvMetadata = createMetadataHolder(csvMetadataAnnotation,
-                                new CSVMetadataHolder(sharedMetadataName, defaultVersion, defaultReplaces, vcsUrl, origin));
+                                new CSVMetadataHolder(sharedMetadataName, defaultVersion, defaultReplaces,
+                                        DEFAULT_PROVIDER_NAME, defaultProviderURL, origin));
+                        if (DEFAULT_PROVIDER_NAME.equals(csvMetadata.providerName)) {
+                            log.warnv(
+                                    "It is recommended that you provide a provider name provided for {0}: ''{1}'' was used as default value.",
+                                    origin, DEFAULT_PROVIDER_NAME);
+                        }
                     }
                     log.infov("Assigning ''{0}'' reconciler to {1}",
                             reconcilerInfo.nameOrFailIfUnset(),
@@ -140,7 +148,6 @@ private static String getDefaultProviderURLFromSCMInfo(ApplicationInfoBuildItem
             if (scmInfo != null) {
                 var origin = scmInfo.getRemote().get("origin");
                 if (origin != null) {
-                    System.out.println(origin);
                     try {
                         int atSign = origin.indexOf('@');
                         if (atSign > 0) {
@@ -292,7 +299,8 @@ void generateBundle(ApplicationInfoBuildItem configuration,
 
     private Map<String, CSVMetadataHolder> getSharedMetadataHolders(String name, String version, String defaultReplaces,
             IndexView index, String vcsUrl) {
-        CSVMetadataHolder csvMetadata = new CSVMetadataHolder(name, version, defaultReplaces, vcsUrl, "default");
+        CSVMetadataHolder csvMetadata = new CSVMetadataHolder(name, version, defaultReplaces, vcsUrl, DEFAULT_PROVIDER_NAME,
+                "default");
         final var sharedMetadataImpls = index.getAllKnownImplementors(SHARED_CSV_METADATA);
         final var result = new HashMap<String, CSVMetadataHolder>(sharedMetadataImpls.size() + 1);
         sharedMetadataImpls.forEach(sharedMetadataImpl -> {

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/DefaultBundleWhenNoCsvMetadataTest.java

@@ -37,7 +37,7 @@ public void shouldWriteBundleEvenWhenCsvMetadataIsNotUsed() throws IOException {
         assertEquals(name, deployment.getName());
         // by default, we shouldn't output the version label in the selector match labels as the default controlling this should be overridden by KubernetesLabelConfigOverrider
         assertNull(deployment.getSpec().getSelector().getMatchLabels().get("app.kubernetes.io/version"));
-        assertNotNull(csv.getSpec().getProvider().getName());
+        assertEquals(System.getProperty("user.name"), csv.getSpec().getProvider().getName());
         assertNotNull(csv.getSpec().getProvider().getUrl());
     }
 

bundle-generator/runtime/src/main/java/io/quarkiverse/operatorsdk/bundle/runtime/CSVMetadataHolder.java

@@ -4,10 +4,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.jboss.logging.Logger;
-
 public class CSVMetadataHolder {
-    private static final Logger log = Logger.getLogger(CSVMetadataHolder.class.getName());
     public final String bundleName;
     public final String csvName;
     private final String origin;
@@ -121,8 +118,10 @@ public RequiredCRD(String kind, String name, String version) {
 
     }
 
-    public CSVMetadataHolder(String bundleName, String version, String replaces, String providerURL, String origin) {
-        this(bundleName, null, null, null, null, null, null, providerURL, replaces, null, version, null, null, null, null, null,
+    public CSVMetadataHolder(String bundleName, String version, String replaces, String providerName, String providerURL,
+            String origin) {
+        this(bundleName, null, null, null, null, null, providerName, providerURL, replaces, null, version, null, null, null,
+                null, null,
                 null, null,
                 null,
                 origin);
@@ -155,17 +154,6 @@ public CSVMetadataHolder(String bundleName, String csvName, String description,
         this.permissionRules = permissionRules;
         this.requiredCRDs = requiredCRDs;
         this.origin = origin;
-
-        // provide a default provider name and output warning if none is provided
-        if (providerName == null) {
-            String msg = "";
-            final var userName = System.getProperty("user.name");
-            if (userName != null) {
-                providerName = userName;
-                msg = ". Using user name " + userName + " as default.";
-            }
-            log.warnv("It is recommended that you provide a provider name provided for {0}{1}", bundleName, msg);
-        }
         this.providerName = providerName;
     }