Dev sql microsoft.sql 2020 11 01 preview minor change (Azure#13689)

* Adds base for updating Microsoft.Sql from version preview/2020-08-01-preview to version 2020-11-01-preview * Updates readme * Updates API version in new specs and examples * Add updated 2020-11-01-preview versions of LongTermRetenionBackups.json and Databases.json (Azure#12146) * add updated databases.json swagger * update readme with new package * v4 -> v5 * add missing chunk in readme * add correct swaggeR * add examples * add correct examplese * remove unreferenced examples * update swagger and examples. add 2020-11 pure package * Fix reference to 2020-08-01 reference to ElasticPools.json * update Databases.json name * update examples * remove nonexistant swagger * fixed reference capitals in readme * update package composite and fix ref to ManagedInstances.jsON * make backupstorageredundancy settings consistent * add requestedBackupStorageRedundancy to properties object in example * add LTR swagger and examples * add LTR Policies swagger and examples * make v5 match v4 * add updated Databses.json * merge conflicts in LTR Policies swagger' * take out comments in readme * taking ImportExport.json out from 2020-11 package * remove duplicate 2020-11 tag in readme * modify Databases_legacy.json to exclude ImportExport-related APIs * add servers.json for IE APIS and remove unused databases examples * fix model & prettier errors; add missing server example * add missing servers examples * fix example to exclude property from server obj * change RecommendedActions definitoins * change tag to composite v4 * Add missing properties for api version 2020-02-02-preview of securityAlertPolicies (Azure#13117) * Add missing properties for api version 2020-02-02-preview * fix checks * fix according to prettier check * Add the change to version 2020-08-01-preview and version 2020-11-01-preview * remove changes in package-lock * Add new line at the end of file * update version 2020-11-01-preview * Update the ref to system data in serverdevopsaudit * add missing point * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * fix the validation errors (Azure#13325) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * Address Private Endpoint validation issues in V3, V2 and V1 SDK tags (Azure#13404) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * Identity/Key/external Admin API (Azure#13411) * Add examples for sql mi remove maintenance configuration (Azure#13390) * Add missing specs 2020 11 01 (Azure#13488) * fix the validation errors * Delete ServerDevOpsAudit.json * fix the validation errors * re add ServerDevOpsAudit.json * address PrivateEndpointConnections.json validation issues in v3, v2 and v1 * add missing specs in 2020-11-01-preview * update the validation errors * update systemData and sync with global common/v1/types.json * update legacy to match the latest database specs * remove RestorableDroppedManagedInstances due to it should be internal * Updated database extensions (Azure#13584) Co-authored-by: Geetha Athreya <geathrey@microsoft.com> Co-authored-by: xaliciayang <59986952+xaliciayang@users.noreply.github.com> Co-authored-by: ayeletshpigelman <ayshpige@microsoft.com> Co-authored-by: strehan1993 <70013163+strehan1993@users.noreply.github.com> Co-authored-by: Ivan Kulezic <72797230+kukislav@users.noreply.github.com> Co-authored-by: Geetha Athreya <43223869+athreya-geetha@users.noreply.github.com> Co-authored-by: Geetha Athreya <geathrey@microsoft.com>
mkarmark · Jul 20, 2021 · 834f3ee · 834f3ee
1 parent efacec1
commit 834f3ee
Show file tree

Hide file tree

Showing 79 changed files with 1,134 additions and 288 deletions.
diff --git a/...ql/preview/2015-05-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json b/...ql/preview/2015-05-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2015-05-01-preview",
+    "parameters": {
+      "properties": {
+        "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen4",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen4"
+        },
+        "properties": {
+          "fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
+          "administratorLogin": "dummylogin",
+          "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+          "state": "Ready",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Default",
+          "dnsZone": "1b4e2caff2530",
+          "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+        },
+        "location": "japaneast",
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...ation/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json b/...ation/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json
@@ -243,6 +243,9 @@
           },
           "Update managed instance with all properties": {
             "$ref": "./examples/ManagedInstanceUpdateMax.json"
+          },
+          "Remove maintenance policy from managed instance (select default maintenance policy)": {
+            "$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
           }
         }
       }

diff --git a/...ql/preview/2018-06-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json b/...ql/preview/2018-06-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2018-06-01-preview",
+    "parameters": {
+      "properties": {
+        "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen4",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen4"
+        },
+        "properties": {
+          "fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
+          "administratorLogin": "dummylogin",
+          "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+          "state": "Ready",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Default",
+          "dnsZone": "1b4e2caff2530",
+          "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+        },
+        "location": "japaneast",
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...ation/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json b/...ation/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json
@@ -289,6 +289,9 @@
           },
           "Update managed instance with all properties": {
             "$ref": "./examples/ManagedInstanceUpdateMax.json"
+          },
+          "Remove maintenance policy from managed instance (select default maintenance policy)": {
+            "$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
           }
         }
       }

diff --git a/...ation/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/ManagedInstances.json b/...ation/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/ManagedInstances.json
@@ -289,6 +289,9 @@
           },
           "Update managed instance with all properties": {
             "$ref": "./examples/ManagedInstanceUpdateMax.json"
+          },
+          "Remove maintenance policy from managed instance (select default maintenance policy)": {
+            "$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
           }
         }
       }

