Rename ErrorSchema to ErrorResponse. Rename Error to ErrorResponseBody. Rename Status to ConnectionStatus.

huanwu · huanwu · commit 80e57dbf8c6b · 2020-03-24T14:50:05.000-07:00
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
@@ -50,7 +50,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/agentpool doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -108,7 +108,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -155,7 +155,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -214,7 +214,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -257,7 +257,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -305,7 +305,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/agentpool doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -359,7 +359,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -417,7 +417,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -474,7 +474,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -527,7 +527,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -589,7 +589,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/build doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -639,7 +639,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -688,7 +688,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -738,7 +738,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -800,7 +800,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -851,7 +851,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -914,7 +914,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -964,7 +964,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1006,7 +1006,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1051,7 +1051,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1099,7 +1099,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1157,7 +1157,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1213,7 +1213,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1272,7 +1272,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -1327,7 +1327,7 @@
           "default": {
             "description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",
             "schema": {
-              "$ref": "#/definitions/ErrorSchema"
+              "$ref": "#/definitions/ErrorResponse"
             }
           }
         },
@@ -2980,7 +2980,7 @@
       },
       "x-ms-azure-resource": true
     },
-    "Error": {
+    "ErrorResponseBody": {
       "description": "An error response from the Azure Container Registry service.",
       "required": [
         "code",
@@ -2997,11 +2997,11 @@
         }
       }
     },
-    "ErrorSchema": {
+    "ErrorResponse": {
       "description": "An error response from the Azure Container Registry service.",
       "properties": {
         "error": {
-          "$ref": "#/definitions/Error",
+          "$ref": "#/definitions/ErrorResponseBody",
           "description": "Azure container registry build API error body."
         }
       }
diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
@@ -1588,7 +1588,7 @@
           ],
           "type": "string",
           "x-ms-enum": {
-            "name": "Status",
+            "name": "ConnectionStatus",
             "modelAsString": true
           }
         },

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`"default": {`
`51`	`51`	`"description": "Error response describing why the operation failed. If the registry/agentpool doesn't exist, 404 (Not found) is returned.",`
`52`	`52`	`"schema": {`
`53`		`- "$ref": "#/definitions/ErrorSchema"`
	`53`	`+ "$ref": "#/definitions/ErrorResponse"`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`},`
`@@ -108,7 +108,7 @@`
`108`	`108`	`"default": {`
`109`	`109`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`110`	`110`	`"schema": {`
`111`		`- "$ref": "#/definitions/ErrorSchema"`
	`111`	`+ "$ref": "#/definitions/ErrorResponse"`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`},`
`@@ -155,7 +155,7 @@`
`155`	`155`	`"default": {`
`156`	`156`	`"description": "Error response describing why the operation failed.",`
`157`	`157`	`"schema": {`
`158`		`- "$ref": "#/definitions/ErrorSchema"`
	`158`	`+ "$ref": "#/definitions/ErrorResponse"`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`},`
`@@ -214,7 +214,7 @@`
`214`	`214`	`"default": {`
`215`	`215`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`216`	`216`	`"schema": {`
`217`		`- "$ref": "#/definitions/ErrorSchema"`
	`217`	`+ "$ref": "#/definitions/ErrorResponse"`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`},`
