Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update of unit tests to use KRaft - part 9 #10468

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Update of unit tests to use KRaft - part 9 #10468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cluster-operator/src/main/java/io/strimzi/operator/cluster/model/cruisecontrol/Capacity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ private static DiskCapacity generateDiskCapacity(Storage storage) {
} else {
return DiskCapacity.of(BrokerCapacity.DEFAULT_DISK_CAPACITY_IN_MIB);
}
} else if (storage == null) {
throw new IllegalStateException("The storage declaration is missing");
} else {
throw new IllegalStateException("The declared storage '" + storage.getType() + "' is not supported");
}
Expand Down
1,015 changes: 477 additions & 538 deletions cluster-operator/src/test/java/io/strimzi/operator/cluster/model/CruiseControlTest.java
View file
Open in desktop

Large diffs are not rendered by default.

545 changes: 206 additions & 339 deletions cluster-operator/src/test/java/io/strimzi/operator/cluster/model/EntityOperatorTest.java
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 178 additions & 228 deletions ...ter-operator/src/test/java/io/strimzi/operator/cluster/model/EntityTopicOperatorTest.java
View file
Open in desktop

Large diffs are not rendered by default.

451 changes: 202 additions & 249 deletions cluster-operator/src/test/java/io/strimzi/operator/cluster/model/EntityUserOperatorTest.java
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 22 additions & 11 deletions ...ava/io/strimzi/operator/cluster/model/cruisecontrol/CruiseControlMetricsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

