[ST] Huge update of setup, utils, certs, constants and envs (#2381)

* Sts update, auth setup, versions, dependencies
* fixes for groups css
* new strimzi and kafka
* add released test-clients
* fix name
* fix groups test
* minor doc changes
* minor loading change

---------

Signed-off-by: jkalinic <jkalinic@redhat.com>

Author: jankalinic

systemtests/config.yaml

@@ -4,6 +4,8 @@
 # -------------------------------------------
 # Cleanup environment after test. In case of debugging, this env lets you skip afterEach and afterAll.
 CLEANUP_ENVIRONMENT: true
+# This allows re-deployment of console operator if it already exists
+DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL: true
 # Log level used in file output
 TEST_FILE_LOG_LEVEL: DEBUG
 # Log level used in console output
@@ -41,12 +43,12 @@ CONSOLE_OLM_CHANNEL_NAME: alpha
 # YAML
 # -------------------------------------------
 # Which released version of Strimzi Cluster Operator to install
-STRIMZI_OPERATOR_VERSION: 0.49.0
+STRIMZI_OPERATOR_VERSION: 0.51.0
 # URL or local path for Console Operator installation
 # 1. URL - released console-operator.yaml
 # 2. Local path that is relative to the root project dir
 # 3. Local path that is absolute
-CONSOLE_OPERATOR_BUNDLE_URL: https://github.com/streamshub/console/releases/download/0.8.4/streamshub-console-operator.yaml
+CONSOLE_OPERATOR_BUNDLE_URL: https://github.com/streamshub/console/releases/download/0.11.0/streamshub-console-operator.yaml
 # Custom Console Operator image. Overrides default image used in bundle yaml
 CONSOLE_OPERATOR_IMAGE:
 # -------------------------------------------
@@ -57,9 +59,30 @@ CONSOLE_API_IMAGE:
 # Custom Console UI image. Overrides default image installed automatically by Operator
 CONSOLE_UI_IMAGE:
 # -------------------------------------------
+# Kroxy
+# -------------------------------------------
+# Kroxy released yaml manifests version
+KROXYLICIOUS_VERSION: 0.18.0
+# -------------------------------------------
+# Apicurio
+# -------------------------------------------
+# Apicurio schema registry version
+APICURIO_VERSION: 3.1.7
+# -------------------------------------------
+# Keycloak
+# -------------------------------------------
+# Keycloak released yaml manifest tag version
+KEYCLOAK_VERSION: 26.4.0
+# -------------------------------------------
+# Prometheus
+# -------------------------------------------
+# Used for custom prometheus tests
+# version of the released yaml manifests
+PROMETHEUS_VERSION: 0.89.0
+# -------------------------------------------
 # Kafka
 # -------------------------------------------
 # Kafka version used in system tests
-ST_KAFKA_VERSION: 4.1.0
+ST_KAFKA_VERSION: 4.2.0
 # Image for test client containers in system tests
-TEST_CLIENTS_IMAGE: quay.io/strimzi-test-clients/test-clients:0.12.0-kafka-4.1.0
+TEST_CLIENTS_IMAGE: quay.io/strimzi-test-clients/test-clients:0.13.0-kafka-4.2.0

systemtests/pom.xml

@@ -258,6 +258,14 @@
             </activation>
         </profile>
 
+        <profile>
+            <id>all</id>
+            <properties>
+                <skipTests>false</skipTests>
+                <groups>regression, olm-upgrade, yaml-upgrade</groups>
+            </properties>
+        </profile>
+
         <profile>
             <id>regression</id>
             <properties>

systemtests/src/main/java/com/github/streamshub/systemtests/Environment.java

@@ -27,12 +27,12 @@ public class Environment {
     // Console
     public static final String CONSOLE_API_IMAGE = ENVS.getOrDefault("CONSOLE_API_IMAGE", "");
     public static final String CONSOLE_UI_IMAGE = ENVS.getOrDefault("CONSOLE_UI_IMAGE", "");
-    public static final String CONSOLE_OPERATOR_IMAGE = ENVS.getOrDefault("CONSOLE_OPERATOR_IMAGE", "");
     public static final InstallType CONSOLE_INSTALL_TYPE = ENVS.getOrDefault("CONSOLE_INSTALL_TYPE", InstallType::fromString, InstallType.Yaml);
     public static final String CONSOLE_DEPLOYMENT_NAME = ENVS.getOrDefault("CONSOLE_DEPLOYMENT_NAME", "streamshub-console");
     public static final String CONSOLE_CLUSTER_DOMAIN = ENVS.getOrDefault("CONSOLE_CLUSTER_DOMAIN", "");
+    public static final boolean DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL = ENVS.getOrDefault("DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL", Boolean::parseBoolean, true);
 
-     // YAML bundle
+    // YAML bundle
     public static final String CONSOLE_OPERATOR_BUNDLE_URL = ENVS.getOrDefault("CONSOLE_OPERATOR_BUNDLE_URL", "");
 
     // OLM
@@ -66,20 +66,25 @@ public class Environment {
     public static final String TEST_CLIENTS_PULL_SECRET = ENVS.getOrDefault("TEST_CLIENTS_PULL_SECRET", "");
 
     // Keycloak
-    public static final String KEYCLOAK_VERSION = ENVS.getOrDefault("KEYCLOAK_VERSION", "26.2.5");
+    public static final String KEYCLOAK_VERSION = ENVS.getOrDefault("KEYCLOAK_VERSION", "26.4.0");
     public static final boolean DEFAULT_TO_DENY_NETWORK_POLICIES = ENVS.getOrDefault("DEFAULT_TO_DENY_NETWORK_POLICIES", Boolean::parseBoolean, true);
     public static final String KEYCLOAK_TRUST_STORE_FILE_PATH = ENVS.getOrDefault("TRUST_STORE_FILE_PATH", "/tmp/keycloak/keycloak-truststore.jks");
+    // For custom keycloak images
+    public static final String KEYCLOAK_OPERATOR_IMAGE = ENVS.getOrDefault("KEYCLOAK_OPERATOR_IMAGE", "");
+    public static final String KEYCLOAK_SERVER_IMAGE = ENVS.getOrDefault("KEYCLOAK_SERVER_IMAGE", "");
 
     // Postgres
     public static final String POSTGRES_IMAGE = ENVS.getOrDefault("POSTGRES_IMAGE", "mirror.gcr.io/postgres:18");
 
     // Proxy
     public static final String KROXYLICIOUS_VERSION = ENVS.getOrDefault("KROXYLICIOUS_VERSION", "0.18.0");
 
-
     // Apicurio
     public static final String APICURIO_VERSION = ENVS.getOrDefault("APICURIO_VERSION", "3.1.7");
 
+    // Prometheus
+    public static final String PROMETHEUS_VERSION = ENVS.getOrDefault("PROMETHEUS_VERSION", "0.89.0");
+
     // ------------------------------------------------------------------------------------------------------------------------------------------------------------
     // Deny instantiation
     private Environment() {}

systemtests/src/main/java/com/github/streamshub/systemtests/MessageStore.java

@@ -58,6 +58,9 @@ private MessageStore() {}
     static final String BRAND = "brand";
     static final String RECONCILIATION = "reconciliation";
     static final String MESSAGE_BROWSER = "message-browser";
+    static final String APP_LAYOUT = "AppLayout";
+    static final String KAFKA_CONNECT = "KafkaConnect";
+    static final String GROUPS_TABLE = "GroupsTable";
 
     public static String getProductName() {
         return jsonResources.get(COMMON).get(PRODUCT).textValue();
@@ -95,9 +98,6 @@ public static String reconciliationCancel() {
         return jsonResources.get(RECONCILIATION).get("cancel").textValue();
     }
 
-    public static String reconciliationResume() {
-        return jsonResources.get(RECONCILIATION).get("resume").textValue();
-    }
 
     public static String reconciliationPausedWarning() {
         return jsonResources.get(RECONCILIATION).get("reconciliation_paused_warning").textValue();
@@ -114,9 +114,17 @@ public static String clusterCardNoMessages() {
     public static String noDataTitle() {
         return jsonResources.get(MESSAGE_BROWSER).get("no_data_title").textValue();
     }
-    public static String noDataBody() {
-        return jsonResources.get(MESSAGE_BROWSER).get("no_data_title").textValue();
+
+    public static String noConsumerGroups() {
+        return jsonResources.get(GROUPS_TABLE).get("no_consumer_groups").textValue();
     }
 
+    public static String groupsTitle() {
+        return jsonResources.get(GROUPS_TABLE).get("title").textValue();
+    }
+
+    public static String kafkaConnect() {
+        return jsonResources.get(APP_LAYOUT).get("kafka_connect").textValue();
+    }
 
 }

systemtests/src/main/java/com/github/streamshub/systemtests/TestCaseConfig.java

@@ -10,19 +10,22 @@
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.Tracing;
+import com.microsoft.playwright.options.ColorScheme;
+import com.microsoft.playwright.options.ViewportSize;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import java.lang.reflect.Method;
 import java.util.Locale;
 
 public class TestCaseConfig {
+    private static final ViewportSize FULL_HD = new ViewportSize(1920, 1080);
     private final String testName;
     private final String namespace;
     private final Playwright playwright;
-    private final Browser browser;
     private final BrowserContext context;
+    private final Browser browser;
     private final Page page;
-    private int messageCount;
+    private final int defaultMessageCount;
 
     // Default Kafka
     private final String kafkaName;
@@ -51,8 +54,14 @@ public TestCaseConfig(ExtensionContext extensionContext) {
             .orElse("nullClass");
 
         this.playwright = Playwright.create();
-        this.browser = PwUtils.createBrowser(playwright);
-        this.context = browser.newContext(new Browser.NewContextOptions().setIgnoreHTTPSErrors(true));
+
+        // to keep browser context open it must exist within the TestCaseConfig context - can't be a local var
+        browser = PwUtils.createBrowser(playwright);
+        this.context = browser.newContext(new Browser.NewContextOptions()
+                .setColorScheme(ColorScheme.DARK)
+                .setViewportSize(FULL_HD)
+                .setIgnoreHTTPSErrors(true));
+
         // Allow tracing
         this.context.tracing().start(new Tracing.StartOptions().setScreenshots(true).setSnapshots(true).setSources(true));
 
@@ -70,7 +79,7 @@ public TestCaseConfig(ExtensionContext extensionContext) {
         this.kafkaServiceName = KroxyNamingUtils.kafkaServiceName(namespace);
         this.kafkaProtocolFilterName = KroxyNamingUtils.kafkaProtocolFilterName(namespace);
 
-        this.messageCount = Constants.MESSAGE_COUNT;
+        this.defaultMessageCount = Constants.MESSAGE_COUNT;
         this.apicurioRegistry3Name = Constants.APICURIO_PREFIX + "-" + Utils.hashStub(namespace);
     }
 
@@ -133,18 +142,11 @@ public String kafkaProtocolFilterName() {
         return kafkaProtocolFilterName;
     }
 
-    public int messageCount() {
-        return messageCount;
+    public int defaultMessageCount() {
+        return defaultMessageCount;
     }
 
     public String apicurioRegistry3Name() {
         return apicurioRegistry3Name;
     }
-
-    // ----------
-    // Setters
-    // ----------
-    public void setMessageCount(int messageCount) {
-        this.messageCount = messageCount;
-    }
 }

systemtests/src/main/java/com/github/streamshub/systemtests/constants/AuthTestConstants.java

@@ -6,34 +6,66 @@ public class AuthTestConstants {
 
     private AuthTestConstants() {}
 
+    // JWT Claim
+    public static final String CLAIM_GROUPS = "groups";
+
+    // Test Usernames
+    public static final String USER_DEV_BOB = "bob";
+    public static final String USER_DEV_BOB_LASTNAME = "TheDeveloper";
+
+    public static final String USER_ADMIN_ALICE = "alice";
+    public static final String USER_ADMIN_ALICE_LASTNAME = "TheAdmin";
+
+    public static final String USER_TOPICONLY_FRANK = "frank";
+    public static final String USER_TOPICONLY_FRANK_LASTNAME = "TopicOnlyViewer";
+
+    public static final String USER_CONSUMERONLY_GRACE = "grace";
+    public static final String USER_CONSUMERONLY_GRACE_LASTNAME = "ConsuemerOnlyViewer";
+
+    // Suffixes
+    public static final String GROUP_SUFFIX = "-team";
+    public static final String ROLE_SUFFIX = "-role";
+
+    // Base names
+    public static final String DEV = "developers";
+    public static final String ADMIN = "administrators";
+    public static final String TOPICS_VIEW = "topics";
+    public static final String CONSUMERGROUPS_VIEW = "consumergroups";
+
     // Keycloak Groups
-    public static final String DEV_GROUP_NAME = "/developers-team";
-    public static final String ADMIN_GROUP_NAME = "/administrators-team";
-    public static final String TOPICS_VIEW_GROUP_NAME = "/topics-view-team";
-    public static final String CONSUMERGROUPS_VIEW_GROUP_NAME = "/consumergroups-view-team";
+    public static final String DEV_GROUP_NAME = DEV + GROUP_SUFFIX;
+    public static final String ADMIN_GROUP_NAME = ADMIN + GROUP_SUFFIX;
+    public static final String TOPICS_VIEW_GROUP_NAME = TOPICS_VIEW + "-viewonly" + GROUP_SUFFIX;
+    public static final String CONSUMERGROUPS_VIEW_GROUP_NAME = CONSUMERGROUPS_VIEW + "-viewonly" + GROUP_SUFFIX;
+
+    // Keycloak Role Names
+    public static final String DEV_ROLE_NAME = DEV + ROLE_SUFFIX;
+    public static final String ADMIN_ROLE_NAME = ADMIN + ROLE_SUFFIX;
+    public static final String TOPICS_VIEW_ROLE_NAME = TOPICS_VIEW + ROLE_SUFFIX;
+    public static final String CONSUMERGROUPS_VIEW_ROLE_NAME = CONSUMERGROUPS_VIEW + ROLE_SUFFIX;
+
+    // Keycloak Group Paths
+    public static final String DEV_GROUP_PATH = "/" + DEV_GROUP_NAME; // NOSONAR
+    public static final String ADMIN_GROUP_PATH = "/" + ADMIN_GROUP_NAME; // NOSONAR
+    public static final String TOPICS_VIEW_GROUP_PATH = "/" + TOPICS_VIEW_GROUP_NAME; // NOSONAR
+    public static final String CONSUMERGROUPS_VIEW_GROUP_PATH = "/" + CONSUMERGROUPS_VIEW_GROUP_NAME; // NOSONAR
 
-    // Console Roles
-    public static final String DEV_ROLE_NAME = "developers-role";
-    public static final String ADMIN_ROLE_NAME = "administrators-role";
-    public static final String TOPICS_VIEW_ROLE_NAME = "topics-role";
-    public static final String CONSUMERGROUPS_VIEW_ROLE_NAME = "consumergroups-role";
+    // Keycloak Role Descriptions
+    public static final String DEV_ROLE_DESCRIPTION = DEV_ROLE_NAME + " member";
+    public static final String ADMIN_ROLE_DESCRIPTION = ADMIN_ROLE_NAME + " member";
+    public static final String TOPICS_VIEW_ROLE_DESCRIPTION = "Can view " + TOPICS_VIEW_ROLE_NAME + "s only";
+    public static final String CONSUMERGROUPS_VIEW_ROLE_DESCRIPTION = "Can view " + CONSUMERGROUPS_VIEW_ROLE_NAME + "s only";
+
+    // Aditional emails
+    public static final String USER_DEV_BOB_EMAIL = AuthTestConstants.USER_DEV_BOB + "@streams-hub.io";
+    public static final String USER_ADMIN_ALICE_EMAIL = AuthTestConstants.USER_ADMIN_ALICE + "@streams.hub.io";
+    public static final String USER_TOPICONLY_FRANK_EMAIL = AuthTestConstants.USER_TOPICONLY_FRANK + "@stream+shub.io";
+    public static final String USER_CONSUMERONLY_GRACE_EMAIL = AuthTestConstants.USER_CONSUMERONLY_GRACE + "@streamshub.io";
 
     // Kafka Cluster Names
     public static final String TEAM_DEV_KAFKA_NAME = "kc-team-dev";
     public static final String TEAM_DEV_TOPIC_PREFIX = "dev-";
     public static final String TEAM_ADMIN_KAFKA_NAME = "kc-team-admin";
     public static final String TEAM_ADMIN_TOPIC_PREFIX = "admin-";
 
-    // JWT Claim
-    public static final String CLAIM_GROUPS = "groups";
-
-    // Test Usernames
-    // developer
-    public static final String USER_DEV_BOB = "bob";
-    // admin
-    public static final String USER_ADMIN_ALICE = "alice";
-    // topics only
-    public static final String USER_TOPICONLY_FRANK = "frank";
-    // consumer groups only
-    public static final String USER_CONSUMERONLY_GRACE = "grace";
 }