Send valid resource name

1 files changed, 2 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
index 28cf132af90..a0b70eb88ab 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzFacade.java
@@ -328,7 +328,8 @@ public class AthenzFacade implements AccessControl {
     }
 
     private String applicationResourceString(AthenzDomain tenantDomain, ApplicationName applicationName, Optional<Zone> zone) {
-        String environment = zone.map(Zone::environment).map(Environment::value).orElse("*");
+        // If environment is not provided, add .wildcard to match .* in the policy resource (* is not allowed in the request)
+        String environment = zone.map(Zone::environment).map(Environment::value).orElse("wildcard");
         return resourceStringPrefix(tenantDomain) + "." + "res_group" + "." + applicationName.value() + "." + environment;
     }