Skip to content

Commit e94d3b5

Browse files
kornyskornys
authored
Update test-frame and update systemtests (#88)
Signed-off-by: David Kornel <[email protected]>
1 parent 8015c85 commit e94d3b5

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<junit-jupiter.version>5.8.2</junit-jupiter.version>
8888
<assertj.version>3.21.0</assertj.version>
8989
<mockito.version>4.11.0</mockito.version>
90-
<test-frame.version>0.8.0</test-frame.version>
90+
<test-frame.version>1.0.0</test-frame.version>
9191
<helm-client.version>0.0.13</helm-client.version>
9292
<hamcrest.version>2.2</hamcrest.version>
9393

‎systemtest/src/main/java/io/strimzi/kafka/access/installation/BundleInstallation.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void install() {
4444
switch (resourceType) {
4545
case TestConstants.NAMESPACE:
4646
// create Namespace
47-
KubeResourceManager.getInstance().createResourceWithWait(new NamespaceBuilder()
47+
KubeResourceManager.get().createResourceWithWait(new NamespaceBuilder()
4848
.editOrNewMetadata()
4949
.withName(installationNamespace)
5050
.endMetadata()
@@ -53,7 +53,7 @@ public void install() {
5353
break;
5454
case TestConstants.SERVICE_ACCOUNT:
5555
ServiceAccount serviceAccount = TestFrameUtils.configFromYaml(file, ServiceAccount.class);
56-
KubeResourceManager.getInstance().createOrUpdateResourceWithWait(new ServiceAccountBuilder(serviceAccount)
56+
KubeResourceManager.get().createOrUpdateResourceWithWait(new ServiceAccountBuilder(serviceAccount)
5757
.editMetadata()
5858
.withNamespace(installationNamespace)
5959
.endMetadata()
@@ -62,11 +62,11 @@ public void install() {
6262
break;
6363
case TestConstants.CLUSTER_ROLE:
6464
ClusterRole clusterRole = TestFrameUtils.configFromYaml(file, ClusterRole.class);
65-
KubeResourceManager.getInstance().createOrUpdateResourceWithWait(clusterRole);
65+
KubeResourceManager.get().createOrUpdateResourceWithWait(clusterRole);
6666
break;
6767
case TestConstants.CLUSTER_ROLE_BINDING:
6868
ClusterRoleBinding clusterRoleBinding = TestFrameUtils.configFromYaml(file, ClusterRoleBinding.class);
69-
KubeResourceManager.getInstance().createOrUpdateResourceWithWait(new ClusterRoleBindingBuilder(clusterRoleBinding)
69+
KubeResourceManager.get().createOrUpdateResourceWithWait(new ClusterRoleBindingBuilder(clusterRoleBinding)
7070
.editOrNewMetadata()
7171
.withNamespace(installationNamespace)
7272
.endMetadata()
@@ -78,7 +78,7 @@ public void install() {
7878
break;
7979
case TestConstants.CUSTOM_RESOURCE_DEFINITION_SHORT:
8080
CustomResourceDefinition customResourceDefinition = TestFrameUtils.configFromYaml(file, CustomResourceDefinition.class);
81-
KubeResourceManager.getInstance().createOrUpdateResourceWithWait(customResourceDefinition);
81+
KubeResourceManager.get().createOrUpdateResourceWithWait(customResourceDefinition);
8282
break;
8383
case TestConstants.DEPLOYMENT:
8484
deployKafkaAccessOperator(file);
@@ -122,6 +122,6 @@ private void deployKafkaAccessOperator(File deploymentFile) {
122122
.endSpec()
123123
.build();
124124

125-
KubeResourceManager.getInstance().createResourceWithWait(accessOperatorDeployment);
125+
KubeResourceManager.get().createResourceWithWait(accessOperatorDeployment);
126126
}
127127
}

‎systemtest/src/main/java/io/strimzi/kafka/access/installation/HelmInstallation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public void delete() {
5858
.withNamespace(installationNamespace)
5959
.call();
6060

61-
KubeResourceManager.getKubeClient().getClient().namespaces().withName(installationNamespace).delete();
61+
KubeResourceManager.get().kubeClient().getClient().namespaces().withName(installationNamespace).delete();
6262
}
6363
}

‎systemtest/src/main/java/io/strimzi/kafka/access/resources/KafkaAccessType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public boolean isDeleted(KafkaAccess kafkaAccess) {
7474
}
7575

7676
public static MixedOperation<KafkaAccess, KubernetesResourceList<KafkaAccess>, Resource<KafkaAccess>> kafkaAccessClient() {
77-
return KubeResourceManager.getKubeClient().getClient().resources(KafkaAccess.class);
77+
return KubeResourceManager.get().kubeClient().getClient().resources(KafkaAccess.class);
7878
}
7979
}

‎systemtest/src/test/java/io/strimzi/kafka/access/AbstractST.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2424
@SuppressWarnings("ClassDataAbstractionCoupling")
2525
public abstract class AbstractST {
26-
protected final KubeResourceManager resourceManager = KubeResourceManager.getInstance();
26+
protected final KubeResourceManager resourceManager = KubeResourceManager.get();
2727
public final String namespace = "main-namespace";
2828
private final String kafkaCrdUrl = "https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/%s/packaging/install/cluster-operator/040-Crd-kafka.yaml".formatted(TestConstants.STRIMZI_API_VERSION);
2929
private final String kafkaUserCrdUrl = "https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/%s/packaging/install/cluster-operator/044-Crd-kafkauser.yaml".formatted(TestConstants.STRIMZI_API_VERSION);
3030
private final SetupAccessOperator setupAccessOperator = new SetupAccessOperator(namespace);
3131

3232
static {
33-
KubeResourceManager.getInstance().setResourceTypes(
33+
KubeResourceManager.get().setResourceTypes(
3434
new ClusterRoleBindingType(),
3535
new ClusterRoleType(),
3636
new CustomResourceDefinitionType(),
@@ -43,8 +43,8 @@ public abstract class AbstractST {
4343
@BeforeAll
4444
void createResources() {
4545
// apply Kafka and KafkaUser CRDs for the tests
46-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("apply", "-f", kafkaCrdUrl);
47-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("apply", "-f", kafkaUserCrdUrl);
46+
KubeResourceManager.get().kubeCmdClient().inNamespace(namespace).exec("apply", "-f", kafkaCrdUrl);
47+
KubeResourceManager.get().kubeCmdClient().inNamespace(namespace).exec("apply", "-f", kafkaUserCrdUrl);
4848

4949
// install KafkaAccessOperator
5050
setupAccessOperator.install();
@@ -56,7 +56,7 @@ void deleteResources() {
5656
setupAccessOperator.delete();
5757

5858
// delete CRDs
59-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaCrdUrl);
60-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaUserCrdUrl);
59+
KubeResourceManager.get().kubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaCrdUrl);
60+
KubeResourceManager.get().kubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaUserCrdUrl);
6161
}
6262
}

‎systemtest/src/test/java/io/strimzi/kafka/access/KafkaAccessOperatorST.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ void testAccessToSpecifiedListener() {
7474
KafkaUserTemplates.kafkaUser(namespace, scramShaUserName, new KafkaUserScramSha512ClientAuthentication()),
7575
tlsUserSecret
7676
);
77-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
78-
KubeResourceManager.getKubeClient().getClient().resource(tlsUser).updateStatus();
77+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
78+
KubeResourceManager.get().kubeClient().getClient().resource(tlsUser).updateStatus();
7979

8080
resourceManager.createResourceWithWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
8181
.withNewSpec()
@@ -119,8 +119,8 @@ void testAccessToSpecifiedListenerAndWrongUser() {
119119
scramUser,
120120
scramSecret
121121
);
122-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
123-
KubeResourceManager.getKubeClient().getClient().resource(scramUser).updateStatus();
122+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
123+
KubeResourceManager.get().kubeClient().getClient().resource(scramUser).updateStatus();
124124

125125
resourceManager.createResourceWithoutWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
126126
.withNewSpec()
@@ -158,7 +158,7 @@ void testAccessToUnspecifiedSingleListener() {
158158
Kafka kafka = KafkaTemplates.kafkaWithListeners(namespace, testStorage.getKafkaClusterName(), defaultHost, listeners).build();
159159

160160
resourceManager.createResourceWithWait(kafka);
161-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
161+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
162162

163163
resourceManager.createResourceWithWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
164164
.withNewSpec()
@@ -193,8 +193,8 @@ void testAccessToUnspecifiedMultipleListeners() {
193193
tlsUser,
194194
tlsUserSecret
195195
);
196-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
197-
KubeResourceManager.getKubeClient().getClient().resource(tlsUser).updateStatus();
196+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
197+
KubeResourceManager.get().kubeClient().getClient().resource(tlsUser).updateStatus();
198198

199199
resourceManager.createResourceWithWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
200200
.withNewSpec()
@@ -237,8 +237,8 @@ void testAccessToUnspecifiedMultipleListenersWithSingleInternal() {
237237
tlsUser,
238238
tlsUserSecret
239239
);
240-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
241-
KubeResourceManager.getKubeClient().getClient().resource(tlsUser).updateStatus();
240+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
241+
KubeResourceManager.get().kubeClient().getClient().resource(tlsUser).updateStatus();
242242

243243
resourceManager.createResourceWithWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
244244
.withNewSpec()
@@ -289,8 +289,8 @@ void testAccessToUnspecifiedMultipleListenersWithMultipleInternal() {
289289
tlsUser,
290290
tlsUserSecret
291291
);
292-
KubeResourceManager.getKubeClient().getClient().resource(kafka).updateStatus();
293-
KubeResourceManager.getKubeClient().getClient().resource(tlsUser).updateStatus();
292+
KubeResourceManager.get().kubeClient().getClient().resource(kafka).updateStatus();
293+
KubeResourceManager.get().kubeClient().getClient().resource(tlsUser).updateStatus();
294294

295295
resourceManager.createResourceWithWait(KafkaAccessTemplates.kafkaAccess(namespace, testStorage.getKafkaAccessName())
296296
.withNewSpec()
@@ -325,7 +325,7 @@ private void assertListenerAndUserValuesInAccessSecret(
325325
SecurityProtocol expectedSecurityProtocol,
326326
Map<String, String> userData
327327
) {
328-
Secret accessSecret = KubeResourceManager.getKubeClient().getClient().secrets().inNamespace(namespace).withName(accessName).get();
328+
Secret accessSecret = KubeResourceManager.get().kubeClient().getClient().secrets().inNamespace(namespace).withName(accessName).get();
329329
Map<String, String> data = accessSecret.getData();
330330

331331
assertThat(Base64Utils.decodeFromBase64ToString(data.get(TestConstants.BOOTSTRAP_SERVERS)), is(expectedBootstrap));

0 commit comments

Comments
 (0)