Users/v sparatala/merge all v2 to v1 (#20748)

* Updated SqlPoolTransparentDataEncryptions_CreateOrUpdate ErrorResponse from V2 to V1 * Updated IntegrationRuntimes_ListByWorkspace ErrorResponse from V2 to V1 types json * Updated SqlPoolsDatawareHouseQueries_Get path V2 to V1 * Updated SqlPoolTransparentDataEncryptions_Get ErrorResponse from V2 to V1 * Updated IntegrationRuntimes_Stop ErrorResponse path V2 to V1 * Updated IntegrationRuntimeConnectionInfos_Get ErrorResponse V2 to V1 * Updated Keys_Delete ErrorResponse V2 to V1 types json * Update Keys_CreateOrUpdate ErrorResponse V2 to V1 types json * Fix Lint Error * Fix lint error * Fix lint, model validation error * Fix lint error * Fix Model validation error * Revert "Fix Model validation error" This reverts commit 5513349. * Fix Model validation * Fix Lint errors * Fix Model Validation Error * Fix Lint error * Fix Lint error * Fix lint error * Resolve Model validation error * Fix OBJECT_ADDITIONAL_PROPERTIES error * Fix RESPONSE_SCHEMA_NOT_IN_SPEC error * Revert "Fix Model validation" This reverts commit dcc8c98. * Fix LRO_RESPONSE_HEADER error * Fix R4041 - XmsIdentifierValidation lint error * Fix R4007 - DefaultErrorResponseSchema lint error
Azure · Oct 6, 2022 · 5dbe98c · 5dbe98c
1 parent 6f4e22c
commit 5dbe98c
Show file tree

Hide file tree

Showing 10 changed files with 601 additions and 234 deletions.
diff --git a/...ft.Synapse/preview/2021-06-01-preview/examples/IntegrationRuntimeObjectMetadata_List.json b/...ft.Synapse/preview/2021-06-01-preview/examples/IntegrationRuntimeObjectMetadata_List.json
diff --git a/.../resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/PauseSqlPool.json b/.../resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/PauseSqlPool.json
@@ -8,6 +8,9 @@
   },
   "responses": {
     "200": {
+      "headers": {
+        "azure-asyncoperation": "https://ms.web.azuresynapse.net"
+      },
       "body": {
         "tags": {
           "tagKey1": "TagValue1"
@@ -29,6 +32,30 @@
         }
       }
     },
-    "202": {}
+    "202": {
+      "headers": {
+        "azure-asyncoperation": "https://ms.web.azuresynapse.net"
+      },
+      "body": {
+        "tags": {
+          "tagKey1": "TagValue1"
+        },
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Synapse/workspaces/testsvr/sqlPools/testdwdb",
+        "name": "testdwdb",
+        "type": "Microsoft.Synapse/workspaces/sqlPools",
+        "location": "Japan East",
+        "properties": {
+          "status": "Online",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "maxSizeBytes": 268435456000,
+          "creationDate": "2017-02-10T00:56:19.2Z",
+          "provisioningState": "Succeeded",
+          "restorePointInTime": "0001-01-01T00:00:00Z"
+        },
+        "sku": {
+          "name": "DW100c"
+        }
+      }
+    }
   }
 }
diff --git a/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ResumeSqlPool.json b/...resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ResumeSqlPool.json
@@ -8,6 +8,9 @@
   },
   "responses": {
     "200": {
+      "headers": {
+        "azure-asyncoperation": "https://ms.web.azuresynapse.net"
+      },
       "body": {
         "tags": {
           "tagKey1": "TagValue1"
@@ -29,6 +32,30 @@
         }
       }
     },
-    "202": {}
+    "202": {
+      "headers": {
+        "azure-asyncoperation": "https://ms.web.azuresynapse.net"
+      },
+      "body": {
+        "tags": {
+          "tagKey1": "TagValue1"
+        },
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6852/providers/Microsoft.Synapse/workspaces/sqlcrudtest-2080/sqlPools/sqlcrudtest-9187",
+        "name": "sqlcrudtest-9187",
+        "type": "Microsoft.Synapse/workspaces/sqlPools",
+        "location": "Japan East",
+        "properties": {
+          "status": "Online",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "maxSizeBytes": 268435456000,
+          "creationDate": "2017-02-10T00:56:19.2Z",
+          "provisioningState": "Succeeded",
+          "restorePointInTime": "0001-01-01T00:00:00Z"
+        },
+        "sku": {
+          "name": "DW100c"
+        }
+      }
+    }
   }
 }