`@@ -257,7 +257,7 @@`
`257`	`257`	`"default": {`
`258`	`258`	`"description": "Error response describing why the operation failed.",`
`259`	`259`	`"schema": {`
`260`		`- "$ref": "#/definitions/ErrorSchema"`
	`260`	`+ "$ref": "#/definitions/ErrorResponse"`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`	`},`
`@@ -305,7 +305,7 @@`
`305`	`305`	`"default": {`
`306`	`306`	`"description": "Error response describing why the operation failed. If the registry/agentpool doesn't exist, 404 (Not found) is returned.",`
`307`	`307`	`"schema": {`
`308`		`- "$ref": "#/definitions/ErrorSchema"`
	`308`	`+ "$ref": "#/definitions/ErrorResponse"`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`},`
`@@ -359,7 +359,7 @@`
`359`	`359`	`"default": {`
`360`	`360`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`361`	`361`	`"schema": {`
`362`		`- "$ref": "#/definitions/ErrorSchema"`
	`362`	`+ "$ref": "#/definitions/ErrorResponse"`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`	`},`
`@@ -417,7 +417,7 @@`
`417`	`417`	`"default": {`
`418`	`418`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",`
`419`	`419`	`"schema": {`
`420`		`- "$ref": "#/definitions/ErrorSchema"`
	`420`	`+ "$ref": "#/definitions/ErrorResponse"`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`	`},`
`@@ -474,7 +474,7 @@`
`474`	`474`	`"default": {`
`475`	`475`	`"description": "Error response describing why the operation failed.",`
`476`	`476`	`"schema": {`
`477`		`- "$ref": "#/definitions/ErrorSchema"`
	`477`	`+ "$ref": "#/definitions/ErrorResponse"`
`478`	`478`	`}`
`479`	`479`	`}`
`480`	`480`	`},`
`@@ -527,7 +527,7 @@`
`527`	`527`	`"default": {`
`528`	`528`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",`
`529`	`529`	`"schema": {`
`530`		`- "$ref": "#/definitions/ErrorSchema"`
	`530`	`+ "$ref": "#/definitions/ErrorResponse"`
`531`	`531`	`}`
`532`	`532`	`}`
`533`	`533`	`},`
`@@ -589,7 +589,7 @@`
`589`	`589`	`"default": {`
`590`	`590`	`"description": "Error response describing why the operation failed. If the registry/build doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`591`	`591`	`"schema": {`
`592`		`- "$ref": "#/definitions/ErrorSchema"`
	`592`	`+ "$ref": "#/definitions/ErrorResponse"`
`593`	`593`	`}`
`594`	`594`	`}`
`595`	`595`	`},`
`@@ -639,7 +639,7 @@`
`639`	`639`	`"default": {`
`640`	`640`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",`
`641`	`641`	`"schema": {`
`642`		`- "$ref": "#/definitions/ErrorSchema"`
	`642`	`+ "$ref": "#/definitions/ErrorResponse"`
`643`	`643`	`}`
`644`	`644`	`}`
`645`	`645`	`},`
`@@ -688,7 +688,7 @@`
`688`	`688`	`"default": {`
`689`	`689`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",`
`690`	`690`	`"schema": {`
`691`		`- "$ref": "#/definitions/ErrorSchema"`
	`691`	`+ "$ref": "#/definitions/ErrorResponse"`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`	`},`
`@@ -738,7 +738,7 @@`
`738`	`738`	`"default": {`
`739`	`739`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",`
`740`	`740`	`"schema": {`
`741`		`- "$ref": "#/definitions/ErrorSchema"`
	`741`	`+ "$ref": "#/definitions/ErrorResponse"`
`742`	`742`	`}`
`743`	`743`	`}`
`744`	`744`	`},`
`@@ -800,7 +800,7 @@`
`800`	`800`	`"default": {`
`801`	`801`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`802`	`802`	`"schema": {`
`803`		`- "$ref": "#/definitions/ErrorSchema"`
	`803`	`+ "$ref": "#/definitions/ErrorResponse"`
`804`	`804`	`}`
`805`	`805`	`}`
`806`	`806`	`},`
`@@ -851,7 +851,7 @@`
`851`	`851`	`"default": {`
`852`	`852`	`"description": "Error response describing why the operation failed.",`
`853`	`853`	`"schema": {`
`854`		`- "$ref": "#/definitions/ErrorSchema"`
	`854`	`+ "$ref": "#/definitions/ErrorResponse"`
`855`	`855`	`}`
`856`	`856`	`}`
`857`	`857`	`},`
`@@ -914,7 +914,7 @@`
`914`	`914`	`"default": {`
`915`	`915`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`916`	`916`	`"schema": {`
`917`		`- "$ref": "#/definitions/ErrorSchema"`
	`917`	`+ "$ref": "#/definitions/ErrorResponse"`
`918`	`918`	`}`
`919`	`919`	`}`
`920`	`920`	`},`
`@@ -964,7 +964,7 @@`
`964`	`964`	`"default": {`
`965`	`965`	`"description": "Error response describing why the operation failed. If the registry/run doesn't exist, 404 (Not found) is returned.",`
`966`	`966`	`"schema": {`
`967`		`- "$ref": "#/definitions/ErrorSchema"`
	`967`	`+ "$ref": "#/definitions/ErrorResponse"`
`968`	`968`	`}`
`969`	`969`	`}`
`970`	`970`	`},`
`@@ -1006,7 +1006,7 @@`
`1006`	`1006`	`"default": {`
`1007`	`1007`	`"description": "Error response describing why the operation failed.",`
`1008`	`1008`	`"schema": {`
`1009`		`- "$ref": "#/definitions/ErrorSchema"`
	`1009`	`+ "$ref": "#/definitions/ErrorResponse"`
`1010`	`1010`	`}`
`1011`	`1011`	`}`
`1012`	`1012`	`},`
`@@ -1051,7 +1051,7 @@`
`1051`	`1051`	`"default": {`
`1052`	`1052`	`"description": "Error response describing why the operation failed.",`
`1053`	`1053`	`"schema": {`
`1054`		`- "$ref": "#/definitions/ErrorSchema"`
	`1054`	`+ "$ref": "#/definitions/ErrorResponse"`
`1055`	`1055`	`}`
`1056`	`1056`	`}`
`1057`	`1057`	`},`
`@@ -1099,7 +1099,7 @@`
`1099`	`1099`	`"default": {`
`1100`	`1100`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",`
`1101`	`1101`	`"schema": {`
`1102`		`- "$ref": "#/definitions/ErrorSchema"`
	`1102`	`+ "$ref": "#/definitions/ErrorResponse"`
`1103`	`1103`	`}`
`1104`	`1104`	`}`
`1105`	`1105`	`},`
`@@ -1157,7 +1157,7 @@`
`1157`	`1157`	`"default": {`
`1158`	`1158`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`1159`	`1159`	`"schema": {`
`1160`		`- "$ref": "#/definitions/ErrorSchema"`
	`1160`	`+ "$ref": "#/definitions/ErrorResponse"`
`1161`	`1161`	`}`
`1162`	`1162`	`}`
`1163`	`1163`	`},`
`@@ -1213,7 +1213,7 @@`
`1213`	`1213`	`"default": {`
`1214`	`1214`	`"description": "Error response describing why the operation failed.",`
`1215`	`1215`	`"schema": {`
`1216`		`- "$ref": "#/definitions/ErrorSchema"`
	`1216`	`+ "$ref": "#/definitions/ErrorResponse"`
`1217`	`1217`	`}`
`1218`	`1218`	`}`
`1219`	`1219`	`},`
`@@ -1272,7 +1272,7 @@`
`1272`	`1272`	`"default": {`
`1273`	`1273`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned. If any of the input parameters is wrong, 400(Bad Request) is returned.",`
`1274`	`1274`	`"schema": {`
`1275`		`- "$ref": "#/definitions/ErrorSchema"`
	`1275`	`+ "$ref": "#/definitions/ErrorResponse"`
`1276`	`1276`	`}`
`1277`	`1277`	`}`
`1278`	`1278`	`},`
`@@ -1327,7 +1327,7 @@`
`1327`	`1327`	`"default": {`
`1328`	`1328`	`"description": "Error response describing why the operation failed. If the registry doesn't exist, 404 (Not found) is returned.",`
`1329`	`1329`	`"schema": {`
`1330`		`- "$ref": "#/definitions/ErrorSchema"`
	`1330`	`+ "$ref": "#/definitions/ErrorResponse"`
`1331`	`1331`	`}`
`1332`	`1332`	`}`
`1333`	`1333`	`},`
`@@ -2980,7 +2980,7 @@`
`2980`	`2980`	`},`
`2981`	`2981`	`"x-ms-azure-resource": true`
`2982`	`2982`	`},`
`2983`		`- "Error": {`
	`2983`	`+ "ErrorResponseBody": {`
`2984`	`2984`	`"description": "An error response from the Azure Container Registry service.",`
`2985`	`2985`	`"required": [`
`2986`	`2986`	`"code",`
`@@ -2997,11 +2997,11 @@`
`2997`	`2997`	`}`
`2998`	`2998`	`}`
`2999`	`2999`	`},`
`3000`		`- "ErrorSchema": {`
	`3000`	`+ "ErrorResponse": {`
`3001`	`3001`	`"description": "An error response from the Azure Container Registry service.",`
`3002`	`3002`	`"properties": {`
`3003`	`3003`	`"error": {`
`3004`		`- "$ref": "#/definitions/Error",`
	`3004`	`+ "$ref": "#/definitions/ErrorResponseBody",`
`3005`	`3005`	`"description": "Azure container registry build API error body."`
`3006`	`3006`	`}`
`3007`	`3007`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,7 @@`
`1588`	`1588`	`],`
`1589`	`1589`	`"type": "string",`
`1590`	`1590`	`"x-ms-enum": {`
`1591`		`- "name": "Status",`
	`1591`	`+ "name": "ConnectionStatus",`
`1592`	`1592`	`"modelAsString": true`
`1593`	`1593`	`}`
`1594`	`1594`	`},`