import io.strimzi.api.kafka.model.kafka.Kafka;
import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
import io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerBuilder;
import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType;
import io.strimzi.operator.cluster.model.KafkaConfiguration;
import io.strimzi.operator.common.Annotations;
import io.strimzi.operator.common.Reconciliation;
import io.strimzi.operator.common.model.InvalidResourceException;
import io.strimzi.operator.common.model.cruisecontrol.CruiseControlConfigurationParameters;
Expand All @@ -27,22 +30,30 @@ public class CruiseControlMetricsReporterTest {
private final static String NAMESPACE = "my-namespace";

private final static Kafka KAFKA = new KafkaBuilder()
.withNewMetadata()
.withName(NAME)
.withNamespace(NAMESPACE)
.endMetadata()
.withNewSpec()
.withNewMetadata()
.withName(NAME)
.withNamespace(NAMESPACE)
.withAnnotations(Map.of(Annotations.ANNO_STRIMZI_IO_NODE_POOLS, "enabled", Annotations.ANNO_STRIMZI_IO_KRAFT, "enabled"))
.endMetadata()
.withNewSpec()
.withNewKafka()
.withListeners(new GenericKafkaListenerBuilder()
.withName("tls")
.withPort(9092)
.withType(KafkaListenerType.INTERNAL)
.withTls(true)
.build())
.endKafka()
.withNewCruiseControl()
.endCruiseControl()
.endSpec()
.build();
.withNewCruiseControl()
.endCruiseControl()
.endSpec()
.build();

@Test
public void testDisabledCruiseControl() {
Kafka kafka = new KafkaBuilder(KAFKA)
.withNewSpec()
.editSpec()
.withCruiseControl(null)
.endSpec()
.build();

Expand Down Expand Up @@ -79,7 +90,7 @@ public void testEnabledCruiseControlWithSettingsFromKafka() {
@Test
public void testEnabledCruiseControlWithSettingsFromCC() {
Kafka kafka = new KafkaBuilder(KAFKA)
.withNewSpec()
.editSpec()
.withNewCruiseControl()
.withConfig(Map.of("metric.reporter.topic", "my-custom-topic"))
.endCruiseControl()
Expand Down
69 changes: 33 additions & 36 deletions ...a/io/strimzi/operator/cluster/model/cruisecontrol/HashLoginServiceApiCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
import io.strimzi.api.kafka.model.kafka.Kafka;
import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
import io.strimzi.api.kafka.model.kafka.Storage;
import io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlApiUsers;
import io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlSpec;
import io.strimzi.api.kafka.model.kafka.cruisecontrol.CruiseControlSpecBuilder;
import io.strimzi.api.kafka.model.kafka.cruisecontrol.HashLoginServiceApiUsers;
import io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerBuilder;
import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType;
import io.strimzi.operator.cluster.KafkaVersionTestUtils;
import io.strimzi.operator.cluster.model.CruiseControl;
import io.strimzi.operator.cluster.model.KafkaVersion;
import io.strimzi.operator.cluster.model.MockSharedEnvironmentProvider;
import io.strimzi.operator.cluster.model.NodeRef;
import io.strimzi.operator.cluster.model.SharedEnvironmentProvider;
import io.strimzi.operator.common.Annotations;
import io.strimzi.operator.common.InvalidConfigurationException;
import io.strimzi.operator.common.Reconciliation;
import io.strimzi.operator.common.model.InvalidResourceException;
Expand Down Expand Up @@ -51,7 +52,6 @@
public class HashLoginServiceApiCredentialsTest {
private final static String CLUSTER = "my-cluster";
private final static String NAMESPACE = "my-namespace";
private final static int REPLICAS = 3;
private static final KafkaVersion.Lookup VERSIONS = KafkaVersionTestUtils.getKafkaVersionLookup();
private static final SharedEnvironmentProvider SHARED_ENV_PROVIDER = new MockSharedEnvironmentProvider();
private static final String SECRET_NAME = "secretName";
Expand Down Expand Up @@ -84,23 +84,23 @@ public class HashLoginServiceApiCredentialsTest {

private static Kafka createKafka(CruiseControlSpec ccSpec) {
return new KafkaBuilder()
.withNewMetadata()
.withName(CLUSTER)
.withNamespace(NAMESPACE)
.endMetadata()
.withNewSpec()
.withNewZookeeper()
.withReplicas(REPLICAS)
.endZookeeper()
.withNewKafka()
.withReplicas(REPLICAS)
.withNewEphemeralStorage()
.withSizeLimit("10Gi")
.endEphemeralStorage()
.endKafka()
.withCruiseControl(ccSpec)
.endSpec()
.build();
.withNewMetadata()
.withName(CLUSTER)
.withNamespace(NAMESPACE)
.withAnnotations(Map.of(Annotations.ANNO_STRIMZI_IO_NODE_POOLS, "enabled", Annotations.ANNO_STRIMZI_IO_KRAFT, "enabled"))
.endMetadata()
.withNewSpec()
.withNewKafka()
.withListeners(new GenericKafkaListenerBuilder()
.withName("tls")
.withPort(9092)
.withType(KafkaListenerType.INTERNAL)
.withTls(true)
.build())
.endKafka()
.withCruiseControl(ccSpec)
.endSpec()
.build();
}

private static Secret createSecret(Map<String, String> data) {
Expand Down Expand Up @@ -152,7 +152,7 @@ public void testApiUsersObjectCreation() {
assertThrows(Exception.class, () -> new HashLoginServiceApiCredentials(NAMESPACE, CLUSTER, LABELS, OWNER_REFERENCE, s4));
}

private void assertParseThrows(String illegalConfig, CruiseControlApiUsers apiUsers) {
private void assertParseThrows(String illegalConfig) {
assertThrows(InvalidConfigurationException.class, () -> HashLoginServiceApiCredentials.parseEntriesFromString(illegalConfig));
}

Expand All @@ -163,27 +163,26 @@ public void testParseEntriesFromString() {
username1: password1,VIEWER
username2: password2,USER
""";
CruiseControlApiUsers apiUsers = new HashLoginServiceApiUsers();
Map<String, HashLoginServiceApiCredentials.UserEntry> entries = HashLoginServiceApiCredentials.parseEntriesFromString(config);
assertThat(entries.get("username0").username(), is("username0"));
assertThat(entries.get("username0").password(), is("password0"));
assertThat(entries.get("username0").role(), is(HashLoginServiceApiCredentials.Role.USER));

assertParseThrows("""
username1: , USER
""", apiUsers);
""");
assertParseThrows("""
: password1, USER
""", apiUsers);
""");
assertParseThrows("""
username1 username2: password1 USER
""", apiUsers);
""");
assertParseThrows("""
username1: password1,USER,VIEWER
""", apiUsers);
""");
assertParseThrows("""
username1: password1 password2,USER
""", apiUsers);
""");
}

@ParallelTest
Expand All @@ -201,7 +200,7 @@ public void testGenerateToManagedApiCredentials() {
assertThat(entries.size(), is(0));
}

private void assertParseThrowsForUserManagedCreds(String illegalConfig, CruiseControlApiUsers apiUsers) {
private void assertParseThrowsForUserManagedCreds(String illegalConfig) {
illegalConfig = encodeToBase64(illegalConfig);
Secret secret = createSecret(Map.of(SECRET_KEY, illegalConfig));
Map<String, HashLoginServiceApiCredentials.UserEntry> entries = new HashMap<>();
Expand All @@ -215,7 +214,6 @@ public void testGenerateUserManagedApiCredentials() {
username1: password1,VIEWER
username2: password2,USER
""");
CruiseControlApiUsers apiUsers = new HashLoginServiceApiUsers();
Secret secret = createSecret(Map.of(SECRET_KEY, config));
Map<String, HashLoginServiceApiCredentials.UserEntry> entries = new HashMap<>();
HashLoginServiceApiCredentials.generateUserManagedApiCredentials(entries, secret, SECRET_KEY);
Expand Down Expand Up @@ -243,27 +241,27 @@ public void testGenerateUserManagedApiCredentials() {
assertParseThrowsForUserManagedCreds("""
username1: password1,USER
username2: password2,TEST
""", apiUsers);
""");
assertParseThrowsForUserManagedCreds("""
rebalance-operator: password1,USER
username2: password2,USER
""", apiUsers);
""");
assertParseThrowsForUserManagedCreds("""
topic-operator: password1,USER
username2: password2,USER
""", apiUsers);
""");
assertParseThrowsForUserManagedCreds("""
healthcheck: password1,USER
username2: password2,USER
""", apiUsers);
""");
assertParseThrowsForUserManagedCreds("""
username1: password1,USER
username2: password2,ADMIN
""", apiUsers);
""");
assertParseThrowsForUserManagedCreds("""
username1: password1,USER
username1: password2,ADMIN
""", apiUsers);
""");
}

@ParallelTest
Expand All @@ -274,7 +272,6 @@ public void testGenerateCoManagedApiCredentials() {
Map<String, String> map1 = Map.of("cruise-control.authFile",
encodeToBase64("rebalance-operator: password,ADMIN\n" +
"healthcheck: password,USER"));
CruiseControlApiUsers apiUsers = new HashLoginServiceApiUsers();
Map<String, HashLoginServiceApiCredentials.UserEntry> entries = new HashMap<>();
HashLoginServiceApiCredentials.generateCoManagedApiCredentials(entries, mockPasswordGenerator, createSecret(map1));
assertThat(entries.get("rebalance-operator").username(), is("rebalance-operator"));
Expand Down
Loading