Simplify representation of privileges in access control entries by al…

…ways using an array.
adobe · Apr 25, 2018 · 877b44e · 877b44e
1 parent bcd88dd
commit 877b44e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/schemas/external/repo/accesscontrolentry.example.1.json b/schemas/external/repo/accesscontrolentry.example.1.json
@@ -1,5 +1,5 @@
 {
   "repo:principal": "authenticated",
-  "repo:privilege": "read",
+  "repo:privileges": ["read"],
   "repo:modifier": "grant"
 }
diff --git a/schemas/external/repo/accesscontrolentry.example.2.json b/schemas/external/repo/accesscontrolentry.example.2.json
@@ -6,6 +6,6 @@
     "@id": "C0B648DE57D701277F000101@AdobeID",
     "@type": "https://ns.adobe.com/adobecloudplatform/ims/user"
   },
-  "repo:privilege": ["write", "delete"],
+  "repo:privileges": ["write", "delete"],
   "repo:modifier": "grant"
 }
diff --git a/schemas/external/repo/accesscontrolentry.schema.json b/schemas/external/repo/accesscontrolentry.schema.json
@@ -41,19 +41,12 @@
             }
           ]
         },
-        "repo:privilege": {
-          "description": "Privilege granted or denied to the Principal",
-          "anyOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/privilege"
-              }
-            },
-            {
-              "$ref": "#/definitions/privilege"
-            }
-          ]
+        "repo:privileges": {
+          "description": "Privileges granted or denied to the Principal",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/privilege"
+          }
         },
         "repo:relations": {
           "description":
@@ -74,7 +67,7 @@
           "default": "grant"
         }
       },
-      "required": ["repo:principal", "repo:privilege"],
+      "required": ["repo:principal", "repo:privileges"],
       "additionalProperties": {
         "type": ["object", "array", "string"]
       }

diff --git a/schemas/external/repo/accesscontrolpolicy.example.1.json b/schemas/external/repo/accesscontrolpolicy.example.1.json
@@ -2,7 +2,7 @@
   "repo:acl": [
     {
       "repo:principal": "authenticated",
-      "repo:privilege": "read",
+      "repo:privileges": ["read"],
       "repo:modifier": "grant"
     },
     {
@@ -13,7 +13,7 @@
         "@id": "C0B648DE57D701277F000101@AdobeID",
         "@type": "https://ns.adobe.com/adobecloudplatform/ims/user"
       },
-      "repo:privilege": ["write", "delete"],
+      "repo:privileges": ["write", "delete"],
       "repo:modifier": "grant"
     }
   ]