summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2017-09-04 18:41:06 +0200
committerGitHub <noreply@github.com>2017-09-04 18:41:06 +0200
commitfc5179098af3d6600fc3d2aef103486f7813c9b4 (patch)
treecc202bb4eeb18b1fa55c215dfc44398da27d1770
parent6772aa4a8737d9bc1dd2f57f52a7103324dbfa90 (diff)
parenteb1927ad7ddb3b84891e8c0c664d779fc6f69d41 (diff)
Merge pull request #3320 from vespa-engine/bjorncs/versioned-secrets
Support KeyService impls with versioned secrets
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/security/KeyService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/security/KeyService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/security/KeyService.java
index 98c664eb07d..61cd738314a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/security/KeyService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/security/KeyService.java
@@ -5,9 +5,14 @@ package com.yahoo.vespa.hosted.controller.api.integration.security;
* A service for retrieving secrets, such as API keys, private keys and passwords.
*
* @author mpolden
+ * @author bjorncs
*/
public interface KeyService {
String getSecret(String key);
+ default String getSecret(String key, int version) {
+ throw new UnsupportedOperationException("KeyService implementation does not support versioned secrets");
+ }
+
}