From 617709984994a379d3352fcfb9896170c25f90d0 Mon Sep 17 00:00:00 2001 From: Wai Sing Wong Date: Wed, 10 Oct 2018 17:00:25 -0700 Subject: [PATCH] Added HDInsight support for MSI --- .../preview/2015-03-01-preview/cluster.json | 56 +++++++++++++++++++ .../preview/2018-06-01-preview/cluster.json | 56 +++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json index 0bbe754530be..23a8571a8a7d 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json @@ -697,6 +697,10 @@ "properties": { "$ref": "#/definitions/ClusterCreateProperties", "description": "The cluster create parameters." + }, + "identity": { + "$ref": "#/definitions/ClusterIdentity", + "description": "The identity of the cluster, if configured." } }, "description": "The CreateCluster request parameters." @@ -860,6 +864,10 @@ "properties": { "$ref": "#/definitions/ClusterGetProperties", "description": "The properties of the cluster." + }, + "identity": { + "$ref": "#/definitions/ClusterIdentity", + "description": "The identity of the cluster, if configured." } }, "description": "The HDInsight cluster." @@ -1018,6 +1026,54 @@ }, "description": "The list runtime script action detail response." }, + "ClusterIdentity": { + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the cluster. This property will only be provided for a system assigned identity." + }, + "type": { + "type": "string", + "description": "The type of identity used for the cluster. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities.", + "enum": [ + "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + }, + "userAssignedIdentities": { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of user assigned identity." + }, + "clientId": { + "readOnly": true, + "type": "string", + "description": "The client id of user assigned identity." + } + } + }, + "description": "The list of user identities associated with the cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." + } + }, + "description": "Identity for the cluster." + }, "ClusterListResult": { "properties": { "value": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json index 2a77e99c11dd..d0d8ed1f9282 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json @@ -697,6 +697,10 @@ "properties": { "$ref": "#/definitions/ClusterCreateProperties", "description": "The cluster create parameters." + }, + "identity": { + "$ref": "#/definitions/ClusterIdentity", + "description": "The identity of the cluster, if configured." } }, "description": "The CreateCluster request parameters." @@ -860,6 +864,10 @@ "properties": { "$ref": "#/definitions/ClusterGetProperties", "description": "The properties of the cluster." + }, + "identity": { + "$ref": "#/definitions/ClusterIdentity", + "description": "The identity of the cluster, if configured." } }, "description": "The HDInsight cluster." @@ -1018,6 +1026,54 @@ }, "description": "The list runtime script action detail response." }, + "ClusterIdentity": { + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of cluster identity. This property will only be provided for a system assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id associated with the cluster. This property will only be provided for a system assigned identity." + }, + "type": { + "type": "string", + "description": "The type of identity used for the cluster. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities.", + "enum": [ + "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + }, + "userAssignedIdentities": { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of user assigned identity." + }, + "clientId": { + "readOnly": true, + "type": "string", + "description": "The client id of user assigned identity." + } + } + }, + "description": "The list of user identities associated with the cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." + } + }, + "description": "Identity for the cluster." + }, "ClusterListResult": { "properties": { "value": {