Revert change and add defaults (#12243)

Azure · Jan 5, 2021 · 2e1ad0d · 2e1ad0d
1 parent cdc98b4
commit 2e1ad0d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 186 deletions.
diff --git a/...osoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json b/...osoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
@@ -112,24 +112,6 @@
     }
   },
   "definitions": {
-    "Error": {
-      "properties": {
-        "error": {
-          "type": "object",
-          "properties": {
-            "code": {
-              "type": "string",
-              "description": "Brief error code"
-            },
-            "message": {
-              "type": "string",
-              "description": "Longer message explaining the details of the error"
-            }
-          }
-        }
-      },
-      "description": "Object to be thrown in case of an unsuccessful response"
-    },
     "ResourceType": {
       "properties": {
         "name": {

diff --git a/...icrosoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json b/...icrosoft.Authorization/preview/2018-01-01-preview/authorization-RoleAssignmentsCalls.json
@@ -478,24 +478,6 @@
     }
   },
   "definitions": {
-    "Error": {
-      "properties": {
-        "error": {
-          "type": "object",
-          "properties": {
-            "code": {
-              "type": "string",
-              "description": "Brief error code"
-            },
-            "message": {
-              "type": "string",
-              "description": "Longer message explaining the details of the error"
-            }
-          }
-        }
-      },
-      "description": "Object to be thrown in case of an unsuccessful response"
-    },
     "RoleAssignmentFilter": {
       "properties": {
         "principalId": {

diff --git a/...icrosoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json b/...icrosoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
@@ -348,24 +348,6 @@
     }
   },
   "definitions": {
-    "Error": {
-      "properties": {
-        "error": {
-          "type": "object",
-          "properties": {
-            "code": {
-              "type": "string",
-              "description": "Brief error code"
-            },
-            "message": {
-              "type": "string",
-              "description": "Longer message explaining the details of the error"
-            }
-          }
-        }
-      },
-      "description": "Object to be thrown in case of an unsuccessful response"
-    },
     "RoleDefinitionFilter": {
       "properties": {
         "roleName": {

diff --git a/...rosoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json b/...rosoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
@@ -298,25 +298,6 @@
     }
   },
   "definitions": {
-    "Error": {
-      "properties": {
-        "error": {
-          "description": "Object to be thrown in case of an unsuccessful response",
-          "type": "object",
-          "properties": {
-            "code": {
-              "type": "string",
-              "description": "Brief error code"
-            },
-            "message": {
-              "type": "string",
-              "description": "Longer message explaining the details of the error"
-            }
-          }
-        }
-      },
-      "description": "Object to be thrown in case of an unsuccessful response"
-    },
     "DenyAssignmentFilter": {
       "properties": {
         "denyAssignmentName": {

diff --git a/...icrosoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json b/...icrosoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
@@ -136,10 +136,10 @@
               "$ref": "#/definitions/RoleAssignmentListResult"
             }
           },
-          "400": {
-            "description": "Bad Request - Indicates the request has missing information and can not be completed",
+          "default": {
+            "description": "error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/Error"
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -191,8 +191,11 @@
           "204": {
             "description": "Deleted - Indicates correct deletion without returning additional info"
           },
-          "412": {
-            "description": "Precondition Failed"
+          "default": {
+            "description": "error response describing why the operation failed.",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+            }
           }
         },
         "x-ms-examples": {
@@ -243,16 +246,10 @@
               "$ref": "#/definitions/RoleAssignment"
             }
           },
-          "400": {
-            "description": "Bad Request - Indicates the request has missing information and can not be completed",
+          "default": {
+            "description": "error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/Error"
-            }
-          },
-          "409": {
-            "description": "Conflict - indicates that the request could not be completed due to a conflict with the current state of the target resource",
-            "schema": {
-              "$ref": "#/definitions/Error"
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -295,14 +292,11 @@
               "$ref": "#/definitions/RoleAssignment"
             }
           },
-          "400": {
-            "description": "Bad Request - Indicates the request has missing information and can not be completed",
+          "default": {
+            "description": "error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/Error"
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
-          },
-          "404": {
-            "description": "Not Found - Indicates the specified role has not been found"
           }
         },
         "x-ms-examples": {
@@ -451,10 +445,10 @@
               "$ref": "#/definitions/RoleAssignmentListResult"
             }
           },
-          "400": {
-            "description": "Bad Request - Indicates the request has missing information and can not be completed",
+          "default": {
+            "description": "error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/Error"
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -503,10 +497,10 @@
               "$ref": "#/definitions/RoleAssignmentListResult"
             }
           },
-          "400": {
-            "description": "Bad Request - Indicates the request has missing information and can not be completed",
+          "default": {
+            "description": "error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/Error"
+              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -717,25 +711,6 @@
         "properties"
       ],
       "description": "Role assignment create parameters."
-    },
-    "Error": {
-      "properties": {
-        "error": {
-          "description": "Object to be thrown in case of an unsuccessful response",
-          "type": "object",
-          "properties": {
-            "code": {
-              "type": "string",
-              "description": "Brief error code"
-            },
-            "message": {
-              "type": "string",
-              "description": "Longer message explaining the details of the error"
-            }
-          }
-        }
-      },
-      "description": "Object to be thrown in case of an unsuccessful response"
     }
   },
   "parameters": {

diff --git a/...crosoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json b/...crosoft.Authorization/preview/2020-04-01-preview/examples/DeleteRoleAssignmentByName.json
@@ -22,7 +22,6 @@
         "name": "roleassignmentId"
       }
     },
-    "204": {},
-    "412": {}
+    "204": {}
   }
 }
diff --git a/...er/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json b/...er/Microsoft.Authorization/preview/2020-04-01-preview/examples/GetAllRoleAssignments.json
@@ -24,14 +24,6 @@
           }
         ]
       }
