Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding User Assigned MI Support for Access Connector Resource #21765

Merged
merged 3 commits into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"connectorName": "myAccessConnector",
"api-version": "2022-10-01-preview",
"identity": {
"type": "SystemAssigned"
},
"parameters": {
"location": "westus"
}
},
"responses": {
"200": {
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector2",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {
"key1": "value1"
},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
},
"201": {
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"connectorName": "myAccessConnector",
"api-version": "2022-10-01-preview",
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuseridentity": {}
}
},
"parameters": {
"location": "westus"
}
},
"responses": {
"200": {
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector2",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {
"key1": "value1"
},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuseridentity": {
"principalId": "329429bc-adec-4dce-9568-25a6d486e468",
"clientId": "329419bc-adec-4dce-9568-25a6d486e468"
}
}
}
}
},
"201": {
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuseridentity": {
"principalId": "329429bc-adec-4dce-9568-25a6d486e468",
"clientId": "329419bc-adec-4dce-9568-25a6d486e468"
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"connectorName": "myAccessConnector",
"resourceGroupName": "rg",
"api-version": "2022-10-01-preview",
"subscriptionId": "subid"
},
"responses": {
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/accessConnectors/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-10-01-preview",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/accessConnectors/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-10-01-preview"
}
},
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"connectorName": "myAccessConnector",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {
"key1": "value1"
},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"connectorName": "myAccessConnector",
"api-version": "2022-10-01-preview",
"parameters": {
"tags": {
"key1": "value1"
}
}
},
"responses": {
"202": {
"headers": {
"Retry-After": "10",
"Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/accessConnectors/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-10-01-preview",
"Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/accessConnectors/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-10-01-preview"
}
},
"200": {
"body": {
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {
"key1": "value1"
},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"name": "myAccessConnector1",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector1",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
},
{
"name": "myAccessConnector",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/accessConnectors/myAccessConnector2",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "7ad2bae1-37d0-413e-91f8-b0b7bef807fc",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"parameters": {
"subscriptionId": "subid",
"api-version": "2022-10-01-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"name": "myAccessConnector1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Databricks/accessConnectors/myAccessConnector1",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "7ad2bae1-37d0-413e-91f8-b0b7bef807fc",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
},
{
"name": "myAccessConnector2",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Databricks/accessConnectors/myAccessConnector2",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "5619ff16-afe1-47e5-ae67-8393c6c3223d",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
},
{
"name": "myAccessConnector3",
"id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Databricks/accessConnectors/myAccessConnector3",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "04b25430-8db1-48a0-9c2f-32270ed63eef",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
},
{
"name": "myAccessConnector4",
"id": "/subscriptions/subid/resourceGroups/rg3/providers/Microsoft.Databricks/accessConnectors/myAccessConnector4",
"type": "Microsoft.Databricks/accessConnectors",
"location": "West US",
"tags": {},
"properties": {
"provisioningState": "Succeeded"
},
"identity": {
"principalId": "4856ceed-0a99-4df7-b9fc-35603650af06",
"tenantId": "e3fe3f22-4b98-4c04-82cc-d8817d1b17da",
"type": "SystemAssigned"
}
}
]
}
}
}
}
28 changes: 27 additions & 1 deletion specification/databricks/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,25 @@ This is the AutoRest configuration file for Databricks.

``` yaml $(java) && $(multiapi)
batch:
- tag: package-2022-10-01-preview
- tag: package-2022-04-01-preview
- tag: package-2021-04-01-preview
- tag: package-2018-04-01
```

### Tag: package-2022-10-01-preview and java

These settings apply only when `--tag=package-2022-10-01-preview --java` is specified on the command line.
Please also specify `--azure-libraries-for-java=<path to the root directory of your azure-sdk-for-java clone>`.

``` yaml $(tag) == 'package-2022-10-01-preview' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.databricks.v2022_10_01_preview
output-folder: $(azure-libraries-for-java-folder)/sdk/databricks/mgmt-v2022_10_01_preview
regenerate-manager: true
generate-interface: true
```

### Tag: package-2022-04-01-preview and java

These settings apply only when `--tag=package-2022-04-01-preview --java` is specified on the command line.
Expand Down Expand Up @@ -77,7 +92,7 @@ These are the global settings for the Databricks API.
title: AzureDatabricksManagementClient
description: 'The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace resources.'
openapi-type: arm
tag: package-2022-04-01-preview
tag: package-2022-10-01-preview
```

### Tag: package-2018-04-01
Expand Down Expand Up @@ -111,6 +126,17 @@ input-file:
- Microsoft.Databricks/preview/2022-04-01-preview/accessconnector.json
```

### Tag: package-2022-10-01-preview

These settings apply only when `--tag=package-2022-10-01-preview` is specified on the command line.

``` yaml $(tag) == 'package-2022-10-01-preview'
input-file:
- Microsoft.Databricks/preview/2022-10-01-preview/accessconnector.json
- Microsoft.Databricks/preview/2022-04-01-preview/databricks.json
- Microsoft.Databricks/preview/2022-04-01-preview/vnetpeering.json
```

---
# Suppressions

Expand Down