diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2022-02-03 15:54:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-03 15:54:35 +0100 |
commit | 30960cf314c258dfec2d47463b31ab907bd41869 (patch) | |
tree | 2c1feecd2daf99b7959a16e76fcb008ff231ba3b /vespa-athenz | |
parent | 89d79239582499426478db60dd122d368d2010d9 (diff) |
Revert "Allow developers to deploy application in manual zones"
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/PolicyEntity.java | 12 |
1 files changed, 1 insertions, 11 deletions
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("^(?<domain>[^:]+):policy\\.(?<name>.*)$"); @JsonInclude(JsonInclude.Include.NON_EMPTY) private final List<AssertionEntity> assertions; @@ -22,17 +19,10 @@ public class PolicyEntity { public PolicyEntity(@JsonProperty("name") String name, @JsonProperty("assertions") List<AssertionEntity> 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; } |