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

Merge c94a12c02d865039e8ce0ad26d8a2007bd398ca9 into 94198ce8fa5271ec6ac290561905ec6f5c9db18c
azure-sdk · May 23, 2022 · 744c589 · 744c589
1 parent 6eb5fbe
commit 744c589
Show file tree

Hide file tree

Showing 5 changed files with 10,578 additions and 12 deletions.
diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json
@@ -1120,6 +1120,12 @@
           "type": "array",
           "items": {
             "oneOf": [
+              {
+                "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
+              },
+              {
+                "$ref": "#/definitions/servers_auditingSettings_childResource"
+              },
               {
                 "$ref": "#/definitions/servers_encryptionProtector_childResource"
               },
@@ -1165,12 +1171,6 @@
               {
                 "$ref": "#/definitions/servers_databases_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
-              },
-              {
-                "$ref": "#/definitions/servers_auditingSettings_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_elasticPools_childResource"
               }
@@ -1381,6 +1381,12 @@
           "type": "array",
           "items": {
             "oneOf": [
+              {
+                "$ref": "#/definitions/servers_databases_extendedAuditingSettings_childResource"
+              },
+              {
+                "$ref": "#/definitions/servers_databases_auditingSettings_childResource"
+              },
               {
                 "$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource"
               },
@@ -1402,12 +1408,6 @@
               {
                 "$ref": "#/definitions/servers_databases_backupShortTermRetentionPolicies_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_databases_extendedAuditingSettings_childResource"
-              },
-              {
-                "$ref": "#/definitions/servers_databases_auditingSettings_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_databases_extensions_childResource"
               },

diff --git a/schemas/2021-08-01-preview/Microsoft.Sql.json b/schemas/2021-08-01-preview/Microsoft.Sql.json
@@ -3599,6 +3599,21 @@
     "DatabaseIdentity": {
       "type": "object",
       "properties": {
+        "delegatedResources": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Delegation"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resources delegated to the database - Internal Use Only"
+        },
         "type": {
           "oneOf": [
             {
@@ -3771,6 +3786,18 @@
           ],
           "description": "Minimal capacity that database will always have allocated, if not paused"
         },
+        "primaryDelegatedIdentityClientId": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only"
+        },
         "readScale": {
           "oneOf": [
             {
@@ -3958,6 +3985,16 @@
       ],
       "description": "Properties of a database Vulnerability Assessment rule baseline."
     },
+    "Delegation": {
+      "type": "object",
+      "properties": {
+        "resourceId": {
+          "type": "string",
+          "description": "The resource id of the source resource - Internal Use Only"
+        }
+      },
+      "description": "Delegated Resource Properties - Internal Use Only"
+    },
     "DistributedAvailabilityGroupProperties": {
       "type": "object",
       "properties": {

diff --git a/schemas/2021-11-01-preview/Microsoft.Sql.json b/schemas/2021-11-01-preview/Microsoft.Sql.json
@@ -3784,6 +3784,21 @@
     "DatabaseIdentity": {
       "type": "object",
       "properties": {
+        "delegatedResources": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Delegation"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resources delegated to the database - Internal Use Only"
+        },
         "type": {
           "oneOf": [
             {
@@ -3956,6 +3971,18 @@
           ],
           "description": "Minimal capacity that database will always have allocated, if not paused"
         },
+        "primaryDelegatedIdentityClientId": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only"
+        },
         "readScale": {
           "oneOf": [
             {
@@ -4143,6 +4170,16 @@
       ],
       "description": "Properties of a database Vulnerability Assessment rule baseline."
     },
+    "Delegation": {
+      "type": "object",
+      "properties": {
+        "resourceId": {
+          "type": "string",
+          "description": "The resource id of the source resource - Internal Use Only"
+        }
+      },
+      "description": "Delegated Resource Properties - Internal Use Only"
+    },
     "DistributedAvailabilityGroupProperties": {
       "type": "object",
       "properties": {