diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-04-26 12:58:24 +0200 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-04-26 12:58:24 +0200 |
commit | e10612188741a2d5ce9c69b80c35015b38ea1627 (patch) | |
tree | f7cf8c55e84232b4897f0f102eecc6770b154cd1 /container-disc | |
parent | 01cc25458c74d2902879087919f67622600ffc65 (diff) |
Revert "Merge pull request #26859 from vespa-engine/revert-26805-olaa/versioned-feature-flag"
This reverts commit 01cc25458c74d2902879087919f67622600ffc65, reversing
changes made to a6c5b734b94d0239db9df0d37e390f82d3deabf1.
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(); } |