diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-06-30 16:19:42 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-06-30 16:19:42 +0200 |
| commit | 1c2f0abd376d8b871b4a60ce9effa5242f09cd54 (patch) | |
| tree | 34f4c1ddab5eb9cd0ed1f96ba7f5941483ebea9f /vespa-athenz | |
| parent | 84547d49cfbaaeb6c36c70aa9dc904e25c1ce88c (diff) | |
No need for config in IdentityDocumentGenerator
Diffstat (limited to 'vespa-athenz')
2 files changed, 6 insertions, 9 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityDocument.java index c7517ef8adb..00d82177367 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityDocument.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityDocument.java @@ -2,20 +2,17 @@ package com.yahoo.vespa.athenz.identityprovider.api; import com.yahoo.vespa.athenz.api.AthenzIdentity; -import com.yahoo.vespa.athenz.api.AthenzService; import java.time.Instant; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; /** * Represents an unsigned identity document * @author mortent */ -public record IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzService providerService, String configServerHostname, +public record IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzIdentity providerService, String configServerHostname, String instanceHostname, Instant createdAt, Set<String> ipAddresses, IdentityType identityType, ClusterType clusterType, String ztsUrl, AthenzIdentity serviceIdentity, Map<String, Object> unknownAttributes) { @@ -31,7 +28,7 @@ public record IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzSer unknownAttributes = Map.copyOf(nonNull); } - public IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzService providerService, String configServerHostname, + public IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzIdentity providerService, String configServerHostname, String instanceHostname, Instant createdAt, Set<String> ipAddresses, IdentityType identityType, ClusterType clusterType, String ztsUrl, AthenzIdentity serviceIdentity) { @@ -39,7 +36,7 @@ public record IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzSer } - public IdentityDocument withServiceIdentity(AthenzService athenzService) { + public IdentityDocument withServiceIdentity(AthenzIdentity serviceIdentity) { return new IdentityDocument( this.providerUniqueId, this.providerService, @@ -50,7 +47,7 @@ public record IdentityDocument(VespaUniqueInstanceId providerUniqueId, AthenzSer this.identityType, this.clusterType, this.ztsUrl, - athenzService, + serviceIdentity, this.unknownAttributes); } } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSigner.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSigner.java index 11b30585933..4a9e1814c82 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSigner.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/IdentityDocumentSigner.java @@ -51,7 +51,7 @@ public class IdentityDocumentSigner { // Cluster type is ignored due to old Vespa versions not forwarding unknown fields in signed identity document private String generateSignature(VespaUniqueInstanceId providerUniqueId, - AthenzService providerService, + AthenzIdentity providerService, String configServerHostname, String instanceHostname, Instant createdAt, @@ -109,7 +109,7 @@ public class IdentityDocumentSigner { private static void writeToSigner(Signature signer, VespaUniqueInstanceId providerUniqueId, - AthenzService providerService, + AthenzIdentity providerService, String configServerHostname, String instanceHostname, Instant createdAt, |