diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2019-10-02 12:57:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 12:57:45 +0200 |
| commit | 01c62ce9ecf975a86aac056b01b6c99d7f1f1b67 (patch) | |
| tree | c5cd95c66dcdf33697e8f4dce6dfe50f865119c6 /athenz-identity-provider-service/src/test/java/com/yahoo | |
| parent | 131eceb70230554ce9225dbfeb0af57bca80c083 (diff) | |
Revert "Read secret names from config"
Diffstat (limited to 'athenz-identity-provider-service/src/test/java/com/yahoo')
2 files changed, 5 insertions, 12 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 8e4605499f7..a1d708a1107 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.ca.cert", caCertificatePem) - .setSecret("secretname", privateKeyPem); + secretStore().setSecret("vespa.external.main.configserver.ca.cert.cert", caCertificatePem) + .setSecret("vespa.external.main.configserver.ca.key.key", 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 139314b0f86..2ca45cf7e56 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,16 +56,9 @@ public class ContainerTester { return "<container version='1.0'>\n" + " <config name=\"container.handler.threadpool\">\n" + " <maxthreads>10</maxthreads>\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" + + " </config> \n" + + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>\n" + + " <component id='com.yahoo.config.provision.Zone'/>\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" + |