diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-14 07:34:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 07:34:24 +0100 |
commit | 091367f1ecf37c23278bbde772128c60f8e08749 (patch) | |
tree | 8bf1f68cb4d654914a2092147f60e3d4d622f62b /security-utils/src/main | |
parent | 98869035893b99654614d6ff76189e3dbbb52482 (diff) |
Revert "Bjorncs/capabilities"
Diffstat (limited to 'security-utils/src/main')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/Capability.java | 4 | ||||
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java | 38 |
2 files changed, 14 insertions, 28 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 8cb98a0dd59..a11b6d5f96a 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 @@ -29,8 +29,6 @@ public enum Capability implements ToCapabilitySet { LOGSERVER_API("vespa.logserver.api"), METRICSPROXY__MANAGEMENT_API("vespa.metricsproxy.management_api"), METRICSPROXY__METRICS_API("vespa.metricsproxy.metrics_api"), - SENTINEL__CONNECTIVITY_CHECK("vespa.sentinel.connectivity_check"), - SENTINEL__MANAGEMENT_API("vespa.sentinel.management_api"), SLOBROK__API("vespa.slobrok.api"), ; @@ -40,7 +38,7 @@ public enum Capability implements ToCapabilitySet { public String asString() { return name; } - @Override public CapabilitySet toCapabilitySet() { return CapabilitySet.of(this); } + @Override public CapabilitySet toCapabilitySet() { return CapabilitySet.from(this); } public static Capability fromName(String name) { return Arrays.stream(values()) 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 cc5bdbeafd3..70217665241 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 @@ -21,36 +21,24 @@ public class CapabilitySet implements ToCapabilitySet { private static final Map<String, CapabilitySet> PREDEFINED = new HashMap<>(); - private static final CapabilitySet SHARED_CAPABILITIES_APP_NODE = CapabilitySet.of( - Capability.LOGSERVER_API, Capability.CONFIGSERVER__CONFIG_API, - Capability.CONFIGSERVER__FILEDISTRIBUTION_API, Capability.CONFIGPROXY__CONFIG_API, - Capability.CONFIGPROXY__FILEDISTRIBUTION_API, Capability.SENTINEL__CONNECTIVITY_CHECK); - /* Predefined capability sets */ - public static final CapabilitySet ALL = predefined( - "vespa.all", Capability.values()); - public static final CapabilitySet TELEMETRY = predefined( - "vespa.telemetry", - Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__METRICS_API); public static final CapabilitySet CONTENT_NODE = predefined( "vespa.content_node", - Capability.CONTENT__STORAGE_API, Capability.CONTENT__DOCUMENT_API, Capability.CONTAINER__DOCUMENT_API, - SHARED_CAPABILITIES_APP_NODE); + Capability.CONTENT__STORAGE_API, Capability.CONTENT__DOCUMENT_API, Capability.SLOBROK__API); public static final CapabilitySet CONTAINER_NODE = predefined( "vespa.container_node", - Capability.CONTENT__DOCUMENT_API, Capability.CONTENT__SEARCH_API, SHARED_CAPABILITIES_APP_NODE); + Capability.CONTENT__DOCUMENT_API, Capability.CONTENT__SEARCH_API, Capability.SLOBROK__API); + public static final CapabilitySet TELEMETRY = predefined( + "vespa.telemetry", + Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__METRICS_API); public static final CapabilitySet CLUSTER_CONTROLLER_NODE = predefined( "vespa.cluster_controller_node", - Capability.CONTENT__CLUSTER_CONTROLLER__INTERNAL_STATE_API, Capability.SLOBROK__API, - Capability.CLIENT__SLOBROK_API, Capability.CONTAINER__DOCUMENT_API, SHARED_CAPABILITIES_APP_NODE); - public static final CapabilitySet LOGSERVER_NODE = predefined( - "vespa.logserver_node", SHARED_CAPABILITIES_APP_NODE); - public static final CapabilitySet CONFIGSERVER_NODE = predefined( - "vespa.config_server_node", - Capability.CLIENT__FILERECEIVER_API, Capability.CONTAINER__MANAGEMENT_API, TELEMETRY); + Capability.CONTENT__CLUSTER_CONTROLLER__INTERNAL_STATE_API, Capability.SLOBROK__API); + public static final CapabilitySet CONFIG_SERVER = predefined( + "vespa.config_server"); private static CapabilitySet predefined(String name, ToCapabilitySet... capabilities) { - var instance = CapabilitySet.of(capabilities); + var instance = CapabilitySet.from(capabilities); PREDEFINED.put(name, instance); return instance; } @@ -80,13 +68,13 @@ public class CapabilitySet implements ToCapabilitySet { return new CapabilitySet(union); } - public static CapabilitySet of(ToCapabilitySet... capabilities) { + public static CapabilitySet from(ToCapabilitySet... capabilities) { return CapabilitySet.unionOf(Arrays.stream(capabilities).map(ToCapabilitySet::toCapabilitySet).toList()); } - public static CapabilitySet of(EnumSet<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } - public static CapabilitySet of(Collection<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } - public static CapabilitySet of(Capability... caps) { return new CapabilitySet(EnumSet.copyOf(List.of(caps))); } + public static CapabilitySet from(EnumSet<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } + public static CapabilitySet from(Collection<Capability> caps) { return new CapabilitySet(EnumSet.copyOf(caps)); } + public static CapabilitySet from(Capability... caps) { return new CapabilitySet(EnumSet.copyOf(List.of(caps))); } public static CapabilitySet all() { return ALL_CAPABILITIES; } public static CapabilitySet none() { return NO_CAPABILITIES; } |