types: Sort any elements during construction (#3805)

* types: Sort any elements during construction This changes updates the implementation of the any type to sort elements during construction. This way the Compare() function does not have to sort elements before recursing (which can result in data races if global type instances from the built-in function declarations or elsewhere are compared.) Fixes #3793 * capabilities.json: changed ordering * internal/presentation: fix json error output Co-authored-by: Torin Sandall <[email protected]> Co-authored-by: Stephan Renatus <[email protected]> Signed-off-by: Torin Sandall <[email protected]>
open-policy-agent · Sep 20, 2021 · f4d9c22 · f4d9c22
1 parent 5a86472
commit f4d9c22
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 94 deletions.
diff --git a/capabilities.json b/capabilities.json
@@ -21,16 +21,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -76,16 +76,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -472,16 +472,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "string"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "string"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -517,10 +517,7 @@
           {
             "of": [
               {
-                "of": {
-                  "type": "any"
-                },
-                "type": "set"
+                "type": "string"
               },
               {
                 "dynamic": {
@@ -540,7 +537,10 @@
                 "type": "object"
               },
               {
-                "type": "string"
+                "of": {
+                  "type": "any"
+                },
+                "type": "set"
               }
             ],
             "type": "any"
@@ -847,16 +847,16 @@
               "value": {
                 "of": [
                   {
-                    "of": {
+                    "dynamic": {
                       "type": "any"
                     },
-                    "type": "set"
+                    "type": "array"
                   },
                   {
-                    "dynamic": {
+                    "of": {
                       "type": "any"
                     },
-                    "type": "array"
+                    "type": "set"
                   }
                 ],
                 "type": "any"
@@ -867,16 +867,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -1747,16 +1747,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -1775,16 +1775,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -1926,23 +1926,6 @@
                 },
                 "type": "array"
               },
-              {
-                "of": {
-                  "of": [
-                    {
-                      "type": "string"
-                    },
-                    {
-                      "dynamic": {
-                        "type": "any"
-                      },
-                      "type": "array"
-                    }
-                  ],
-                  "type": "any"
-                },
-                "type": "set"
-              },
               {
                 "dynamic": {
                   "key": {
@@ -1964,17 +1947,9 @@
                   }
                 },
                 "type": "object"
-              }
-            ],
-            "type": "any"
-          },
-          {
-            "of": [
-              {
-                "type": "string"
               },
               {
-                "dynamic": {
+                "of": {
                   "of": [
                     {
                       "type": "string"
@@ -1988,10 +1963,18 @@
                   ],
                   "type": "any"
                 },
-                "type": "array"
+                "type": "set"
+              }
+            ],
+            "type": "any"
+          },
+          {
+            "of": [
+              {
+                "type": "string"
               },
               {
-                "of": {
+                "dynamic": {
                   "of": [
                     {
                       "type": "string"
@@ -2005,7 +1988,7 @@
                   ],
                   "type": "any"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
                 "dynamic": {
@@ -2028,6 +2011,23 @@
                   }
                 },
                 "type": "object"
+              },
+              {
+                "of": {
+                  "of": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "dynamic": {
+                        "type": "any"
+                      },
+                      "type": "array"
+                    }
+                  ],
+                  "type": "any"
+                },
+                "type": "set"
               }
             ],
             "type": "any"
@@ -2180,12 +2180,6 @@
                 },
                 "type": "array"
               },
-              {
-                "of": {
-                  "type": "any"
-                },
-                "type": "set"
-              },
               {
                 "dynamic": {
                   "key": {
@@ -2196,6 +2190,12 @@
                   }
                 },
                 "type": "object"
+              },
+              {
+                "of": {
+                  "type": "any"
+                },
+                "type": "set"
               }
             ],
             "type": "any"
@@ -2258,12 +2258,6 @@
                 },
                 "type": "array"
               },
-              {
-                "of": {
-                  "type": "any"
-                },
-                "type": "set"
-              },
               {
                 "dynamic": {
                   "key": {
@@ -2274,6 +2268,12 @@
                   }
                 },
                 "type": "object"
+              },
+              {
+                "of": {
+                  "type": "any"
+                },
+                "type": "set"
               }
             ],
             "type": "any"
@@ -2387,16 +2387,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "number"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "number"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -2856,16 +2856,16 @@
           {
             "of": [
               {
-                "of": {
+                "dynamic": {
                   "type": "number"
                 },
-                "type": "set"
+                "type": "array"
               },
               {
-                "dynamic": {
+                "of": {
                   "type": "number"
                 },
-                "type": "array"
+                "type": "set"
               }
             ],
             "type": "any"
@@ -3142,16 +3142,16 @@
           {
             "of": [
               {
-                "type": "number"
+                "type": "null"
               },
               {
-                "type": "string"
+                "type": "boolean"
               },
               {
-                "type": "boolean"
+                "type": "number"
               },
               {
-                "type": "null"
+                "type": "string"
               }
             ],
             "type": "any"