System Tests: Named Kafka clusters (kroxylicious#3074)

Author: SamBarker

.gitignore

@@ -42,6 +42,7 @@ dependency-reduced-pom.xml
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
+.idea/remote-targets.xml
 
  # Gradle
 .idea/**/gradle.xml

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/installation/strimzi/Strimzi.java

@@ -43,13 +43,12 @@ public Strimzi(String deploymentNamespace) {
      * Deploy strimzi.
      */
     public void deploy() {
-        LOGGER.info("Deploy Strimzi in {} namespace", deploymentNamespace);
         if (kubeClient().getDeployment(deploymentNamespace, Constants.STRIMZI_DEPLOYMENT_NAME) != null
                 || Environment.SKIP_STRIMZI_INSTALL) {
             LOGGER.warn("Skipping strimzi deployment. It is already deployed!");
             return;
         }
-
+        LOGGER.info("Deploy Strimzi in {} namespace", deploymentNamespace);
         ResourceManager.helmClient().namespace(deploymentNamespace).installByContainerImage(STRIMZI_HELM_REPOSITORY, STRIMZI_SERVICE_NAME,
                 Optional.of(Environment.STRIMZI_VERSION),
                 Optional.of(Path.of(TestUtils.getResourcesURI("helm_strimzi_overrides.yaml"))),

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/KroxyliciousST.java

@@ -40,7 +40,7 @@
 class KroxyliciousST extends AbstractST {
     private static final Logger LOGGER = LoggerFactory.getLogger(KroxyliciousST.class);
     private static Kroxylicious kroxylicious;
-    private final String clusterName = "my-cluster";
+    private final String clusterName = "kroxylicious-st-cluster";
     protected static final String BROKER_NODE_NAME = "kafka";
     private static final String MESSAGE = "Hello-world";
     private KroxyliciousOperator kroxyliciousOperator;

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/MetricsST.java

@@ -45,7 +45,7 @@
  */
 class MetricsST extends AbstractST {
     private static final Logger LOGGER = LoggerFactory.getLogger(MetricsST.class);
-    private final String clusterName = "my-cluster";
+    private final String clusterName = "metrics-st-cluster";
     protected static final String BROKER_NODE_NAME = "kafka";
     private static final String RECORD_VALUE = "Hello-world";
     private MetricsCollector kroxyliciousCollector;

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/NonJVMClientsST.java

@@ -39,7 +39,7 @@
 @Tag(EXTERNAL_KAFKA_CLIENTS)
 class NonJVMClientsST extends AbstractST {
     private static final Logger LOGGER = LoggerFactory.getLogger(NonJVMClientsST.class);
-    private final String clusterName = "my-cluster";
+    private final String clusterName = "non-jvm-clients-cluster";
     protected static final String BROKER_NODE_NAME = "kafka";
     private static final String MESSAGE = "Hello-world";
     private String bootstrap;

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/OperatorChangeDetectionST.java

@@ -71,9 +71,10 @@
 class OperatorChangeDetectionST extends AbstractST {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OperatorChangeDetectionST.class);
+    private static final String PREFIX = "optr-cd";
     private static Kroxylicious kroxylicious;
     private static CertManager certManager;
-    private final String kafkaClusterName = "my-cluster";
+    private final String kafkaClusterName = PREFIX + "-cluster";
     private KroxyliciousOperator kroxyliciousOperator;
 
     @Test
@@ -133,7 +134,7 @@ void shouldUpdateDeploymentWhenVirtualKafkaClusterChanges(String namespace) {
     void shouldUpdateDeploymentWhenDownstreamTlsCertUpdated(String namespace) {
         // Given
         var issuer = certManager.issuer(namespace);
-        var cert = certManager.certFor(namespace, "my-cluster-cluster-ip." + namespace + ".svc.cluster.local");
+        var cert = certManager.certFor(namespace, PREFIX + "-cluster-ip." + namespace + ".svc.cluster.local");
 
         resourceManager.createOrUpdateResourceWithWait(issuer, cert);
 
@@ -159,7 +160,7 @@ void shouldUpdateDeploymentWhenDownstreamTlsCertUpdated(String namespace) {
     void shouldUpdateDeploymentWhenDownstreamTrustUpdated(String namespace) {
         // Given
         var issuer = certManager.issuer(namespace);
-        var cert = certManager.certFor(namespace, "my-cluster-cluster-ip." + namespace + ".svc.cluster.local");
+        var cert = certManager.certFor(namespace, PREFIX + "-cluster-ip." + namespace + ".svc.cluster.local");
 
         resourceManager.createOrUpdateResourceWithWait(issuer, cert);
 

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/extensions/KroxyliciousExtension.java

@@ -7,6 +7,7 @@
 package io.kroxylicious.systemtests.extensions;
 
 import java.lang.reflect.Parameter;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -23,19 +24,21 @@
 
 import io.skodjob.testframe.resources.KubeResourceManager;
 
-import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.Environment;
 import io.kroxylicious.systemtests.logs.TestLogCollector;
 import io.kroxylicious.systemtests.resources.manager.ResourceManager;
 import io.kroxylicious.systemtests.utils.NamespaceUtils;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 /**
  * The type Kroxylicious extension.
  */
 public class KroxyliciousExtension implements ParameterResolver, BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback {
     private static final Logger LOGGER = LoggerFactory.getLogger(KroxyliciousExtension.class);
     private static final String K8S_NAMESPACE_KEY = "namespace";
     private static final String EXTENSION_STORE_NAME = "io.kroxylicious.systemtests";
+    private static final int MAX_NAMESPACE_PREFIX_LENGTH = 12;
     private final ExtensionContext.Namespace junitNamespace;
     private final TestLogCollector logCollector = TestLogCollector.getInstance();
 
@@ -89,9 +92,8 @@ public void afterEach(ExtensionContext extensionContext) {
         String testMethodName = extensionContext.getRequiredTestMethod().getName();
         try {
             Optional<Throwable> exception = extensionContext.getExecutionException();
-            exception.filter(t -> !t.getClass().getSimpleName().equals("AssumptionViolatedException")).ifPresent(e -> {
-                logCollector.collectLogs(testClassName, testMethodName);
-            });
+            exception.filter(t -> !t.getClass().getSimpleName().equals("AssumptionViolatedException"))
+                    .ifPresent(e -> logCollector.collectLogs(testClassName, testMethodName));
         }
         finally {
             if (Environment.SYNC_RESOURCES_DELETION) {
@@ -106,11 +108,24 @@ public void afterEach(ExtensionContext extensionContext) {
     @Override
     public void beforeEach(ExtensionContext extensionContext) {
         ResourceManager.setTestContext(extensionContext);
-        final String k8sNamespace = Constants.KAFKA_DEFAULT_NAMESPACE + "-" + UUID.randomUUID().toString().replace("-", "").substring(0, 6);
+        final String k8sNamespace = generateNamespaceName(extensionContext);
         extensionContext.getStore(junitNamespace).put(K8S_NAMESPACE_KEY, k8sNamespace);
         NamespaceUtils.createNamespaceAndPrepare(k8sNamespace);
     }
 
+    @NonNull
+    private static String generateNamespaceName(ExtensionContext extensionContext) {
+        String namespacePrefix = getPrefix(extensionContext);
+        return namespacePrefix + "-" + UUID.randomUUID().toString().replace("-", "").substring(0, 6);
+    }
+
+    @NonNull
+    private static String getPrefix(ExtensionContext extensionContext) {
+        String simpleName = extensionContext.getRequiredTestClass().getSimpleName().replace("ST", "");
+        String limitedTestName = simpleName.substring(0, Math.min(simpleName.length(), MAX_NAMESPACE_PREFIX_LENGTH));
+        return String.join("-", limitedTestName.split("(?=\\p{Upper})")).toLowerCase(Locale.ROOT) + "-st";
+    }
+
     private String extractK8sNamespace(ExtensionContext extensionContext) {
         return extensionContext.getStore(junitNamespace).get(K8S_NAMESPACE_KEY, String.class);
     }

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/filters/AuthorizationST.java

@@ -47,7 +47,7 @@ class AuthorizationST extends AbstractST {
     protected static final String BROKER_NODE_NAME = "kafka";
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationST.class);
     private static final String MESSAGE = "Hello-world";
-    private final String clusterName = "my-cluster";
+    private final String clusterName = "authorization-st-cluster";
     private String bootstrap;
     private KroxyliciousOperator kroxyliciousOperator;
     private static Kroxylicious kroxylicious;
@@ -86,7 +86,9 @@ void beforeEach() {
 
     @AfterAll
     void cleanUp() {
-        kroxyliciousOperator.delete();
+        if (kroxyliciousOperator != null) {
+            kroxyliciousOperator.delete();
+        }
     }
 
     @Test

kroxylicious-systemtests/src/test/java/io/kroxylicious/systemtests/filters/RecordEncryptionST.java

@@ -49,7 +49,7 @@ class RecordEncryptionST extends AbstractST {
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordEncryptionST.class);
     private static final String MESSAGE = "Hello-world";
     private static final String KEK_PREFIX = "KEK-";
-    private final String clusterName = "my-cluster";
+    private final String clusterName = "record-encryption-cluster";
     private String bootstrap;
     private TestKekManager testKekManager;
     private KroxyliciousOperator kroxyliciousOperator;