Adding swagger files for 2020-02-02-preview API version for ManagedIn…

…stance operation group (#10150) * Adding swagger files for 2020-02-02-preview API version, and updating 2015-05-01-preview API version for ManagedInstnces operation group * Removing changes to 2015-05-01-preview api * Adding changes to readme file * Fixing swagger validation errors * Fixing next set of validation checks. * Removing unreferenced file * Run prettier on managedInstances.json * Run prittier again on managedInstances.json. * Removing parts of code which are not mine, and leaving only what is needed for swagger generation * Adding storageAccountType * Removing privateEndpointConnections from swagger generation * Fixing examples * Adding managedInstances to package-composite-v1,v2 and v3 * Fixing api version in one example * Fix in api version * Fix validation error * Fix another validation error * Fixing ResourceIdentity Co-authored-by: Perica Trajkov <petrajko@microsoft.com>
Azure · Aug 5, 2020 · 5b2d277 · 5b2d277
1 parent e345bb9
commit 5b2d277
Show file tree

Hide file tree

Showing 12 changed files with 1,355 additions and 3 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1483,6 +1483,7 @@ stateful
 staticsite
 statusdir
 stderror
+stdev
 stopresize
 stopword
 stopwords
@@ -1594,6 +1595,8 @@ tombstoned
 toolchain
 toolset
 tooltips
+topqueries
+topquery
 traceback
 traceroute
 trafficmanager

diff --git a/...e-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceCreateMax.json b/...e-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceCreateMax.json
@@ -0,0 +1,104 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-02-02-preview",
+    "parameters": {
+      "tags": {
+        "tagKey1": "TagValue1"
+      },
+      "location": "Japan East",
+      "sku": {
+        "name": "GP_Gen5",
+        "tier": "GeneralPurpose"
+      },
+      "properties": {
+        "administratorLogin": "dummylogin",
+        "administratorLoginPassword": "Un53cuRE!",
+        "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+        "vCores": 8,
+        "storageSizeInGB": 1024,
+        "licenseType": "LicenseIncluded",
+        "collation": "SQL_Latin1_General_CP1_CI_AS",
+        "dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "publicDataEndpointEnabled": false,
+        "proxyOverride": "Redirect",
+        "timezoneId": "UTC",
+        "instancePoolId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
+        "maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen5",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen5"
+        },
+        "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",
+          "provisioningState": "Creating",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Redirect",
+          "dnsZone": "1b4e2caff2530",
+          "timezoneId": "UTC",
+          "instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
+          "maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+        },
+        "location": "japaneast",
+        "tags": {
+          "tagKey1": "TagValue1"
+        },
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "201": {
+      "body": {
+        "sku": {
+          "name": "GP_Gen5",
+          "tier": "GeneralPurpose",
+          "capacity": 8,
+          "family": "Gen5"
+        },
+        "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",
+          "provisioningState": "Creating",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Redirect",
+          "dnsZone": "1b4e2caff2530",
+          "timezoneId": "UTC",
+          "instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/pool1",
+          "maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+        },
+        "location": "japaneast",
+        "tags": {
+          "tagKey1": "TagValue1"
+        },
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...e-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceCreateMin.json b/...e-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceCreateMin.json
@@ -0,0 +1,84 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-02-02-preview",
+    "parameters": {
+      "sku": {
+        "name": "GP_Gen4",
+        "tier": "GeneralPurpose"
+      },
+      "properties": {
+        "administratorLogin": "dummylogin",
+        "administratorLoginPassword": "Un53cuRE!",
+        "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+        "vCores": 8,
+        "storageSizeInGB": 1024,
+        "licenseType": "LicenseIncluded"
+      },
+      "location": "Japan East"
+    }
+  },
+  "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",
+          "provisioningState": "Creating",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Redirect",
+          "dnsZone": "1b4e2caff2530"
+        },
+        "location": "japaneast",
+        "tags": {},
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "201": {
+      "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",
+          "provisioningState": "Creating",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Redirect",
+          "dnsZone": "1b4e2caff2530"
+        },
+        "location": "japaneast",
+        "tags": {},
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...urce-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceDelete.json b/...urce-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceDelete.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-02-02-preview"
+  },
+  "responses": {
+    "200": {},
+    "202": {},
+    "204": {}
+  }
+}
diff --git a/...esource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceGet.json b/...esource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceGet.json
@@ -0,0 +1,43 @@
+{
+  "parameters": {
+    "subscriptionId": "20d7082a-0fc7-4468-82bd-542694d5042b",
+    "resourceGroupName": "testrg",
+    "managedInstanceName": "testinstance",
+    "api-version": "2020-02-02-preview"
+  },
+  "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",
+          "provisioningState": "Succeeded",
+          "vCores": 8,
+          "storageSizeInGB": 1024,
+          "licenseType": "LicenseIncluded",
+          "collation": "SQL_Latin1_General_CP1_CI_AS",
+          "publicDataEndpointEnabled": false,
+          "proxyOverride": "Default",
+          "dnsZone": "1b4e2caff2530",
+          "instancePoolId": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/instancePools/instancePool1",
+          "maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+        },
+        "location": "japaneast",
+        "tags": {
+          "key": "value"
+        },
+        "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
+        "name": "testinstance",
+        "type": "Microsoft.Sql/managedInstances"
+      }
+    }
+  }
+}
diff --git a/...source-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceList.json b/...source-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ManagedInstanceList.json
@@ -0,0 +1,66 @@
+{
+  "parameters": {
+    "subscriptionId": "20D7082A-0FC7-4468-82BD-542694D5042B",
+    "api-version": "2015-05-01-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "location": "japaneast",
+            "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/Test1/providers/Microsoft.Sql/managedInstances/testinstance1",
+            "name": "testinstance1",
+            "type": "Microsoft.Sql/managedInstances",
+            "sku": {
+              "name": "GP_Gen4",
+              "tier": "GeneralPurpose",
+              "capacity": 8,
+              "family": "Gen4"
+            },
+            "properties": {
+              "fullyQualifiedDomainName": "testinstance1.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/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+            }
+          },
+          {
+            "location": "japaneast",
+            "id": "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/Test1/providers/Microsoft.Sql/managedInstances/testinstance2",
+            "name": "testinstance2",
+            "type": "Microsoft.Sql/managedInstances",
+            "sku": {
+              "name": "BC_Gen5",
+              "tier": "BusinessCritical",
+              "capacity": 16,
+              "family": "Gen4"
+            },
+            "properties": {
+              "fullyQualifiedDomainName": "testinstance2.2c3d1bdae3412.database.windows.net",
+              "administratorLogin": "dummylogin",
+              "subnetId": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/subnet2",
+              "state": "Ready",
+              "vCores": 16,
+              "storageSizeInGB": 1024,
+              "licenseType": "Full",
+              "collation": "SQL_Latin1_General_CP1_CI_AS",
+              "publicDataEndpointEnabled": false,
+              "proxyOverride": "Default",
+              "dnsZone": "2c3d1bdae3412",
+              "maintenanceConfigurationId": "/subscriptions/ab0e51c0-83c0-4380-8ae9-025516df392f/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_WestEurope_MI_Mon_Fri_10PM_6AM"
+            }
+          }
+        ]
+      }
+    }
+  }
+}