diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-04-25 10:29:13 +0200 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-04-25 10:29:13 +0200 |
commit | 8436d1e3127f6e5d1f131f23ac6d35be3692362f (patch) | |
tree | 15c15ae169bfe674149b67ba42066af6488e07f5 /container-disc | |
parent | 02944bd423dede485eee68d63c2eef0fd81f5144 (diff) |
Consider credentials existence when setting up AthenzIdentityProvider
Diffstat (limited to 'container-disc')
3 files changed, 6 insertions, 2 deletions
diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json index dd681e4124f..75246a77e03 100644 --- a/container-disc/abi-spec.json +++ b/container-disc/abi-spec.json @@ -19,7 +19,8 @@ "public abstract java.util.List getIdentityCertificate()", "public abstract java.security.cert.X509Certificate getRoleCertificate(java.lang.String, java.lang.String)", "public abstract java.security.PrivateKey getPrivateKey()", - "public abstract java.nio.file.Path trustStorePath()" + "public abstract java.nio.file.Path trustStorePath()", + "public abstract void deconstruct()" ], "fields" : [ ] }, diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java index f04e2291ee8..9d2e06ed9da 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java @@ -89,6 +89,9 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr public Path trustStorePath() { throw new UnsupportedOperationException(message); } + + @Override + public void deconstruct() {} } } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index af5133eceac..46803988b20 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -24,5 +24,5 @@ public interface AthenzIdentityProvider { X509Certificate getRoleCertificate(String domain, String role); PrivateKey getPrivateKey(); Path trustStorePath(); - + void deconstruct(); } |