Changing AD structure so the secret can be created properly (Azure#18507)

sureleo · shul-msft · FredericHeem · commit a185582af67f · 2022-05-16T15:58:40.000+02:00
* Changing AD structure so the secret can be created properly

* update examples

* prettier fix

* Adding descriptions

Co-authored-by: Shuo Li &lt;shul@microsoft.com&gt;
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/CreateOrUpdateSqlManagedInstance.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/CreateOrUpdateSqlManagedInstance.json
@@ -26,6 +26,11 @@
           "username": "username",
           "password": "********"
         },
+        "activeDirectoryInformation": {
+          "keytabInformation": {
+            "keytab": "********"
+          }
+        },
         "licenseType": "LicenseIncluded",
         "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
         "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
@@ -64,6 +69,9 @@
           "basicLoginInformation": {
             "username": "username"
           },
+          "activeDirectoryInformation": {
+            "keytabInformation": {}
+          },
           "licenseType": "LicenseIncluded",
           "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
           "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
@@ -125,6 +133,9 @@
           "basicLoginInformation": {
             "username": "username"
           },
+          "activeDirectoryInformation": {
+            "keytabInformation": {}
+          },
           "licenseType": "LicenseIncluded",
           "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
           "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/GetSqlManagedInstance.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/GetSqlManagedInstance.json
@@ -15,6 +15,9 @@
           "basicLoginInformation": {
             "username": "username"
           },
+          "activeDirectoryInformation": {
+            "keytabInformation": {}
+          },
           "licenseType": "LicenseIncluded",
           "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
           "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/ListByResourceGroupSqlManagedInstance.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/ListByResourceGroupSqlManagedInstance.json
@@ -16,6 +16,9 @@
               "basicLoginInformation": {
                 "username": "username"
               },
+              "activeDirectoryInformation": {
+                "keytabInformation": {}
+              },
               "licenseType": "LicenseIncluded",
               "k8sRaw": {
                 "additionalProperty": 1234,
@@ -73,6 +76,9 @@
               "basicLoginInformation": {
                 "username": "username"
               },
+              "activeDirectoryInformation": {
+                "keytabInformation": {}
+              },
               "licenseType": "LicenseIncluded",
               "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
               "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/ListSubscriptionSqlManagedInstance.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/ListSubscriptionSqlManagedInstance.json
@@ -15,6 +15,9 @@
               "basicLoginInformation": {
                 "username": "username"
               },
+              "activeDirectoryInformation": {
+                "keytabInformation": {}
+              },
               "licenseType": "LicenseIncluded",
               "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
               "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
@@ -74,6 +77,9 @@
               "basicLoginInformation": {
                 "username": "username"
               },
+              "activeDirectoryInformation": {
+                "keytabInformation": {}
+              },
               "licenseType": "LicenseIncluded",
               "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
               "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/UpdateSqlManagedInstance.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/examples/UpdateSqlManagedInstance.json
@@ -20,6 +20,9 @@
           "basicLoginInformation": {
             "username": "username"
           },
+          "activeDirectoryInformation": {
+            "keytabInformation": {}
+          },
           "licenseType": "LicenseIncluded",
           "clusterId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s",
           "extensionId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Kubernetes/connectedClusters/connectedk8s/providers/Microsoft.KubernetesConfiguration/extensions/extension",
diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/sqlManagedInstances.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2022-03-01-preview/sqlManagedInstances.json
@@ -123,14 +123,10 @@
           "readOnly": true,
           "description": "The provisioning state of the Arc-enabled SQL Managed Instance resource."
         },
-        "keytab": {
-          "type": "string",
-          "description": "A base64-encoded keytab.",
-          "x-ms-mutability": [
-            "create",
-            "update"
-          ],
-          "x-ms-secret": true
+        "activeDirectoryInformation": {
+          "type": "object",
+          "description": "Active Directory information related to this SQL Managed Instance.",
+          "$ref": "#/definitions/ActiveDirectoryInformation"
         },
         "licenseType": {
           "type": "string",
@@ -245,6 +241,32 @@
         "type": "object"
       }
     },
+    "KeytabInformation": {
+      "type": "object",
+      "description": "Keytab used for authenticate with Active Directory.",
+      "properties": {
+        "keytab": {
+          "type": "string",
+          "description": "A base64-encoded keytab.",
+          "x-ms-mutability": [
+            "create",
+            "update"
+          ],
+          "x-ms-secret": true
+        }
+      }
+    },
+    "ActiveDirectoryInformation": {
+      "type": "object",
+      "description": "Active Directory information that related to the resource.",
+      "properties": {
+        "keytabInformation": {
+          "type": "object",
+          "description": "Keytab information that is used for the Sql Managed Instance when Active Directory authentication is used.",
+          "$ref": "#/definitions/KeytabInformation"
+        }
+      }
+    },
     "SqlManagedInstanceListResult": {
       "description": "A list of SqlManagedInstance.",
       "type": "object",
