[chore] cleanup sql datasource

Author: andreaTP

operator/controller/src/main/java/io/apicurio/registry/operator/feat/KafkaSql.java

@@ -14,12 +14,14 @@ public class KafkaSql {
     public static String ENV_STORAGE_KIND = "APICURIO_STORAGE_KIND";
     public static String ENV_KAFKASQL_BOOTSTRAP_SERVERS = "APICURIO_KAFKASQL_BOOTSTRAP_SERVERS";
 
-    public static void configureKafkaSQL(ApicurioRegistry3 primary, Map<String, EnvVar> env) {
+    public static boolean configureKafkaSQL(ApicurioRegistry3 primary, Map<String, EnvVar> env) {
         if (primary.getSpec().getApp().getKafkasql() != null
                 && !isBlank(primary.getSpec().getApp().getKafkasql().getBootstrapServers())) {
             addEnvVar(env, new EnvVarBuilder().withName(ENV_STORAGE_KIND).withValue("kafkasql").build());
             addEnvVar(env, new EnvVarBuilder().withName(ENV_KAFKASQL_BOOTSTRAP_SERVERS)
                     .withValue(primary.getSpec().getApp().getKafkasql().getBootstrapServers()).build());
+            return true;
         }
+        return false;
     }
 }

operator/controller/src/main/java/io/apicurio/registry/operator/feat/PostgresSql.java

@@ -0,0 +1,38 @@
+package io.apicurio.registry.operator.feat;
+
+import io.apicurio.registry.operator.api.v1.ApicurioRegistry3;
+import io.fabric8.kubernetes.api.model.EnvVar;
+import io.fabric8.kubernetes.api.model.EnvVarBuilder;
+
+import java.util.Map;
+
+import static io.apicurio.registry.operator.resource.app.AppDeploymentResource.addEnvVar;
+
+public class PostgresSql {
+
+    public static final String ENV_APICURIO_STORAGE_KIND = "APICURIO_STORAGE_KIND";
+    public static final String ENV_APICURIO_STORAGE_SQL_KIND = "APICURIO_STORAGE_SQL_KIND";
+    public static final String ENV_APICURIO_DATASOURCE_URL = "APICURIO_DATASOURCE_URL";
+    public static final String ENV_APICURIO_DATASOURCE_USERNAME = "APICURIO_DATASOURCE_USERNAME";
+    public static final String ENV_APICURIO_DATASOURCE_PASSWORD = "APICURIO_DATASOURCE_PASSWORD";
+
+    public static boolean configureDatasource(ApicurioRegistry3 primary, Map<String, EnvVar> env) {
+        if (primary.getSpec().getApp().getSql() != null
+                && primary.getSpec().getApp().getSql().getDatasource() != null) {
+            var datasource = primary.getSpec().getApp().getSql().getDatasource();
+
+            addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_KIND).withValue("sql").build());
+            addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_SQL_KIND).withValue("postgresql")
+                    .build());
+
+            addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_URL)
+                    .withValue(datasource.getUrl()).build());
+            addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_USERNAME)
+                    .withValue(datasource.getUsername()).build());
+            addEnvVar(env, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_PASSWORD)
+                    .withValue(datasource.getPassword()).build());
+            return true;
+        }
+        return false;
+    }
+}

operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java

@@ -2,8 +2,8 @@
 
 import io.apicurio.registry.operator.OperatorException;
 import io.apicurio.registry.operator.api.v1.ApicurioRegistry3;
-import io.apicurio.registry.operator.api.v1.spec.Sql;
 import io.apicurio.registry.operator.feat.KafkaSql;
+import io.apicurio.registry.operator.feat.PostgresSql;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.EnvVar;
 import io.fabric8.kubernetes.api.model.EnvVarBuilder;
@@ -36,12 +36,6 @@ public class AppDeploymentResource extends CRUDKubernetesDependentResource<Deplo
 
     private static final Logger log = LoggerFactory.getLogger(AppDeploymentResource.class);
 
-    public static final String ENV_APICURIO_STORAGE_KIND = "APICURIO_STORAGE_KIND";
-    public static final String ENV_APICURIO_STORAGE_SQL_KIND = "APICURIO_STORAGE_SQL_KIND";
-    public static final String ENV_APICURIO_DATASOURCE_URL = "APICURIO_DATASOURCE_URL";
-    public static final String ENV_APICURIO_DATASOURCE_USERNAME = "APICURIO_DATASOURCE_USERNAME";
-    public static final String ENV_APICURIO_DATASOURCE_PASSWORD = "APICURIO_DATASOURCE_PASSWORD";
-
     public AppDeploymentResource() {
         super(Deployment.class);
     }
@@ -67,8 +61,9 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
         addEnvVar(envVars, new EnvVarBuilder().withName("APICURIO_APIS_V2_DATE_FORMAT").withValue("yyyy-MM-dd''T''HH:mm:ssZ").build());
         // spotless:on
 
-        configureSqlDatasource(envVars, primary.getSpec().getApp().getSql());
-        KafkaSql.configureKafkaSQL(primary, envVars);
+        if (!PostgresSql.configureDatasource(primary, envVars)) {
+            KafkaSql.configureKafkaSQL(primary, envVars);
+        }
 
         var container = getContainerFromDeployment(d, APP_CONTAINER_NAME);
         container.setEnv(envVars.values().stream().toList());
@@ -77,25 +72,6 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
         return d;
     }
 
-    private static void configureSqlDatasource(Map<String, EnvVar> map, Sql sql) {
-        if (sql != null && sql.getDatasource() != null) {
-            var datasource = sql.getDatasource();
-
-            addEnvVar(map, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_KIND).withValue("sql").build());
-            addEnvVar(map, new EnvVarBuilder().withName(ENV_APICURIO_STORAGE_SQL_KIND).withValue("postgresql")
-                    .build());
-
-            addEnvVar(map, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_URL)
-                    .withValue(datasource.getUrl()).build());
-            addEnvVar(map, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_USERNAME)
-                    .withValue(datasource.getUsername()).build());
-            addEnvVar(map, new EnvVarBuilder().withName(ENV_APICURIO_DATASOURCE_PASSWORD)
-                    .withValue(datasource.getPassword()).build());
-        } else {
-            log.info("No SQL datasource configured");
-        }
-    }
-
     public static void addEnvVar(Map<String, EnvVar> map, EnvVar envVar) {
         if (!map.containsKey(envVar.getName())) {
             map.put(envVar.getName(), envVar);