summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-06-10 21:52:06 +0200
committerHarald Musum <musum@verizonmedia.com>2019-06-10 21:52:06 +0200
commit6180f7b865b18ca1a3524d32885ba1a991d934ee (patch)
tree42dc95a2339f0610d5f2a3d165d76ebeefe76d34
parent7b1671726ec97d387f6acbe0b0774756d7cfac2d (diff)
Fix test
-rw-r--r--athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/TestUtils.java7
-rw-r--r--athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java2
2 files changed, 3 insertions, 6 deletions
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/TestUtils.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/TestUtils.java
index de623b7bcf8..4a97ea7b09c 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/TestUtils.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/TestUtils.java
@@ -1,7 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.athenz.instanceproviderservice;
-import com.yahoo.config.provision.Zone;
import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig;
/**
@@ -11,8 +10,7 @@ public class TestUtils {
public static AthenzProviderServiceConfig getAthenzProviderConfig(String domain,
String service,
- String dnsSuffix,
- Zone zone) {
+ String dnsSuffix) {
AthenzProviderServiceConfig.Builder zoneConfig =
new AthenzProviderServiceConfig.Builder()
.serviceName(service)
@@ -22,8 +20,7 @@ public class TestUtils {
.ztsUrl("localhost/zts")
.secretName("s3cr3t");
return new AthenzProviderServiceConfig(
- new AthenzProviderServiceConfig.Builder()
- .athenzCaTrustStore("/dummy/path/to/athenz-ca.jks"));
+ zoneConfig.athenzCaTrustStore("/dummy/path/to/athenz-ca.jks"));
}
}
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
index 0688981a1c7..f496b177bdd 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java
@@ -78,7 +78,7 @@ public class IdentityDocumentGeneratorTest {
AutoGeneratedKeyProvider keyProvider = new AutoGeneratedKeyProvider();
String dnsSuffix = "vespa.dns.suffix";
- AthenzProviderServiceConfig config = getAthenzProviderConfig("domain", "service", dnsSuffix, ZONE);
+ AthenzProviderServiceConfig config = getAthenzProviderConfig("domain", "service", dnsSuffix);
IdentityDocumentGenerator identityDocumentGenerator =
new IdentityDocumentGenerator(config, nodeRepository, ZONE, keyProvider);
SignedIdentityDocument signedIdentityDocument = identityDocumentGenerator.generateSignedIdentityDocument(containerHostname, IdentityType.TENANT);