feat: SASL_SCRAM support + minor "GUI" fixes (#8)

* Add support from scram login
* gui fixes

Author: BitProcessor

Dockerfile

@@ -1,6 +1,7 @@
-FROM openjdk:8-slim
+FROM openjdk:8-jre-slim
 
-RUN apt-get update && apt-get install -y python3 python3-pip curl
-
-COPY ./build/output/kafka-gitops /usr/local/bin/kafka-gitops
+RUN apt-get update && apt-get --yes upgrade && \
+    apt-get install -y python3 python3-pip curl && \
+    rm -rf /var/lib/apt/lists/*
 
+COPY ./build/output/kafka-gitops /usr/local/bin/kafka-gitops

build.gradle

@@ -69,7 +69,7 @@ jar {
 }
 
 task buildExecutableJar(type: Exec) {
-    commandLine "bash", "build.sh"
+    commandLine "sh", "build.sh"
 }
 
 task buildRelease(type: Zip, group: "build") {

src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java

@@ -56,8 +56,21 @@ private static void handleDefaultConfig(Map<String, Object> config) {
 
     private static void handleAuthentication(AtomicReference<String> username, AtomicReference<String> password, Map<String, Object> config) {
         if (username.get() != null && password.get() != null) {
-            String value = String.format("org.apache.kafka.common.security.plain.PlainLoginModule required username=\"%s\" password=\"%s\";",
-                    username.get(), password.get());
+            
+            // Do we need the Plain or SCRAM module?
+            String loginModule = null;
+            if (config.get("sasl.mechanism").equals("PLAIN")) {
+                loginModule = "org.apache.kafka.common.security.plain.PlainLoginModule";
+            }
+            else if (config.get("sasl.mechanism").equals("SCRAM-SHA-256")) {
+                loginModule = "org.apache.kafka.common.security.scram.ScramLoginModule";
+            }
+            else {
+               throw new MissingConfigurationException("KAFKA_SASL_MECHANISM"); 
+            }
+
+            String value = String.format("%s required username=\"%s\" password=\"%s\";",
+                    loginModule, username.get(), password.get());
             config.put("sasl.jaas.config", value);
         } else if (username.get() != null) {
             throw new MissingConfigurationException("KAFKA_SASL_JAAS_PASSWORD");

src/main/java/com/devshawn/kafka/gitops/util/LogUtil.java

@@ -86,14 +86,14 @@ private static void printAclPlan(AclPlan aclPlan) {
                 System.out.println("\n");
                 break;
             case REMOVE:
-                System.out.println(red(String.format("+ [ACL] %s", aclPlan.getName())));
-                System.out.println(red(String.format("\t + resource_name: %s", aclDetails.getName())));
-                System.out.println(red(String.format("\t + resource_type: %s", aclDetails.getType())));
-                System.out.println(red(String.format("\t + resource_pattern: %s", aclDetails.getPattern())));
-                System.out.println(red(String.format("\t + resource_principal: %s", aclDetails.getPrincipal())));
-                System.out.println(red(String.format("\t + host: %s", aclDetails.getHost())));
-                System.out.println(red(String.format("\t + operation: %s", aclDetails.getOperation())));
-                System.out.println(red(String.format("\t + permission: %s", aclDetails.getPermission())));
+                System.out.println(red(String.format("- [ACL] %s", aclPlan.getName())));
+                System.out.println(red(String.format("\t - resource_name: %s", aclDetails.getName())));
+                System.out.println(red(String.format("\t - resource_type: %s", aclDetails.getType())));
+                System.out.println(red(String.format("\t - resource_pattern: %s", aclDetails.getPattern())));
+                System.out.println(red(String.format("\t - resource_principal: %s", aclDetails.getPrincipal())));
+                System.out.println(red(String.format("\t - host: %s", aclDetails.getHost())));
+                System.out.println(red(String.format("\t - operation: %s", aclDetails.getOperation())));
+                System.out.println(red(String.format("\t - permission: %s", aclDetails.getPermission())));
                 System.out.println("\n");
                 break;
         }
@@ -152,7 +152,7 @@ private static void printLegend(PlanOverview planOverview) {
         }
 
         if (planOverview.getRemove() > 0) {
-            System.out.println(red("  ~ delete"));
+            System.out.println(red("  - delete"));
         }
         System.out.println("\nThe following actions will be performed:\n");