diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2022-02-04 13:31:11 +0100 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2022-02-04 13:31:11 +0100 |
commit | a8055cddcf5c9bdbbf038dfd50b1e77d2328ee86 (patch) | |
tree | 8833f7d9dc66f0a7ec5228ac7cba1713ece4074e /controller-server | |
parent | 79fc46bf80ef3538ec46587e21089cbda288f875 (diff) |
Fix path match regex
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java index 7ab3b75a758..80fa7a36afe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java @@ -99,9 +99,9 @@ public class AthenzRoleFilter extends JsonSecurityRequestFilterBase { Optional<ApplicationName> application = Optional.ofNullable(path.get("application")).map(ApplicationName::from); final Optional<Zone> zone; - if(path.matches("/application/v4/tenant/{tenant}/application/{application}/{*}/instance/{*}/environment/{environment}/region/{region}/{*}")) { + if(path.matches("/application/v4/tenant/{tenant}/application/{application}/instance/{instance}/environment/{environment}/region/{region}/{*}")) { zone = Optional.of(new Zone(Environment.from(path.get("environment")), RegionName.from(path.get("region")))); - } else if(path.matches("/application/v4/tenant/{tenant}/application/{application}/{*}/environment/{environment}/region/{region}/{*}")) { + } else if(path.matches("/application/v4/tenant/{tenant}/application/{application}/environment/{environment}/region/{region}/{*}")) { zone = Optional.of(new Zone(Environment.from(path.get("environment")), RegionName.from(path.get("region")))); } else { zone = Optional.empty(); |