summaryrefslogtreecommitdiffstats
path: root/security-utils
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2023-02-24 10:21:26 +0100
committerGitHub <noreply@github.com>2023-02-24 10:21:26 +0100
commitcdde57098b5806f0bf4c3d50d53e1b19465071d8 (patch)
tree33ad9386d95115bb9fa3b38c32d5b050644738cf /security-utils
parentea34220e4bc8a9d9bc598cab098e2af893688e4a (diff)
parentce7d2de24f09d1d1773a8969619fb6ec52abe140 (diff)
Merge pull request #26168 from vespa-engine/revert-26152-revert-26139-vekterli/add-content-state-api-capability
Reapply: add `vespa.content.state_api` capability"
Diffstat (limited to 'security-utils')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/Capability.java1
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java5
2 files changed, 4 insertions, 2 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
index 6a6471aa8ac..dce40681b90 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
@@ -30,6 +30,7 @@ public enum Capability implements ToCapabilitySet {
CONTENT__METRICS_API("vespa.content.metrics_api"),
CONTENT__PROTON_ADMIN_API("vespa.content.proton_admin_api"),
CONTENT__SEARCH_API("vespa.content.search_api"),
+ CONTENT__STATE_API("vespa.content.state_api"),
CONTENT__STATUS_PAGES("vespa.content.status_pages"),
CONTENT__STORAGE_API("vespa.content.storage_api"),
LOGSERVER_API("vespa.logserver.api"),
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java
index b7cd03b49bb..197088ff434 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java
@@ -29,8 +29,9 @@ public class CapabilitySet implements ToCapabilitySet {
"vespa.all", Capability.values());
public static final CapabilitySet TELEMETRY = predefined(
"vespa.telemetry",
- Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__METRICS_API, Capability.CONTAINER__STATE_API,
- Capability.METRICSPROXY__METRICS_API, Capability.SENTINEL__CONNECTIVITY_CHECK);
+ Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__STATE_API, Capability.CONTENT__METRICS_API,
+ Capability.CONTAINER__STATE_API, Capability.METRICSPROXY__METRICS_API,
+ Capability.SENTINEL__CONNECTIVITY_CHECK);
private static final CapabilitySet SHARED_CAPABILITIES_APP_NODE = CapabilitySet.unionOf(List.of(
Capability.LOGSERVER_API, Capability.CONFIGSERVER__CONFIG_API,