Skip to content
Snippets Groups Projects
Commit ca219b19 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4453 get from data instead of string data

parent c0568ab1
Branches
Tags
No related merge requests found
...@@ -48,7 +48,7 @@ public class OzgCloudElasticsearchSecretHelper { ...@@ -48,7 +48,7 @@ public class OzgCloudElasticsearchSecretHelper {
return new SecretBuilder() return new SecretBuilder()
.withType(SECRET_TYPE) .withType(SECRET_TYPE)
.withMetadata(createMetaData(properties.getCertificateSecretName(), namespace)) .withMetadata(createMetaData(properties.getCertificateSecretName(), namespace))
.addToStringData(CERTIFICATE_SECRET_DATA_KEY, data) .addToData(CERTIFICATE_SECRET_DATA_KEY, data)
.build(); .build();
} }
......
...@@ -143,7 +143,7 @@ public class OzgCloudElasticsearchService { ...@@ -143,7 +143,7 @@ public class OzgCloudElasticsearchService {
} }
private String getSecretData(Secret secret) { private String getSecretData(Secret secret) {
return MapUtils.getString(secret.getStringData(), properties.getServer().getCertificateSecretDataKey()); return MapUtils.getString(secret.getData(), properties.getServer().getCertificateSecretDataKey());
} }
ResourceAdapter<Secret> createAdapter(Resource<Secret> resource) { ResourceAdapter<Secret> createAdapter(Resource<Secret> resource) {
......
...@@ -165,7 +165,7 @@ class OzgCloudElasticsearchSecretHelperTest { ...@@ -165,7 +165,7 @@ class OzgCloudElasticsearchSecretHelperTest {
void shouldHaveCaCrtData() { void shouldHaveCaCrtData() {
var secret = builder.buildCertificateSecret(NamespaceTestFactory.NAMESPACE, DATA); var secret = builder.buildCertificateSecret(NamespaceTestFactory.NAMESPACE, DATA);
assertThat(secret.getStringData()).containsExactly(Map.entry(OzgCloudElasticsearchSecretHelper.CERTIFICATE_SECRET_DATA_KEY, DATA)); assertThat(secret.getData()).containsExactly(Map.entry(OzgCloudElasticsearchSecretHelper.CERTIFICATE_SECRET_DATA_KEY, DATA));
} }
} }
} }
...@@ -374,7 +374,7 @@ class OzgCloudElasticsearchServiceTest { ...@@ -374,7 +374,7 @@ class OzgCloudElasticsearchServiceTest {
private static final String SERVER_CERTIFICATE_SECRET_DATA = LoremIpsum.getInstance().getWords(1); private static final String SERVER_CERTIFICATE_SECRET_DATA = LoremIpsum.getInstance().getWords(1);
private static final String SERVER_CERTIFICATE_NAMESPACE = LoremIpsum.getInstance().getWords(1); private static final String SERVER_CERTIFICATE_NAMESPACE = LoremIpsum.getInstance().getWords(1);
private static final Secret SERVER_CERTIFICATE_SECRET = SecretTestFactory.createBuilder() private static final Secret SERVER_CERTIFICATE_SECRET = SecretTestFactory.createBuilder()
.addToStringData(SERVER_CERTIFICATE_SECRET_DATA_KEY, SERVER_CERTIFICATE_SECRET_DATA) .addToData(SERVER_CERTIFICATE_SECRET_DATA_KEY, SERVER_CERTIFICATE_SECRET_DATA)
.build(); .build();
private static final Secret CREDENTIAL_SECRET = SecretTestFactory.create(); private static final Secret CREDENTIAL_SECRET = SecretTestFactory.create();
@Mock @Mock
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment