CodeGen from PR 11471 in Azure/azure-rest-api-specs

Managed Services Swagger Consistency Fixes (#11471) * Updated 2018-06-01-preview specs * Updated 2019-04-01-preview specs * Updated 2018-06-01-preview specs * Updated 2020-02-01-preview specs * Updated 2019-06-01 specs * Updated 2019-09-01 specs * Updated 2018-06-01-preview examples * Updated ErrorResponse model * Model validation fix * Removed readOnly=true for ErrorResponse * Updated type specification for error * Removed old type reference for ErrorResponse
Azure · Nov 20, 2020 · f4989d3 · f4989d3
1 parent b9ee504
commit f4989d3
Show file tree

Hide file tree

Showing 5 changed files with 846 additions and 88 deletions.
diff --git a/schemas/2018-06-01-preview/Microsoft.ManagedServices.json b/schemas/2018-06-01-preview/Microsoft.ManagedServices.json
@@ -3,26 +3,21 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.ManagedServices",
   "description": "Microsoft ManagedServices Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "registrationAssignments": {
       "type": "object",
       "properties": {
-        "name": {
-          "type": "string",
-          "description": "Guid of the registration assignment."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.ManagedServices/registrationAssignments"
-          ]
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2018-06-01-preview"
           ]
         },
+        "name": {
+          "type": "string",
+          "description": "Guid of the registration assignment."
+        },
         "properties": {
           "oneOf": [
             {
@@ -33,63 +28,69 @@
             }
           ],
           "description": "Properties of a registration assignment."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.ManagedServices/registrationAssignments"
+          ]
         }
       },
       "required": [
-        "name",
-        "type",
         "apiVersion",
-        "properties"
+        "name",
+        "properties",
+        "type"
       ],
       "description": "Microsoft.ManagedServices/registrationAssignments"
     },
     "registrationDefinitions": {
       "type": "object",
       "properties": {
-        "name": {
-          "type": "string",
-          "description": "Guid of the registration definition."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.ManagedServices/registrationDefinitions"
-          ]
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2018-06-01-preview"
           ]
         },
-        "properties": {
+        "name": {
+          "type": "string",
+          "description": "Guid of the registration definition."
+        },
+        "plan": {
           "oneOf": [
             {
-              "$ref": "#/definitions/RegistrationDefinitionProperties"
+              "$ref": "#/definitions/Plan"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Properties of a registration definition."
+          "description": "Plan details for the managed services."
         },
-        "plan": {
+        "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/Plan"
+              "$ref": "#/definitions/RegistrationDefinitionProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Plan details for the managed services."
+          "description": "Properties of a registration definition."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.ManagedServices/registrationDefinitions"
+          ]
         }
       },
       "required": [
-        "name",
-        "type",
         "apiVersion",
-        "properties"
+        "name",
+        "properties",
+        "type"
       ],
       "description": "Microsoft.ManagedServices/registrationDefinitions"
     }
@@ -98,10 +99,29 @@
     "Authorization": {
       "type": "object",
       "properties": {
+        "delegatedRoleDefinitionIds": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other security groups/service principals/users."
+        },
         "principalId": {
           "type": "string",
           "description": "Principal Id of the security group/service principal/user that would be assigned permissions to the projected subscription"
         },
+        "principalIdDisplayName": {
+          "type": "string",
+          "description": "Display name of the principal Id."
+        },
         "roleDefinitionId": {
           "type": "string",
           "description": "The role definition identifier. This role will define all the permissions that the security group/service principal/user must have on the projected subscription. This role cannot be an owner role."
@@ -120,23 +140,23 @@
           "type": "string",
           "description": "The plan name."
         },
-        "publisher": {
-          "type": "string",
-          "description": "The publisher ID."
-        },
         "product": {
           "type": "string",
           "description": "The product code."
         },
+        "publisher": {
+          "type": "string",
+          "description": "The publisher ID."
+        },
         "version": {
           "type": "string",
           "description": "The plan's version."
         }
       },
       "required": [
         "name",
-        "publisher",
         "product",
+        "publisher",
         "version"
       ],
       "description": "Plan details for the managed services."
@@ -157,10 +177,6 @@
     "RegistrationDefinitionProperties": {
       "type": "object",
       "properties": {
-        "description": {
-          "type": "string",
-          "description": "Description of the registration definition."
-        },
         "authorizations": {
           "oneOf": [
             {
@@ -175,13 +191,17 @@
           ],
           "description": "Authorization tuple containing principal id of the user/security group or service principal and id of the build-in role."
         },
-        "registrationDefinitionName": {
+        "description": {
           "type": "string",
-          "description": "Name of the registration definition."
+          "description": "Description of the registration definition."
         },
         "managedByTenantId": {
           "type": "string",
           "description": "Id of the managedBy tenant."
+        },
+        "registrationDefinitionName": {
+          "type": "string",
+          "description": "Name of the registration definition."
         }
       },
       "required": [