Skip to content

Commit 6650758

Browse files
tinaselengetinaselenge
committed
Fix unit tests that failed due to rebasing the main branch
Signed-off-by: Gantigmaa Selenge <[email protected]>
1 parent fac2975 commit 6650758

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaCluster.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ private List<VolumeMount> getVolumeMounts(Storage storage, ContainerTemplate con
14711471
volumeMountList.add(VolumeUtils.createVolumeMount(INIT_VOLUME_NAME, INIT_VOLUME_MOUNT));
14721472
}
14731473

1474+
boolean oauthVolumeMountAdded = false;
14741475
// Listener specific volumes related to their specific authentication or encryption settings
14751476
for (GenericKafkaListener listener : listeners) {
14761477
String identifier = ListenersUtils.identifier(listener);
@@ -1481,9 +1482,11 @@ private List<VolumeMount> getVolumeMounts(Storage storage, ContainerTemplate con
14811482
volumeMountList.add(VolumeUtils.createVolumeMount("custom-" + identifier + "-certs", "/opt/kafka/certificates/custom-" + identifier + "-certs"));
14821483
}
14831484

1484-
if (ListenersUtils.isListenerWithOAuth(listener) && listener.getAuth() instanceof KafkaListenerAuthenticationOAuth oauth && oauth.getTlsTrustedCertificates() != null) {
1485+
if (!oauthVolumeMountAdded && ListenersUtils.isListenerWithOAuth(listener) && listener.getAuth() instanceof KafkaListenerAuthenticationOAuth oauth && oauth.getTlsTrustedCertificates() != null) {
14851486
String oauthTrustedCertsSecret = KafkaResources.internalOauthTrustedCertsSecretName(cluster);
14861487
volumeMountList.add(VolumeUtils.createVolumeMount(oauthTrustedCertsSecret, TRUSTED_CERTS_BASE_VOLUME_MOUNT + "/" + oauthTrustedCertsSecret));
1488+
// the internal oauth trusted secret does not need to be volume mounted for each listener, as it contains all the trusted certificates
1489+
oauthVolumeMountAdded = true;
14871490
}
14881491

14891492
if (ListenersUtils.isListenerWithCustomAuth(listener)) {

‎cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaBrokerConfigurationBuilderTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ public void testNullUserConfiguration() {
486486
.build();
487487

488488
assertThat(configuration, isEquivalent("node.id=2",
489-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
489+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
490490
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
491491
"config.providers.strimzienv.param.allowlist.pattern=.*",
492492
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -503,7 +503,7 @@ public void testNullUserConfigurationAndCCReporter() {
503503
.build();
504504

505505
assertThat(configuration, isEquivalent("node.id=2",
506-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
506+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
507507
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
508508
"config.providers.strimzienv.param.allowlist.pattern=.*",
509509
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -524,7 +524,7 @@ public void testEmptyUserConfiguration() {
524524
.build();
525525

526526
assertThat(configuration, isEquivalent("node.id=2",
527-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
527+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
528528
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
529529
"config.providers.strimzienv.param.allowlist.pattern=.*",
530530
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -549,7 +549,7 @@ public void testUserConfiguration() {
549549
.build();
550550

551551
assertThat(configuration, isEquivalent("node.id=2",
552-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
552+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
553553
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
554554
"config.providers.strimzienv.param.allowlist.pattern=.*",
555555
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -577,7 +577,7 @@ public void testUserConfigurationWithConfigProviders() {
577577
.build();
578578

579579
assertThat(configuration, isEquivalent("node.id=2",
580-
"config.providers=env,strimzienv,strimzifile,strimzidir,strimzisecrets",
580+
"config.providers=env,strimzienv,strimzisecrets,strimzifile,strimzidir",
581581
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
582582
"config.providers.strimzienv.param.allowlist.pattern=.*",
583583
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -623,7 +623,7 @@ public void testNullUserConfigurationWithJmxMetricsReporter() {
623623
.build();
624624

625625
assertThat(configuration, isEquivalent("node.id=2",
626-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
626+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
627627
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
628628
"config.providers.strimzienv.param.allowlist.pattern=.*",
629629
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -640,7 +640,7 @@ public void testNullUserConfigurationWithStrimziMetricsReporter() {
640640
.withUserConfiguration(null, false, false, true)
641641
.build();
642642
assertThat(configuration, isEquivalent("node.id=2",
643-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
643+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
644644
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
645645
"config.providers.strimzienv.param.allowlist.pattern=.*",
646646
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -660,7 +660,7 @@ public void testNullUserConfigurationWithCruiseControlAndStrimziMetricsReporters
660660
.build();
661661

662662
assertThat(configuration, isEquivalent("node.id=2",
663-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
663+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
664664
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
665665
"config.providers.strimzienv.param.allowlist.pattern=.*",
666666
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -680,7 +680,7 @@ public void testNullUserConfigurationWithCruiseControlAndJmxAndStrimziMetricsRep
680680
.build();
681681

682682
assertThat(configuration, isEquivalent("node.id=2",
683-
"config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets",
683+
"config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir",
684684
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
685685
"config.providers.strimzienv.param.allowlist.pattern=.*",
686686
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
@@ -705,7 +705,7 @@ static Stream<Arguments> userConfigurationWithMetricsReporters() {
705705
KafkaConfiguration userConfig = new KafkaConfiguration(Reconciliation.DUMMY_RECONCILIATION, configMap.entrySet());
706706

707707
String expectedConfig = "node.id=2\n"
708-
+ "config.providers=strimzienv,strimzifile,strimzidir,strimzisecrets\n"
708+
+ "config.providers=strimzienv,strimzisecrets,strimzifile,strimzidir\n"
709709
+ "config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider\n"
710710
+ "config.providers.strimzienv.param.allowlist.pattern=.*\n"
711711
+ "config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider\n"

0 commit comments

Comments
 (0)