fix(api): Stop parsing application names in fiat using frigga. (#225)

For APPLICATION resourceType, the caller should pass in the application name as the resourceName instead of fiat trying to parse out the name. This allows applications names with dashes to work properly. spinnaker/spinnaker#2513
spinnaker · May 8, 2018 · 3167d18 · 3167d18
1 parent 109def3
commit 3167d18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java b/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluator.java
@@ -103,11 +103,8 @@ public boolean hasPermission(Authentication authentication,
       a = Authorization.valueOf(authorization.toString());
     }
 
-    if (r == ResourceType.APPLICATION) {
-      val parsedName = Names.parseName(resourceName.toString()).getApp();
-      if (StringUtils.isNotEmpty(parsedName)) {
-        resourceName = parsedName;
-      }
+    if (r == ResourceType.APPLICATION && StringUtils.isNotEmpty(resourceName.toString())) {
+        resourceName = resourceName.toString();
     }
 
     UserPermission.View permission = getPermission(getUsername(authentication));

diff --git a/...-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy b/...-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy
@@ -73,21 +73,18 @@ class FiatPermissionEvaluatorSpec extends Specification {
     then:
     1 * fiatService.getUserPermission("testUser") >> new UserPermission(
             applications: [
-                new Application(name: "abc",
+                new Application(name: "abc-def",
                                 permissions: Permissions.factory([
                                     (Authorization.READ): ["testRole"]
-                                ]))
+                                ])),
             ],
             roles: [new Role("testRole")]
         ).getView()
     result
 
     where:
-    resource           | resourceName | resourceType
-    "abc"              | "abc"        | ResourceType.APPLICATION
-    "abc-def"          | "abc"        | ResourceType.APPLICATION
-    "abc-def-ghi"      | "abc"        | ResourceType.APPLICATION
-    "abc-def-ghi-1234" | "abc"        | ResourceType.APPLICATION
+    resource           | resourceName         | resourceType
+    "abc-def"          | "abc-def"            | ResourceType.APPLICATION
 
     authorization = 'READ'
   }