Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@wind57
wind57 committed Nov 25, 2024
1 parent 9947014 commit b98af3f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions ...rk/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void namedSingleConfigMapFails() {

stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);

CoreV1Api api = new CoreV1Api();
Expand Down Expand Up @@ -157,7 +157,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
Map.of(), null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
RetryProperties.DEFAULT);

Expand Down Expand Up @@ -203,7 +203,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
Map.of(), null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
RetryProperties.DEFAULT);

Expand Down Expand Up @@ -248,7 +248,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
ConfigMapConfigProperties.Source configMapSource = new ConfigMapConfigProperties.Source(null, namespace, labels,
null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);

CoreV1Api api = new CoreV1Api();
Expand Down Expand Up @@ -300,7 +300,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
configMapTwoLabels, null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
false, RetryProperties.DEFAULT);

Expand Down Expand Up @@ -355,7 +355,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
configMapTwoLabels, null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
false, RetryProperties.DEFAULT);

Expand Down
12 changes: 6 additions & 6 deletions ...gframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void namedSingleConfigMapFails() {

mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -113,7 +113,7 @@ void namedTwoConfigMapsOneFails() {
Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
RetryProperties.DEFAULT);

Expand Down Expand Up @@ -148,7 +148,7 @@ void namedTwoConfigMapsBothFail() {
Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
RetryProperties.DEFAULT);

Expand Down Expand Up @@ -181,7 +181,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {

Source configMapSource = new Source(null, namespace, labels, null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -226,7 +226,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
false, RetryProperties.DEFAULT);

Expand Down Expand Up @@ -266,7 +266,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);

ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
false, RetryProperties.DEFAULT);

Expand Down
12 changes: 6 additions & 6 deletions ...ringframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void namedSingleSecretFails(CapturedOutput output) {

mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -112,7 +112,7 @@ void namedTwoSecretsOneFails() {
Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -146,7 +146,7 @@ void namedTwoSecretsBothFail() {
Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -178,7 +178,7 @@ void labeledSingleSecretFails(CapturedOutput output) {

Source secretSource = new Source(null, namespace, labels, null, null, null);

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels, List.of(),
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels,
List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -224,7 +224,7 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down Expand Up @@ -264,7 +264,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);

SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
true, false, RetryProperties.DEFAULT);

Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
Expand Down

0 comments on commit b98af3f

Please sign in to comment.