Merge remote-tracking branch 'mygithub/UpdateTopicReplication' into schema-registry-github

Author: Jerome Revillard

.gitlab-ci.yml

@@ -1,11 +1,7 @@
-FROM gradle:4.7.0-jdk8-alpine AS build
-COPY --chown=gradle:gradle . /home/gradle/src
-WORKDIR /home/gradle/src
-RUN gradle clean build buildRelease -x test --no-daemon
-
 FROM openjdk:8-jre-slim
+
 RUN apt-get update && apt-get --yes upgrade && \
     apt-get install -y python3 python3-pip curl && \
     rm -rf /var/lib/apt/lists/*
 
-COPY --from=build /home/gradle/src/build/output/kafka-gitops /usr/local/bin/kafka-gitops
+COPY ./build/output/kafka-gitops /usr/local/bin/kafka-gitops

Dockerfile

@@ -196,16 +196,16 @@ class TestUtils {
     }
 
     static CachedSchemaRegistryClient getSchemaRegistryClient() {
-          Map<String, Object> config = SchemaRegistryConfigLoader.load().getConfig();
-          RestService restService = new RestService(config.get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_URL_KEY).toString())
-          if(config.get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_SASL_CONFIG_KEY) != null) {
-              SaslBasicAuthCredentialProvider saslBasicAuthCredentialProvider = new SaslBasicAuthCredentialProvider()
-              Map<String, Object> clientConfig = new HashMap<>()
-              clientConfig.put(SaslConfigs.SASL_JAAS_CONFIG, config
-                  .get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_SASL_CONFIG_KEY).toString())
-              saslBasicAuthCredentialProvider.configure(clientConfig)
-              restService.setBasicAuthCredentialProvider(saslBasicAuthCredentialProvider)
-          }
+        Map<String, Object> config = SchemaRegistryConfigLoader.load().getConfig();
+        RestService restService = new RestService(config.get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_URL_KEY).toString())
+        if(config.get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_SASL_CONFIG_KEY) != null) {
+            SaslBasicAuthCredentialProvider saslBasicAuthCredentialProvider = new SaslBasicAuthCredentialProvider()
+            Map<String, Object> clientConfig = new HashMap<>()
+            clientConfig.put(SaslConfigs.SASL_JAAS_CONFIG, config
+                .get(SchemaRegistryConfigLoader.SCHEMA_REGISTRY_SASL_CONFIG_KEY).toString())
+            saslBasicAuthCredentialProvider.configure(clientConfig)
+            restService.setBasicAuthCredentialProvider(saslBasicAuthCredentialProvider)
+        }
         return  new CachedSchemaRegistryClient(restService, 10);
     }
 }

Dockerfile.local

@@ -42,4 +42,4 @@
     ],
     "schemaPlans" : [ ],
     "aclPlans" : [ ]
-}
+}

src/test/groovy/com/devshawn/kafka/gitops/TestUtils.groovy

@@ -16,4 +16,4 @@
     ],
     "schemaPlans" : [ ],
     "aclPlans" : [ ]
-}
+}

src/test/resources/plans/default-replication-multiple-plan.json

@@ -56,4 +56,4 @@
             "action" : "ADD"
         }
     ]
-}
+}

src/test/resources/plans/default-replication-plan.json

@@ -89,4 +89,4 @@
             "action" : "NO_CHANGE"
         }
     ]
-}
+}

src/test/resources/plans/multi-file-plan.json

@@ -55,4 +55,4 @@
             "action" : "ADD"
         }
     ]
-}
+}

src/test/resources/plans/no-changes-include-unchanged-plan.json

@@ -140,4 +140,4 @@
             "action" : "ADD"
         }
     ]
-}
+}