From 30960cf314c258dfec2d47463b31ab907bd41869 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Thu, 3 Feb 2022 15:54:35 +0100 Subject: Revert "Allow developers to deploy application in manual zones" --- .../yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'vespa-athenz') diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java index 84d522ee85d..4be82daee43 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java @@ -6,15 +6,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @author olaa */ @JsonIgnoreProperties(ignoreUnknown = true) public class PolicyEntity { - private static final Pattern namePattern = Pattern.compile("^(?[^:]+):policy\\.(?.*)$"); @JsonInclude(JsonInclude.Include.NON_EMPTY) private final List assertions; @@ -22,17 +19,10 @@ public class PolicyEntity { public PolicyEntity(@JsonProperty("name") String name, @JsonProperty("assertions") List assertions) { - this.name = nameFromResourceString(name); + this.name = name; this.assertions = assertions; } - private static String nameFromResourceString(String resource) { - Matcher matcher = namePattern.matcher(resource); - if (!matcher.matches()) - throw new IllegalArgumentException("Could not find policy name from resource string: " + resource); - return matcher.group("name"); - } - public String getName() { return name; } -- cgit v1.2.3