fix lro final-state-via and revert change of ErrorResponse (#23544)

xiaoxuqi-ms · web-flow · commit fc8e0408bd95 · 2023-04-14T09:22:47.000+08:00
* fix lro final-state-via

* revert replication role

* revert cloudError
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json
@@ -96,7 +96,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -148,7 +148,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -195,7 +195,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -237,7 +237,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -318,6 +318,17 @@
         }
       },
       "description": "A List of azure ad administrators."
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
+          "description": "The resource management error response."
+        }
+      },
+      "description": "An error response from the Batch service."
     }
   },
   "parameters": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/stable/2022-01-01/Backups.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/stable/2022-01-01/Backups.json
@@ -73,7 +73,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -116,7 +116,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -158,7 +158,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -225,6 +225,17 @@
         }
       },
       "description": "A list of server backups."
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
+          "description": "The resource management error response."
+        }
+      },
+      "description": "An error response from the Batch service."
     }
   },
   "parameters": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json
@@ -94,10 +94,7 @@
             }
           }
         },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
-        }
+        "x-ms-long-running-operation": true
       },
       "patch": {
         "tags": [
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/stable/2022-01-01/Configurations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/stable/2022-01-01/Configurations.json
@@ -90,14 +90,11 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
-        }
+        "x-ms-long-running-operation": true
       },
       "patch": {
         "tags": [
@@ -154,7 +151,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -198,7 +195,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -257,7 +254,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -315,7 +312,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -504,6 +501,17 @@
         }
       },
       "description": "A list of server configurations to update."
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
+          "description": "The resource management error response."
+        }
+      },
+      "description": "An error response from the Batch service."
     }
   },
   "parameters": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/stable/2022-01-01/Databases.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/stable/2022-01-01/Databases.json
@@ -96,7 +96,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -148,14 +148,11 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
-        }
+        "x-ms-long-running-operation": true
       },
       "get": {
         "tags": [
@@ -195,7 +192,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -237,7 +234,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -299,6 +296,17 @@
         }
       },
       "description": "A List of databases."
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
+          "description": "The resource management error response."
+        }
+      },
+      "description": "An error response from the Batch service."
     }
   },
   "parameters": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/stable/2022-01-01/FirewallRules.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/stable/2022-01-01/FirewallRules.json
@@ -96,7 +96,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -148,14 +148,11 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
-        }
+        "x-ms-long-running-operation": true
       },
       "get": {
         "tags": [
@@ -195,7 +192,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -237,7 +234,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -308,6 +305,17 @@
         }
       },
       "description": "A list of firewall rules."
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
+          "description": "The resource management error response."
+        }
+      },
+      "description": "An error response from the Batch service."
     }
   },
   "parameters": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json