diff --git a/...pse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json b/...pse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json
@@ -706,7 +706,7 @@
           "default": {
             "description": "An error response received from the Azure Synapse service.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -760,7 +760,7 @@
           "default": {
             "description": "An error response received from the Azure Synapse service.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -827,6 +827,9 @@
           "application/json"
         ],
         "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
         "x-ms-examples": {
           "Start integration runtime": {
             "$ref": "./examples/IntegrationRuntimes_Start.json"
@@ -1106,6 +1109,9 @@
           "application/json"
         ],
         "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
         "x-ms-examples": {
           "Refresh object metadata": {
             "$ref": "./examples/IntegrationRuntimeObjectMetadata_Refresh.json"
@@ -1577,7 +1583,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/CustomSetupBase"
-          }
+          },
+          "x-ms-identifiers": []
         }
       },
       "additionalProperties": {
@@ -2000,15 +2007,17 @@
           "items": {
             "$ref": "#/definitions/ManagedIntegrationRuntimeNode"
           },
-          "readOnly": true
+          "readOnly": true,
+          "x-ms-identifiers": []
         },
         "otherErrors": {
           "description": "The errors that occurred on this integration runtime.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/ManagedIntegrationRuntimeError"
           },
-          "readOnly": true
+          "readOnly": true,
+          "x-ms-identifiers": []
         },
         "lastOperation": {
           "description": "The last operation result that occurred on this integration runtime.",
@@ -2018,6 +2027,7 @@
       }
     },
     "ManagedIntegrationRuntimeOperationResult": {
+      "type": "object",
       "description": "Properties of managed integration runtime operation result.",
       "properties": {
         "type": {
@@ -2061,6 +2071,7 @@
       }
     },
     "ManagedIntegrationRuntimeNode": {
+      "type": "object",
       "description": "Properties of integration runtime node.",
       "properties": {
         "nodeId": {
@@ -2088,14 +2099,16 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/ManagedIntegrationRuntimeError"
-          }
+          },
+          "x-ms-identifiers": []
         }
       },
       "additionalProperties": {
         "type": "object"
       }
     },
     "ManagedIntegrationRuntimeError": {
+      "type": "object",
       "description": "Error definition for managed integration runtime.",
       "properties": {
         "time": {
@@ -2192,7 +2205,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/SelfHostedIntegrationRuntimeNode"
-          }
+          },
+          "x-ms-identifiers": []
         },
         "scheduledUpdateDate": {
           "description": "The date at which the integration runtime will be scheduled to update, in ISO8601 format.",
@@ -2242,7 +2256,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/LinkedIntegrationRuntime"
-          }
+          },
+          "x-ms-identifiers": []
         },
         "pushedVersion": {
           "description": "The version that the integration runtime is going to update to.",
@@ -2319,6 +2334,7 @@
       }
     },
     "SelfHostedIntegrationRuntimeNode": {
+      "type": "object",
       "description": "Properties of Self-hosted integration runtime node.",
       "properties": {
         "nodeName": {
@@ -2534,7 +2550,8 @@
           "description": "Integration runtime node monitoring data.",
           "items": {
             "$ref": "#/definitions/IntegrationRuntimeNodeMonitoringData"
-          }
+          },
+          "x-ms-identifiers": []
         }
       }
     },
@@ -2893,6 +2910,7 @@
       }
     },
     "IntegrationRuntimeResource": {
+      "type": "object",
       "description": "Integration runtime resource type.",
       "allOf": [
         {
@@ -2901,6 +2919,7 @@
       ],
       "properties": {
         "properties": {
+          "x-ms-client-flatten": true,
           "$ref": "#/definitions/IntegrationRuntime",
           "description": "Integration runtime properties."
         }
@@ -2952,6 +2971,7 @@
       }
     },
     "IntegrationRuntimeStatusResponse": {
+      "type": "object",
       "description": "Integration runtime status response.",
       "properties": {
         "name": {
@@ -2960,6 +2980,7 @@
           "readOnly": true
         },
         "properties": {
+          "x-ms-client-flatten": true,
           "$ref": "#/definitions/IntegrationRuntimeStatus",
           "description": "Integration runtime properties."
         }
@@ -2999,7 +3020,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/IntegrationRuntimeOutboundNetworkDependenciesCategoryEndpoint"
-          }
+          },
+          "x-ms-identifiers": []
         }
       }
     },
@@ -3016,7 +3038,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/IntegrationRuntimeOutboundNetworkDependenciesEndpoint"
-          }
+          },
+          "x-ms-identifiers": []
         }
       }
     },
@@ -3033,7 +3056,8 @@
           "type": "array",
           "items": {
             "$ref": "#/definitions/IntegrationRuntimeOutboundNetworkDependenciesEndpointDetails"
-          }
+          },
+          "x-ms-identifiers": []
         }
       }
     },

diff --git a/...cation/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json b/...cation/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sqlPool.json
@@ -375,6 +375,9 @@
             "description": "OK"
           },
           "202": {
+            "schema": {
+              "$ref": "#/definitions/SqlPool"
+            },
             "description": "Accepted"
           },
           "default": {
@@ -437,6 +440,9 @@
             "description": "OK"
           },
           "202": {
+            "schema": {
+              "$ref": "#/definitions/SqlPool"
+            },
             "description": "Accepted"
           },
           "default": {
@@ -1468,7 +1474,7 @@
           },
           "default": {
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
             },
             "description": ""
           }
@@ -5286,7 +5292,7 @@
           },
           "default": {
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse"
             },
             "description": ""
           }