Merge branch 'issue/CDM-20' into issue/CDM-22

Author: mieslep

.github/workflows/docker-publish.yml

@@ -1,18 +1,6 @@
 name: Build and publish to docker repo
 
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - 'src/**'
-      - 'pom.xml'
-      - 'Dockerfile'
-      - 'LICENSE.md'
-    tags:
-      - '*.*.*'
-      - '*.*.*-*'
+on: workflow_dispatch
 
 jobs:
   build_and_publish:
@@ -50,4 +38,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64
+          platforms: linux/amd64

src/main/java/datastax/astra/migrate/cql/CqlHelper.java

@@ -476,4 +476,11 @@ private void abendIfSessionsNotSet() {
     public Feature getFeature(Featureset featureEnum) {
         return featureMap.get(featureEnum);
     }
+
+    public Boolean isFeatureEnabled(Featureset featureEnum) {
+        if (!featureMap.containsKey(featureEnum)) {
+            return false;
+        }
+        return featureMap.get(featureEnum).isEnabled();
+    }
 }

src/test/java/datastax/astra/migrate/CqlHelperTest.java

@@ -1,15 +1,15 @@
 package datastax.astra.migrate;
 
 import datastax.astra.migrate.cql.CqlHelper;
+import datastax.astra.migrate.cql.features.Featureset;
 import datastax.astra.migrate.properties.KnownProperties;
 import datastax.astra.migrate.properties.PropertyHelper;
 import org.apache.spark.SparkConf;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CqlHelperTest {
 
@@ -54,4 +54,10 @@ public void smokeTest() {
         );
     }
 
+    @Test
+    public void featureHelper_disabledWhenNull() {
+        propertyHelper.initializeSparkConf(sparkConf);
+        cqlHelper.initialize();
+        assertFalse(cqlHelper.isFeatureEnabled(Featureset.TEST_UNIMPLEMENTED_FEATURE));
+    }
 }