-    },
-    "400": {
-      "body": {
-        "error": {
-          "code": "BadRequest",
-          "message": "Your request was badly formed please correct it and try again"
-        }
-      }
     }
   }
 }
diff --git a/.../Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json b/.../Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByName.json
@@ -22,15 +22,6 @@
         "type": "Microsoft.Authorization/roleAssignments",
         "name": "raId"
       }
-    },
-    "400": {
-      "body": {
-        "error": {
-          "code": "BadRequest",
-          "message": "Your request was badly formed please correct it and try again"
-        }
-      }
-    },
-    "404": {}
+    }
   }
 }
diff --git a/...Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json b/...Microsoft.Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentByScope.json
@@ -24,14 +24,6 @@
           }
         ]
       }
-    },
-    "400": {
-      "body": {
-        "error": {
-          "code": "BadRequest",
-          "message": "Your request was badly formed please correct it and try again"
-        }
-      }
     }
   }
 }
diff --git a/...Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json b/...Authorization/preview/2020-04-01-preview/examples/GetRoleAssignmentsForResourceGroup.json
@@ -25,14 +25,6 @@
           }
         ]
       }
-    },
-    "400": {
-      "body": {
-        "error": {
-          "code": "BadRequest",
-          "message": "Your request was badly formed please correct it and try again"
-        }
-      }
     }
   }
 }
diff --git a/...anager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json b/...anager/Microsoft.Authorization/preview/2020-04-01-preview/examples/PutRoleAssignment.json
@@ -32,22 +32,6 @@
         "type": "Microsoft.Authorization/roleAssignments",
         "name": "roleassignmentId"
       }
-    },
-    "400": {
-      "body": {
-        "error": {
-          "code": "BadRequest",
-          "message": "Your request was badly formed please correct it and try again"
-        }
-      }
-    },
-    "409": {
-      "body": {
-        "error": {
-          "code": "ConflictError",
-          "message": "the request could not be completed due to a conflict with the current state of the target resource"
-        }
-      }
     }
   }
 }
diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md
@@ -26,7 +26,7 @@ These are the global settings for the Authorization API.
 
 ``` yaml
 openapi-type: arm
-tag: package-2020-04-preview
+tag: package-2020-04-01-preview-only
 ```
 
 ## Suppression
@@ -73,24 +73,10 @@ directive:
 
 ### Tag: package-2020-04-01-preview-only
 
-These settings apply only when `--tag=package-2020-04-01-preview-only` is specified on the command line.
-
-``` yaml $(tag) == 'package-2020-04-01-preview-only'
-input-file:
-- Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
-```
-
-### Tag: package-2020-04-preview
-
 These settings apply only when `--tag=package-2020-04-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2020-04-preview'
+``` yaml $(tag) == 'package-2020-04-01-preview-only'
 input-file:
-- Microsoft.Authorization/preview/2015-06-01/authorization-ClassicAdminCalls.json
-- Microsoft.Authorization/stable/2015-07-01/authorization-ElevateAccessCalls.json
-- Microsoft.Authorization/preview/2018-01-01-preview/authorization-ProviderOperationsCalls.json
-- Microsoft.Authorization/preview/2018-01-01-preview/authorization-RoleDefinitionsCalls.json
-- Microsoft.Authorization/preview/2018-07-01-preview/authorization-DenyAssignmentGetCalls.json
 - Microsoft.Authorization/preview/2020-04-01-preview/authorization-RoleAssignmentsCalls.json
 ```