CodeGen from PR 12107 in Azure/azure-rest-api-specs

Merge bb8b96fe56eb7c17aa8442b9fd1995fb915680d8 into 2331a635ead0549b8c0f3891bf9bf2e5e5ad76bc
AzureSDKAutomation · Apr 6, 2021 · 87ca403 · 87ca403
1 parent 2d61c58
commit 87ca403
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 101 deletions.
diff --git a/schemas/2014-04-01/Microsoft.Sql.json b/schemas/2014-04-01/Microsoft.Sql.json
@@ -2641,4 +2641,4 @@
       "description": "Represents the properties of a database transparent data encryption."
     }
   }
-}
+}
diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json
@@ -1635,4 +1635,4 @@
       "description": "Properties of a virtual network rule."
     }
   }
-}
+}
diff --git a/schemas/2017-03-01-preview/Microsoft.Sql.json b/schemas/2017-03-01-preview/Microsoft.Sql.json
@@ -1839,7 +1839,7 @@
           "oneOf": [
             {
               "type": "number",
-              "default": 2
+              "default": 2.0
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2991,4 +2991,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
+}
diff --git a/schemas/2017-10-01-preview/Microsoft.Sql.json b/schemas/2017-10-01-preview/Microsoft.Sql.json
@@ -1101,4 +1101,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
+}
diff --git a/schemas/2018-06-01-preview/Microsoft.Sql.json b/schemas/2018-06-01-preview/Microsoft.Sql.json
@@ -1360,4 +1360,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
+}
diff --git a/schemas/2019-06-01-preview/Microsoft.Sql.json b/schemas/2019-06-01-preview/Microsoft.Sql.json
@@ -1461,4 +1461,4 @@
       "description": "Workload group definition. For more information look at sys.workload_management_workload_groups (DMV)."
     }
   }
-}
+}
diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json
@@ -4280,7 +4280,7 @@
           "oneOf": [
             {
               "type": "number",
-              "default": 2
+              "default": 2.0
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -8335,4 +8335,4 @@
       "description": "Workload group definition. For more information look at sys.workload_management_workload_groups (DMV)."
     }
   }
-}
+}
diff --git a/schemas/2020-08-01-preview/Microsoft.Sql.json b/schemas/2020-08-01-preview/Microsoft.Sql.json
@@ -1650,63 +1650,25 @@
     "servers_databases_extensions": {
       "type": "object",
       "properties": {
-        "administratorLogin": {
-          "type": "string",
-          "description": "Administrator login name."
-        },
-        "administratorLoginPassword": {
-          "type": "string",
-          "description": "Administrator login password."
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2020-08-01-preview"
           ]
         },
-        "authenticationType": {
-          "type": "string",
-          "description": "Authentication type."
-        },
         "name": {
           "type": "string"
         },
-        "operationMode": {
+        "properties": {
           "oneOf": [
             {
-              "type": "string",
-              "enum": [
-                "PolybaseImport"
-              ]
+              "$ref": "#/definitions/DatabaseExtensionsProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Operation Mode."
-        },
-        "storageKey": {
-          "type": "string",
-          "description": "Storage key."
-        },
-        "storageKeyType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SharedAccessKey",
-                "StorageAccessKey"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Storage key type."
-        },
-        "storageUri": {
-          "type": "string",
-          "description": "Storage Uri."
+          "description": "Contains the database information after successful export."
         },
         "type": {
           "type": "string",
@@ -1718,10 +1680,7 @@
       "required": [
         "apiVersion",
         "name",
-        "operationMode",
-        "storageKey",
-        "storageKeyType",
-        "storageUri",
+        "properties",
         "type"
       ],
       "description": "Microsoft.Sql/servers/databases/extensions"
@@ -3275,6 +3234,55 @@
       ],
       "description": "Properties of a database blob auditing policy."
     },
+    "DatabaseExtensionsProperties": {
+      "type": "object",
+      "properties": {
+        "operationMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "PolybaseImport"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Operation Mode."
+        },
+        "storageKey": {
+          "type": "string",
+          "description": "Storage key."
+        },
+        "storageKeyType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SharedAccessKey",
+                "StorageAccessKey"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Storage key type."
+        },
+        "storageUri": {
+          "type": "string",
+          "description": "Storage Uri."
+        }
+      },
+      "required": [
+        "operationMode",
+        "storageKey",
+        "storageKeyType",
+        "storageUri"
+      ],
+      "description": "Contains the database information after successful export."
+    },
     "DatabaseProperties": {
       "type": "object",
       "properties": {
@@ -4396,7 +4404,7 @@
           "oneOf": [
             {
               "type": "number",
-              "default": 2
+              "default": 2.0
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -6744,63 +6752,25 @@
     "servers_databases_extensions_childResource": {
       "type": "object",
       "properties": {
-        "administratorLogin": {
-          "type": "string",
-          "description": "Administrator login name."
-        },
-        "administratorLoginPassword": {
-          "type": "string",
-          "description": "Administrator login password."
-        },
         "apiVersion": {
           "type": "string",
           "enum": [
             "2020-08-01-preview"
           ]
         },
-        "authenticationType": {
-          "type": "string",
-          "description": "Authentication type."
-        },
         "name": {
           "type": "string"
         },
-        "operationMode": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "PolybaseImport"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Operation Mode."
-        },
-        "storageKey": {
-          "type": "string",
-          "description": "Storage key."
-        },
-        "storageKeyType": {
+        "properties": {
           "oneOf": [
             {
-              "type": "string",
-              "enum": [
-                "SharedAccessKey",
-                "StorageAccessKey"
-              ]
+              "$ref": "#/definitions/DatabaseExtensionsProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Storage key type."
-        },
-        "storageUri": {
-          "type": "string",
-          "description": "Storage Uri."
+          "description": "Contains the database information after successful export."
         },
         "type": {
           "type": "string",
@@ -6812,10 +6782,7 @@
       "required": [
         "apiVersion",
         "name",
-        "operationMode",
-        "storageKey",
-        "storageKeyType",
-        "storageUri",
+        "properties",
         "type"
       ],
       "description": "Microsoft.Sql/servers/databases/extensions"
@@ -8541,4 +8508,4 @@
       "description": "Workload group definition. For more information look at sys.workload_management_workload_groups (DMV)."
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2641,4 +2641,4 @@ @@
           "description": "Represents the properties of a database transparent data encryption."
         }
       }
-    }
+    }