diff options
Diffstat (limited to 'athenz-identity-provider-service/src/test/java/com/yahoo')
2 files changed, 12 insertions, 5 deletions
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiTest.java index a1d708a1107..8e4605499f7 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/CertificateAuthorityApiTest.java @@ -98,8 +98,8 @@ public class CertificateAuthorityApiTest extends ContainerTester { var keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256); var caCertificatePem = X509CertificateUtils.toPem(CertificateTester.createCertificate("Vespa CA", keyPair)); var privateKeyPem = KeyUtils.toPem(keyPair.getPrivate()); - secretStore().setSecret("vespa.external.main.configserver.ca.cert.cert", caCertificatePem) - .setSecret("vespa.external.main.configserver.ca.key.key", privateKeyPem); + secretStore().setSecret("vespa.external.ca.cert", caCertificatePem) + .setSecret("secretname", privateKeyPem); } private void assertIdentityResponse(Request request) { diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/ContainerTester.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/ContainerTester.java index 2ca45cf7e56..139314b0f86 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/ContainerTester.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/ca/restapi/ContainerTester.java @@ -56,9 +56,16 @@ public class ContainerTester { return "<container version='1.0'>\n" + " <config name=\"container.handler.threadpool\">\n" + " <maxthreads>10</maxthreads>\n" + - " </config> \n" + - " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>\n" + - " <component id='com.yahoo.config.provision.Zone'/>\n" + + " </config>\n" + + " <config name='vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service'>\n" + + " <athenzCaTrustStore>/path/to/file</athenzCaTrustStore>\n" + + " <domain>vespa.external</domain>\n" + + " <serviceName>servicename</serviceName>\n" + + " <secretName>secretname</secretName>\n" + + " <secretVersion>0</secretVersion>\n" + + " <certDnsSuffix>suffix</certDnsSuffix>\n" + + " <ztsUrl>https://localhost:123/</ztsUrl>\n" + + " </config>\n" + " <component id='com.yahoo.vespa.hosted.ca.restapi.mock.SecretStoreMock'/>\n" + " <handler id='com.yahoo.vespa.hosted.ca.restapi.CertificateAuthorityApiHandler'>\n" + " <binding>http://*/ca/v1/*</binding>\n" + |