diff options
Diffstat (limited to 'athenz-identity-provider-service/src/test/java/com')
2 files changed, 29 insertions, 24 deletions
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 8b4c06c2867..d7b061ca2f1 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 @@ -14,8 +14,10 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.athenz.identityprovider.api.bindings.ProviderUniqueId; -import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument; +import com.yahoo.vespa.athenz.identityprovider.api.EntityBindingsMapper; +import com.yahoo.vespa.athenz.identityprovider.api.SignedIdentityDocument; +import com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocumentEntity; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.AutoGeneratedKeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.instanceconfirmation.InstanceValidator; @@ -82,24 +84,26 @@ public class IdentityDocumentGeneratorTest { SignedIdentityDocument signedIdentityDocument = identityDocumentGenerator.generateSignedIdentityDocument(containerHostname); // Verify attributes - assertEquals(containerHostname, signedIdentityDocument.identityDocument.instanceHostname); + assertEquals(containerHostname, signedIdentityDocument.identityDocument().instanceHostname()); String environment = "dev"; String region = "us-north-1"; String expectedZoneDnsSuffix = environment + "-" + region + "." + dnsSuffix; - assertEquals(expectedZoneDnsSuffix, signedIdentityDocument.dnsSuffix); + assertEquals(expectedZoneDnsSuffix, signedIdentityDocument.dnsSuffix()); - ProviderUniqueId expectedProviderUniqueId = - new ProviderUniqueId("tenant", "application", environment, region, "default", "default", 0); - assertEquals(expectedProviderUniqueId, signedIdentityDocument.identityDocument.providerUniqueId); + VespaUniqueInstanceId expectedProviderUniqueId = + new VespaUniqueInstanceId(0, "default", "default", "application", "tenant", region, environment); + assertEquals(expectedProviderUniqueId, signedIdentityDocument.providerUniqueId()); // Validate that both parent and container ips are present - assertThat(signedIdentityDocument.identityDocument.ipAddresses, Matchers.containsInAnyOrder("127.0.0.1", "::1")); + assertThat(signedIdentityDocument.identityDocument().ipAddresses(), Matchers.containsInAnyOrder("127.0.0.1", "::1")); + + SignedIdentityDocumentEntity signedIdentityDocumentEntity = EntityBindingsMapper.toSignedIdentityDocumentEntity(signedIdentityDocument); // Validate signature assertTrue("Message", InstanceValidator.isSignatureValid(keyProvider.getPublicKey(0), - signedIdentityDocument.rawIdentityDocument, - signedIdentityDocument.signature)); + signedIdentityDocumentEntity.rawIdentityDocument, + signedIdentityDocument.signature())); } } diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java index 1400dd3e338..54786c86cd3 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java @@ -10,9 +10,10 @@ import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.config.model.api.SuperModel; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.vespa.athenz.identityprovider.api.bindings.IdentityDocument; -import com.yahoo.vespa.athenz.identityprovider.api.bindings.ProviderUniqueId; -import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocument; +import com.yahoo.vespa.athenz.identityprovider.api.EntityBindingsMapper; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.IdentityDocumentEntity; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.SignedIdentityDocumentEntity; +import com.yahoo.vespa.athenz.identityprovider.api.bindings.VespaUniqueInstanceIdEntity; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.AutoGeneratedKeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils; @@ -117,9 +118,9 @@ public class InstanceValidatorTest { private static InstanceConfirmation createInstanceConfirmation(PrivateKey privateKey, ApplicationId applicationId, String domain, String service) { - IdentityDocument identityDocument = new IdentityDocument( - new ProviderUniqueId(applicationId.tenant().value(), applicationId.application().value(), - "environment", "region", applicationId.instance().value(), "cluster-id", 0), + IdentityDocumentEntity identityDocument = new IdentityDocumentEntity( + new VespaUniqueInstanceIdEntity(applicationId.tenant().value(), applicationId.application().value(), + "environment", "region", applicationId.instance().value(), "cluster-id", 0), "hostname", "instance-hostname", Instant.now(), @@ -135,14 +136,14 @@ public class InstanceValidatorTest { return new InstanceConfirmation( "provider", domain, service, - new SignedIdentityDocument(encodedIdentityDocument, - Base64.getEncoder().encodeToString(sigGenerator.sign()), - 0, - identityDocument.providerUniqueId.toVespaUniqueInstanceId().asDottedString(), - "dnssuffix", - "service", - URI.create("http://localhost/zts"), - 1)); + new SignedIdentityDocumentEntity(encodedIdentityDocument, + Base64.getEncoder().encodeToString(sigGenerator.sign()), + 0, + EntityBindingsMapper.toVespaUniqueInstanceId(identityDocument.providerUniqueId).asDottedString(), + "dnssuffix", + "service", + URI.create("http://localhost/zts"), + 1)); } catch (Exception e) { throw new RuntimeException(e); } |