update datasource validation to check with DB first

Signed-off-by: Saad Khan <[email protected]>
dinogun · Sep 18, 2024 · e798581 · e798581
1 parent 1063af8
commit e798581
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml b/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml
@@ -469,16 +469,3 @@ spec:
     - name: nginx-config-volume
       configMap:
         name: nginx-config
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kruize-monitoring-view
-subjects:
-  - kind: ServiceAccount
-    name: kruize-sa
-    namespace: openshift-tuning
-roleRef:
-  kind: ClusterRole
-  name: cluster-monitoring-view
-  apiGroup: rbac.authorization.k8s.io
diff --git a/src/main/java/com/autotune/analyzer/recommendations/engine/RecommendationEngine.java b/src/main/java/com/autotune/analyzer/recommendations/engine/RecommendationEngine.java
@@ -1772,9 +1772,15 @@ private String getResults(Map<String, KruizeObject> mainKruizeExperimentMAP, Kru
             }
         } else if (kruizeObject.getExperiment_usecase_type().isLocal_monitoring()) {
             // get data from the provided datasource in case of local monitoring
-            DataSourceInfo dataSourceInfo = DataSourceCollection.getInstance().getDataSourcesCollection().get(dataSource);
-            if (dataSourceInfo == null) {
-                throw new DataSourceNotExist(KruizeConstants.DataSourceConstants.DataSourceErrorMsgs.MISSING_DATASOURCE_INFO);
+            // fetch the DatasourceInfo object from the DB based on datasource name
+            DataSourceInfo dataSourceInfo = new ExperimentDBService().loadDataSourceFromDBByName(dataSource);
+            // If the DB result is invalid, check the DataSourceCollection
+            if (CommonUtils.isInvalidDataSource(dataSourceInfo)) {
+                dataSourceInfo = DataSourceCollection.getInstance().getDataSourcesCollection().get(dataSource);
+                // If DataSourceCollection is also invalid, return with error
+                if (CommonUtils.isInvalidDataSource(dataSourceInfo)) {
+                    throw new DataSourceNotExist(KruizeConstants.DataSourceConstants.DataSourceErrorMsgs.INVALID_DATASOURCE_INFO);
+                }
             }
             // Fetch metrics dynamically from Metric Profile based on the datasource
             fetchMetricsBasedOnProfileAndDatasource(kruizeObject, interval_end_time, intervalStartTime, dataSourceInfo);

diff --git a/src/main/java/com/autotune/analyzer/services/DSMetadataService.java b/src/main/java/com/autotune/analyzer/services/DSMetadataService.java
@@ -27,6 +27,7 @@
 import com.autotune.common.datasource.DataSourceInfo;
 import com.autotune.common.datasource.DataSourceManager;
 import com.autotune.common.datasource.DataSourceMetadataValidation;
+import com.autotune.common.utils.CommonUtils;
 import com.autotune.database.service.ExperimentDBService;
 import com.autotune.utils.KruizeConstants;
 import com.autotune.utils.KruizeSupportedTypes;
@@ -115,18 +116,22 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             if (validationOutputData.isSuccess()) {
 
                 String dataSourceName = metadataAPIObject.getDataSourceName();
-                // fetch the DatasourceInfo object from the DataSourceCollection based on datasource name
-                DataSourceInfo datasource = DataSourceCollection.getInstance().getDataSourcesCollection().get(dataSourceName);
-
-                if (datasource == null) {
-                    sendErrorResponse(
-                            inputData,
-                            response,
-                            new Exception(AnalyzerErrorConstants.APIErrors.DSMetadataAPI.INVALID_DATASOURCE_NAME_METADATA_EXCPTN),
-                            HttpServletResponse.SC_BAD_REQUEST,
-                            String.format(AnalyzerErrorConstants.APIErrors.DSMetadataAPI.DATASOURCE_METADATA_IMPORT_ERROR_MSG, dataSourceName)
-                    );
-                    return;
+                // fetch the DatasourceInfo object from the DB based on datasource name
+                DataSourceInfo datasource = dataSourceManager.fetchDataSourceFromDBByName(dataSourceName);
+                // If the DB result is invalid, check the DataSourceCollection
+                if (CommonUtils.isInvalidDataSource(datasource)) {
+                    datasource = DataSourceCollection.getInstance().getDataSourcesCollection().get(dataSourceName);
+                    // If DataSourceCollection is also invalid, return with error
+                    if (CommonUtils.isInvalidDataSource(datasource)) {
+                        sendErrorResponse(
+                                inputData,
+                                response,
+                                new Exception(AnalyzerErrorConstants.APIErrors.DSMetadataAPI.INVALID_DATASOURCE_NAME_METADATA_EXCPTN),
+                                HttpServletResponse.SC_BAD_REQUEST,
+                                String.format(AnalyzerErrorConstants.APIErrors.DSMetadataAPI.DATASOURCE_METADATA_IMPORT_ERROR_MSG, dataSourceName)
+                        );
+                        return;
+                    }
                 }
 
                 DataSourceMetadataInfo metadataInfo = dataSourceManager.importMetadataFromDataSource(datasource);

diff --git a/src/main/java/com/autotune/common/utils/CommonUtils.java b/src/main/java/com/autotune/common/utils/CommonUtils.java
@@ -293,4 +293,10 @@ public static double getPercentage(double newer, double older) {
 
         return ((newer - older)/older) * 100;
     }
+
+    // Helper method to validate the DataSourceInfo object
+    public static boolean isInvalidDataSource(DataSourceInfo datasource) {
+        return datasource == null || datasource.getAuthenticationConfig() == null ||
+                datasource.getAuthenticationConfig().toString().isEmpty();
+    }
 }
diff --git a/src/main/java/com/autotune/utils/KruizeConstants.java b/src/main/java/com/autotune/utils/KruizeConstants.java
@@ -446,6 +446,7 @@ public static class DataSourceErrorMsgs {
             public static final String SERVICE_NOT_FOUND = "Can not find service with specified name.";
             public static final String ENDPOINT_NOT_FOUND = "Service endpoint not found.";
             public static final String MISSING_DATASOURCE_INFO = "Datasource is missing, add a valid Datasource";
+            public static final String INVALID_DATASOURCE_INFO = "Datasource is either missing or is invalid";
             private DataSourceErrorMsgs() {
             }
         }