@@ -206,7 +206,7 @@
         },
         "x-ms-long-running-operation": true,
         "x-ms-long-running-operation-options": {
-          "final-state-via": "location"
+          "final-state-via": "azure-async-operation"
         }
       },
       "get": {
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/stable/2022-01-01/FlexibleServers.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/stable/2022-01-01/FlexibleServers.json
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/stable/2022-01-01/LogFiles.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/stable/2022-01-01/LogFiles.json
diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/stable/2022-01-01/ServiceOperations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/stable/2022-01-01/ServiceOperations.json

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`"default": {`
`97`	`97`	`"description": "Error response describing why the operation failed.",`
`98`	`98`	`"schema": {`
`99`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`99`	`+ "$ref": "#/definitions/CloudError"`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`},`
`@@ -148,7 +148,7 @@`
`148`	`148`	`"default": {`
`149`	`149`	`"description": "Error response describing why the operation failed.",`
`150`	`150`	`"schema": {`
`151`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`151`	`+ "$ref": "#/definitions/CloudError"`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`},`
`@@ -195,7 +195,7 @@`
`195`	`195`	`"default": {`
`196`	`196`	`"description": "Error response describing why the operation failed.",`
`197`	`197`	`"schema": {`
`198`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`198`	`+ "$ref": "#/definitions/CloudError"`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
`@@ -237,7 +237,7 @@`
`237`	`237`	`"default": {`
`238`	`238`	`"description": "Error response describing why the operation failed.",`
`239`	`239`	`"schema": {`
`240`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`240`	`+ "$ref": "#/definitions/CloudError"`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`},`
`@@ -318,6 +318,17 @@`
`318`	`318`	`}`
`319`	`319`	`},`
`320`	`320`	`"description": "A List of azure ad administrators."`
	`321`	`+ },`
	`322`	`+ "CloudError": {`
	`323`	`+ "type": "object",`
	`324`	`+ "x-ms-external": true,`
	`325`	`+ "properties": {`
	`326`	`+ "error": {`
	`327`	`+ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",`
	`328`	`+ "description": "The resource management error response."`
	`329`	`+ }`
	`330`	`+ },`
	`331`	`+ "description": "An error response from the Batch service."`
`321`	`332`	`}`
`322`	`333`	`},`
`323`	`334`	`"parameters": {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`"default": {`
`74`	`74`	`"description": "Error response describing why the operation failed.",`
`75`	`75`	`"schema": {`
`76`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`76`	`+ "$ref": "#/definitions/CloudError"`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -116,7 +116,7 @@`
`116`	`116`	`"default": {`
`117`	`117`	`"description": "Error response describing why the operation failed.",`
`118`	`118`	`"schema": {`
`119`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`119`	`+ "$ref": "#/definitions/CloudError"`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -158,7 +158,7 @@`
`158`	`158`	`"default": {`
`159`	`159`	`"description": "Error response describing why the operation failed.",`
`160`	`160`	`"schema": {`
`161`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`161`	`+ "$ref": "#/definitions/CloudError"`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`},`
`@@ -225,6 +225,17 @@`
`225`	`225`	`}`
`226`	`226`	`},`
`227`	`227`	`"description": "A list of server backups."`
	`228`	`+ },`
	`229`	`+ "CloudError": {`
	`230`	`+ "type": "object",`
	`231`	`+ "x-ms-external": true,`
	`232`	`+ "properties": {`
	`233`	`+ "error": {`
	`234`	`+ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",`
	`235`	`+ "description": "The resource management error response."`
	`236`	`+ }`
	`237`	`+ },`
	`238`	`+ "description": "An error response from the Batch service."`
`228`	`239`	`}`
`229`	`240`	`},`
`230`	`241`	`"parameters": {`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,7 @@`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`},`
`97`		`- "x-ms-long-running-operation": true,`
`98`		`- "x-ms-long-running-operation-options": {`
`99`		`- "final-state-via": "location"`
`100`		`- }`
	`97`	`+ "x-ms-long-running-operation": true`
`101`	`98`	`},`
`102`	`99`	`"patch": {`
`103`	`100`	`"tags": [`
Original file line number	Diff line number	Diff line change
`@@ -90,14 +90,11 @@`
`90`	`90`	`"default": {`
`91`	`91`	`"description": "Error response describing why the operation failed.",`
`92`	`92`	`"schema": {`
`93`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`93`	`+ "$ref": "#/definitions/CloudError"`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`},`
`97`		`- "x-ms-long-running-operation": true,`
`98`		`- "x-ms-long-running-operation-options": {`
`99`		`- "final-state-via": "location"`
`100`		`- }`
	`97`	`+ "x-ms-long-running-operation": true`
`101`	`98`	`},`
`102`	`99`	`"patch": {`
`103`	`100`	`"tags": [`
`@@ -154,7 +151,7 @@`
`154`	`151`	`"default": {`
`155`	`152`	`"description": "Error response describing why the operation failed.",`
`156`	`153`	`"schema": {`
`157`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`154`	`+ "$ref": "#/definitions/CloudError"`
`158`	`155`	`}`
`159`	`156`	`}`
`160`	`157`	`},`
`@@ -198,7 +195,7 @@`
`198`	`195`	`"default": {`
`199`	`196`	`"description": "Error response describing why the operation failed.",`
`200`	`197`	`"schema": {`
`201`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`198`	`+ "$ref": "#/definitions/CloudError"`
`202`	`199`	`}`
`203`	`200`	`}`
`204`	`201`	`}`
`@@ -257,7 +254,7 @@`
`257`	`254`	`"default": {`
`258`	`255`	`"description": "Error response describing why the operation failed.",`
`259`	`256`	`"schema": {`
`260`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`257`	`+ "$ref": "#/definitions/CloudError"`
`261`	`258`	`}`
`262`	`259`	`}`
`263`	`260`	`},`
`@@ -315,7 +312,7 @@`
`315`	`312`	`"default": {`
`316`	`313`	`"description": "Error response describing why the operation failed.",`
`317`	`314`	`"schema": {`
`318`		`- "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"`
	`315`	`+ "$ref": "#/definitions/CloudError"`
`319`	`316`	`}`
`320`	`317`	`}`
`321`	`318`	`},`
`@@ -504,6 +501,17 @@`
`504`	`501`	`}`
`505`	`502`	`},`
`506`	`503`	`"description": "A list of server configurations to update."`
	`504`	`+ },`
	`505`	`+ "CloudError": {`
	`506`	`+ "type": "object",`
	`507`	`+ "x-ms-external": true,`
	`508`	`+ "properties": {`
	`509`	`+ "error": {`
	`510`	`+ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",`
	`511`	`+ "description": "The resource management error response."`
	`512`	`+ }`
	`513`	`+ },`
	`514`	`+ "description": "An error response from the Batch service."`
`507`	`515`	`}`
`508`	`516`	`},`
`509`	`517`	`"parameters": {`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@`
`206`	`206`	`},`
`207`	`207`	`"x-ms-long-running-operation": true,`
`208`	`208`	`"x-ms-long-running-operation-options": {`
`209`		`- "final-state-via": "location"`
	`209`	`+ "final-state-via": "azure-async-operation"`
`210`	`210`	`}`
`211`	`211`	`},`
`212`	`212`	`"get": {`