diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-23 08:28:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 08:28:06 +0100 |
commit | 2022d585c0feffc6b4eefa06b332d62f49447569 (patch) | |
tree | 3f12b9eaf49038ad837f1d319416c9f66c31dd3b /security-utils | |
parent | 69f149d4f91a2043f1d801afd89596fedacb69a2 (diff) | |
parent | ba76308caeaaae0f64bb74a97a222a01ec0722de (diff) |
Merge pull request #26152 from vespa-engine/revert-26139-vekterli/add-content-state-api-capability
Revert "Add `vespa.content.state_api` capability" MERGEOK
Diffstat (limited to 'security-utils')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/Capability.java | 1 | ||||
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java | 5 |
2 files changed, 2 insertions, 4 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 dce40681b90..6a6471aa8ac 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,7 +30,6 @@ 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 197088ff434..b7cd03b49bb 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,9 +29,8 @@ public class CapabilitySet implements ToCapabilitySet { "vespa.all", Capability.values()); public static final CapabilitySet TELEMETRY = predefined( "vespa.telemetry", - Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__STATE_API, Capability.CONTENT__METRICS_API, - Capability.CONTAINER__STATE_API, Capability.METRICSPROXY__METRICS_API, - Capability.SENTINEL__CONNECTIVITY_CHECK); + Capability.CONTENT__STATUS_PAGES, 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, |