Skip to content

Commit 4acb2c7

Browse files
im-kongeim-konge
authored
Update dependencies - Test-Frame, Log4j, Slf4j, helm-client (#67)
Signed-off-by: Lukas Kral <[email protected]>
1 parent 9c8e87b commit 4acb2c7

File tree

4 files changed

+53
-40
lines changed

4 files changed

+53
-40
lines changed

‎pom.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,21 @@
119119
<strimzi.version>0.43.0</strimzi.version>
120120
<kafka.clients.version>3.8.0</kafka.clients.version>
121121
<javax-validation.version>2.0.1.Final</javax-validation.version>
122+
123+
<!-- Used for the operator because of the Java OperatorSDK -->
122124
<slf4j.version>1.7.36</slf4j.version>
123-
<log4j.version>2.17.2</log4j.version>
125+
<!-- Used for test-frame and the systemtests-->
126+
<slf4j2.version>2.0.16</slf4j2.version>
127+
<log4j.version>2.24.1</log4j.version>
124128
<jetty.version>11.0.24</jetty.version>
125129
<jetty.jakarta-servlet-api.version>5.0.2</jetty.jakarta-servlet-api.version>
126130

127131
<!-- Test dependencies -->
128132
<junit-jupiter.version>5.8.2</junit-jupiter.version>
129133
<assertj.version>3.21.0</assertj.version>
130134
<mockito.version>4.11.0</mockito.version>
131-
<test-frame.version>0.1.1</test-frame.version>
132-
<helm-client.version>0.0.8</helm-client.version>
135+
<test-frame.version>0.8.0</test-frame.version>
136+
<helm-client.version>0.0.13</helm-client.version>
133137
<hamcrest.version>2.2</hamcrest.version>
134138

135139
<javadoc.fail.on.warnings>true</javadoc.fail.on.warnings>

‎systemtest/pom.xml

+27-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,15 @@
4444
</exclusion>
4545
</exclusions>
4646
</dependency>
47+
<dependency>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-api</artifactId>
50+
<version>${slf4j2.version}</version>
51+
</dependency>
4752
<dependency>
4853
<groupId>org.apache.logging.log4j</groupId>
49-
<artifactId>log4j-slf4j-impl</artifactId>
54+
<artifactId>log4j-slf4j2-impl</artifactId>
55+
<version>${log4j.version}</version>
5056
</dependency>
5157
<!-- Test dependencies -->
5258
<dependency>
@@ -94,6 +100,26 @@
94100

95101
<build>
96102
<plugins>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-dependency-plugin</artifactId>
106+
<version>${maven.dependency.version}</version>
107+
<executions>
108+
<execution>
109+
<id>analyze</id>
110+
<goals>
111+
<goal>analyze-only</goal>
112+
</goals>
113+
<configuration>
114+
<failOnWarning>true</failOnWarning>
115+
<ignoredUnusedDeclaredDependencies>
116+
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency>
117+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
118+
</ignoredUnusedDeclaredDependencies>
119+
</configuration>
120+
</execution>
121+
</executions>
122+
</plugin>
97123
<plugin>
98124
<groupId>org.apache.maven.plugins</groupId>
99125
<artifactId>maven-failsafe-plugin</artifactId>

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

+15-32
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
88
import io.fabric8.kubernetes.client.dsl.MixedOperation;
99
import io.fabric8.kubernetes.client.dsl.Resource;
10-
import io.skodjob.testframe.interfaces.NamespacedResourceType;
10+
import io.skodjob.testframe.interfaces.ResourceType;
1111
import io.skodjob.testframe.resources.KubeResourceManager;
12+
import io.strimzi.api.kafka.model.common.Condition;
1213
import io.strimzi.kafka.access.model.KafkaAccess;
13-
import io.strimzi.kafka.access.utils.KafkaAccessUtils;
14+
import io.strimzi.kafka.access.model.KafkaAccessStatus;
1415

16+
import java.util.Optional;
1517
import java.util.function.Consumer;
1618

17-
public class KafkaAccessType implements NamespacedResourceType<KafkaAccess> {
19+
public class KafkaAccessType implements ResourceType<KafkaAccess> {
1820

1921
private final MixedOperation<KafkaAccess, KubernetesResourceList<KafkaAccess>, Resource<KafkaAccess>> client;
2022

@@ -47,47 +49,28 @@ public void update(KafkaAccess kafkaAccess) {
4749
}
4850

4951
@Override
50-
public void delete(String resourceName) {
51-
client.withName(resourceName).delete();
52+
public void delete(KafkaAccess kafkaAccess) {
53+
client.resource(kafkaAccess).delete();
5254
}
5355

5456
@Override
55-
public void replace(String resourceName, Consumer<KafkaAccess> editor) {
56-
KafkaAccess toBeReplaced = client.withName(resourceName).get();
57+
public void replace(KafkaAccess kafkaAccess, Consumer<KafkaAccess> editor) {
58+
KafkaAccess toBeReplaced = client.inNamespace(kafkaAccess.getMetadata().getNamespace()).withName(kafkaAccess.getMetadata().getName()).get();
5759
editor.accept(toBeReplaced);
5860
update(toBeReplaced);
5961
}
6062

6163
@Override
62-
public boolean waitForReadiness(KafkaAccess kafkaAccess) {
63-
return KafkaAccessUtils.waitForKafkaAccessReady(kafkaAccess.getMetadata().getNamespace(), kafkaAccess.getMetadata().getName());
64-
}
65-
66-
@Override
67-
public boolean waitForDeletion(KafkaAccess kafkaAccess) {
68-
return kafkaAccess == null;
69-
}
70-
71-
@Override
72-
public void createInNamespace(String namespaceName, KafkaAccess kafkaAccess) {
73-
client.inNamespace(namespaceName).resource(kafkaAccess).create();
74-
}
64+
public boolean isReady(KafkaAccess kafkaAccess) {
65+
KafkaAccessStatus kafkaAccessStatus = client.resource(kafkaAccess).get().getStatus();
66+
Optional<Condition> readyCondition = kafkaAccessStatus.getConditions().stream().filter(condition -> condition.getType().equals("Ready")).findFirst();
7567

76-
@Override
77-
public void updateInNamespace(String namespaceName, KafkaAccess kafkaAccess) {
78-
client.inNamespace(namespaceName).resource(kafkaAccess).update();
68+
return readyCondition.map(condition -> condition.getStatus().equals("True")).orElse(false);
7969
}
8070

8171
@Override
82-
public void deleteFromNamespace(String namespaceName, String resourceName) {
83-
client.inNamespace(namespaceName).withName(resourceName).delete();
84-
}
85-
86-
@Override
87-
public void replaceInNamespace(String namespaceName, String resourceName, Consumer<KafkaAccess> editor) {
88-
KafkaAccess toBeReplaced = client.inNamespace(namespaceName).withName(resourceName).get();
89-
editor.accept(toBeReplaced);
90-
updateInNamespace(namespaceName, toBeReplaced);
72+
public boolean isDeleted(KafkaAccess kafkaAccess) {
73+
return kafkaAccess == null;
9174
}
9275

9376
public static MixedOperation<KafkaAccess, KubernetesResourceList<KafkaAccess>, Resource<KafkaAccess>> kafkaAccessClient() {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -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).execInCurrentNamespace("apply", "-f", kafkaCrdUrl);
47-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).execInCurrentNamespace("apply", "-f", kafkaUserCrdUrl);
46+
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("apply", "-f", kafkaCrdUrl);
47+
KubeResourceManager.getKubeCmdClient().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).execInCurrentNamespace("delete", "-f", kafkaCrdUrl);
60-
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).execInCurrentNamespace("delete", "-f", kafkaUserCrdUrl);
59+
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaCrdUrl);
60+
KubeResourceManager.getKubeCmdClient().inNamespace(namespace).exec("delete", "-f", kafkaUserCrdUrl);
6161
}
6262
}

0 commit comments

Comments
 (0)