From 23fa7b370f95286b4987223a53a8846594dec067 Mon Sep 17 00:00:00 2001 From: Anirudh Kanjani Date: Thu, 2 Dec 2021 14:58:38 -0800 Subject: [PATCH 1/4] Adding UAMI properties to the swagger --- .../stable/2021-07-01/purview.json | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json index ee7b6c4d43bc..bc3f64bab62e 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json +++ b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json @@ -1168,13 +1168,22 @@ "type": { "description": "Identity Type", "enum": [ - "SystemAssigned" + "None", + "SystemAssigned", + "UserAssigned" ], "type": "string", "x-ms-enum": { "name": "type", "modelAsString": true } + }, + "userAssignedIdentities": { + "description": "User Assigned Identities", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/UserAssignedIdentity" + } } } }, @@ -1237,6 +1246,7 @@ } }, "CloudConnectors": { + "description": "External Cloud Service connectors", "type": "object", "properties": { "awsExternalId": { @@ -1304,6 +1314,22 @@ } } }, + "UserAssignedIdentity": { + "description": "Uses client ID and Principal ID", + "type": "object", + "properties": { + "clientId": { + "description": "Gets or Sets Client ID", + "type": "string", + "readOnly": true + }, + "principalId": { + "description": "Gets or Sets Principal ID", + "type": "string", + "readOnly": true + } + } + }, "PrivateEndpointConnectionProperties": { "description": "A private endpoint connection properties class.", "type": "object", @@ -1411,6 +1437,10 @@ "description": "The account update properties.", "type": "object", "properties": { + "identity": { + "$ref": "#/definitions/Identity", + "description": "Identity related info to add/remove userAssignedIdentities." + }, "properties": { "$ref": "#/definitions/AccountProperties", "description": "The account properties." From 3486c635d50b636458062d035b7cdf7d015d4a35 Mon Sep 17 00:00:00 2001 From: ankanjan <58195759+ankanjan@users.noreply.github.com> Date: Thu, 9 Dec 2021 11:38:22 -0800 Subject: [PATCH 2/4] Update readme.go.md --- specification/purview/resource-manager/readme.go.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/specification/purview/resource-manager/readme.go.md b/specification/purview/resource-manager/readme.go.md index 04b2fac24010..8a58f44df3e9 100644 --- a/specification/purview/resource-manager/readme.go.md +++ b/specification/purview/resource-manager/readme.go.md @@ -14,16 +14,6 @@ go: ``` yaml $(go) && $(multiapi) batch: - tag: package-2021-07-01 - - tag: package-2020-12-01-preview -``` - -### Tag: package-2020-12-01-preview and go - -These settings apply only when `--tag=package-2020-12-01-preview --go` is specified on the command line. -Please also specify `--go-sdk-folder=`. - -``` yaml $(tag) == 'package-2020-12-01-preview' && $(go) -output-folder: $(go-sdk-folder)/services/preview/purview/mgmt/2020-12-01-preview/$(namespace) ``` ### Tag: package-2021-07-01 and go From 4778ee01af7c88d117f481ac7d5c61cc7ad50f72 Mon Sep 17 00:00:00 2001 From: Anirudh Kanjani Date: Thu, 9 Dec 2021 11:44:55 -0800 Subject: [PATCH 3/4] fixing invalid exmaples of uuid --- .../2020-12-01-preview/examples/DefaultAccounts_Get.json | 8 ++++---- .../examples/DefaultAccounts_Remove.json | 4 ++-- .../2020-12-01-preview/examples/DefaultAccounts_Set.json | 8 ++++---- .../stable/2021-07-01/examples/DefaultAccounts_Get.json | 8 ++++---- .../2021-07-01/examples/DefaultAccounts_Remove.json | 4 ++-- .../stable/2021-07-01/examples/DefaultAccounts_Set.json | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Get.json b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Get.json index 6be71ccef927..ddbd87eab65f 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Get.json +++ b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Get.json @@ -1,8 +1,8 @@ { "parameters": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "api-version": "2018-12-01-preview" }, "responses": { @@ -15,9 +15,9 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" diff --git a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Remove.json b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Remove.json index 893ab866cad6..41205d7f0717 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Remove.json +++ b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Remove.json @@ -1,8 +1,8 @@ { "parameters": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "api-version": "2018-12-01-preview" }, "responses": { diff --git a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Set.json b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Set.json index 18a71159e68b..71441bc0dffd 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Set.json +++ b/specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/DefaultAccounts_Set.json @@ -2,9 +2,9 @@ "parameters": { "api-version": "2018-12-01-preview", "defaultAccountPayload": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" @@ -20,9 +20,9 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" diff --git a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Get.json b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Get.json index bdba6b4798cb..39c5511b45d4 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Get.json +++ b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Get.json @@ -1,8 +1,8 @@ { "parameters": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "api-version": "2021-07-01" }, "responses": { @@ -15,9 +15,9 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" diff --git a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Remove.json b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Remove.json index 55661cde2117..19450aea3309 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Remove.json +++ b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Remove.json @@ -1,8 +1,8 @@ { "parameters": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "api-version": "2021-07-01" }, "responses": { diff --git a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Set.json b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Set.json index dcbf3c21bfb6..66805be281c6 100644 --- a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Set.json +++ b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/DefaultAccounts_Set.json @@ -2,9 +2,9 @@ "parameters": { "api-version": "2021-07-01", "defaultAccountPayload": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" @@ -20,9 +20,9 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "scopeTenantId": "12345678-1234-1234-12345678abc", + "scopeTenantId": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "scopeType": "Tenant", - "scope": "12345678-1234-1234-12345678abc", + "scope": "11733A4E-BA84-46FF-91D1-AFF1A3215A90", "accountName": "myDefaultAccount", "resourceGroupName": "rg-1", "subscriptionId": "12345678-1234-1234-12345678aaa" From 9996faa906ce5ada0b037dad740960952efa8dc5 Mon Sep 17 00:00:00 2001 From: ankanjan <58195759+ankanjan@users.noreply.github.com> Date: Mon, 13 Dec 2021 10:05:12 -0800 Subject: [PATCH 4/4] Update readme.go.md --- specification/purview/resource-manager/readme.go.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/purview/resource-manager/readme.go.md b/specification/purview/resource-manager/readme.go.md index 8a58f44df3e9..04b2fac24010 100644 --- a/specification/purview/resource-manager/readme.go.md +++ b/specification/purview/resource-manager/readme.go.md @@ -14,6 +14,16 @@ go: ``` yaml $(go) && $(multiapi) batch: - tag: package-2021-07-01 + - tag: package-2020-12-01-preview +``` + +### Tag: package-2020-12-01-preview and go + +These settings apply only when `--tag=package-2020-12-01-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-12-01-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/purview/mgmt/2020-12-01-preview/$(namespace) ``` ### Tag: package-2021-07-01 and go