diff --git a/...ql/preview/2020-02-02-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json b/...ql/preview/2020-02-02-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-02-02-preview",
+    "parameters": {
+      "properties": {
+        "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen4",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen4"
+        },
+        "properties": {
+          "fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
+          "administratorLogin": "dummylogin",
+          "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+          "state": "Ready",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Default",
+          "dnsZone": "1b4e2caff2530",
+          "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+        },
+        "location": "japaneast",
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...ion/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/DatabaseExtensions.json b/...ion/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/DatabaseExtensions.json
@@ -88,7 +88,7 @@
             "description": "The database import request parameters.",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/DatabaseExtensionsDefinition"
+              "$ref": "#/definitions/DatabaseExtensions"
             }
           },
           {
@@ -106,7 +106,7 @@
             }
           },
           "default": {
-            "description": "*** Error Responses: ***\n\n * 400 MissingImportExportInputParameters - Missing ImportExport input parameters.\n\n * 400 PolybaseImportAuthenticationTypeNotSupported - Authentication type parameter is not support for PolybaseImport operation.\n\n * 400 DatabaseExtensionsMissingOperationMode - Missing operationMode parameter for database extension.\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 InvalidOperationType - Provide a valid operation type.\n\n * 404 ResourceNotFound - Invalid request specifying a non-existent resource.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ImportExportOperationIdNotFound - The operation Id for import or export cannot be found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 409 ImportExportOperationInProgress - There is an import or export operation in progress on the database."
+            "description": "*** Error Responses: ***\n\n * 400 MissingImportExportInputParameters - Missing ImportExport input parameters.\n\n * 400 PolybaseImportAuthenticationTypeNotSupported - Authentication type parameter is not support for PolybaseImport operation.\n\n * 400 DatabaseExtensionsInvalidOperationMode - Invalid operationMode parameter for database extension.\n\n * 400 DatabaseExtensionsInvalidStorageKeyType - The storage key type must by 'StorageAccessKey'.\n\n * 400 DatabaseExtensionsMissingStorageUri - Storage URI cannot be empty.\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 InvalidOperationType - Provide a valid operation type.\n\n * 400 ImportExportJobError - The ImportExport operation has failed.\n\n * 400 BlockedByOutboundFirewall - The outbound firewall rules blocked the request.\n\n * 404 ResourceNotFound - Invalid request specifying a non-existent resource.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ImportExportOperationIdNotFound - The operation Id for import or export cannot be found.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 409 ImportExportOperationInProgress - There is an import or export operation in progress on the database."
           },
           "202": {
             "description": "Import/Export operation is in progress."
@@ -167,7 +167,8 @@
     }
   },
   "definitions": {
-    "DatabaseExtensionsDefinition": {
+    "DatabaseExtensionsProperties": {
+      "description": "Contains the database information after successful export.",
       "required": [
         "operationMode",
         "storageKeyType",
@@ -218,27 +219,22 @@
           "x-ms-mutability": [
             "create"
           ]
-        },
-        "administratorLogin": {
-          "description": "Administrator login name.",
-          "type": "string",
-          "x-ms-mutability": [
-            "create"
-          ]
-        },
-        "administratorLoginPassword": {
-          "description": "Administrator login password.",
-          "type": "string",
-          "x-ms-mutability": [
-            "create"
-          ]
-        },
-        "authenticationType": {
-          "description": "Authentication type.",
-          "type": "string",
-          "x-ms-mutability": [
-            "create"
-          ]
+        }
+      }
+    },
+    "DatabaseExtensions": {
+      "description": "An export managed database operation result resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/DatabaseExtensionsProperties",
+          "description": "Resource properties.",
+          "x-ms-client-flatten": true
         }
       }
     },

diff --git a/...ation/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/ManagedInstances.json b/...ation/sql/resource-manager/Microsoft.Sql/preview/2020-08-01-preview/ManagedInstances.json
@@ -289,6 +289,9 @@
           },
           "Update managed instance with all properties": {
             "$ref": "./examples/ManagedInstanceUpdateMax.json"
+          },
+          "Remove maintenance policy from managed instance (select default maintenance policy)": {
+            "$ref": "./examples/ManagedInstanceRemoveMaintenanceConfiguration.json"
           }
         }
       }

diff --git a/...r/Microsoft.Sql/preview/2020-08-01-preview/examples/CreateOrUpdateDatabaseExtensions.json b/...r/Microsoft.Sql/preview/2020-08-01-preview/examples/CreateOrUpdateDatabaseExtensions.json
@@ -7,10 +7,12 @@
     "extensionName": "polybaseimport",
     "api-version": "2020-08-01-preview",
     "parameters": {
-      "operationMode": "PolybaseImport",
-      "storageKeyType": "StorageAccessKey",
-      "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
-      "storageUri": "https://teststorage.blob.core.windows.net/testcontainer/Manifest.xml"
+      "properties": {
+        "operationMode": "PolybaseImport",
+        "storageKeyType": "StorageAccessKey",
+        "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+        "storageUri": "https://teststorage.blob.core.windows.net/testcontainer/Manifest.xml"
+      }
     }
   },
   "responses": {

diff --git a/...ql/preview/2020-08-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json b/...ql/preview/2020-08-01-preview/examples/ManagedInstanceRemoveMaintenanceConfiguration.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-08-01-preview",
+    "parameters": {
+      "properties": {
+        "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen4",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen4"
+        },
+        "properties": {
+          "fullyQualifiedDomainName": "testinstance.1b4e2caff2530.database.windows.net",
+          "administratorLogin": "dummylogin",
+          "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+          "state": "Ready",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Default",
+          "dnsZone": "1b4e2caff2530",
+          "maintenanceConfigurationId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default"
+        },
+        "location": "japaneast",
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}