From 878c763638b96fa6d4e6f40d825b9f7f13a968fe Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Tue, 10 Mar 2020 14:37:09 +0530 Subject: [PATCH 01/17] Added GEt-privateLinkResources API and managedIdentity changes for Vaults --- .../stable/2016-06-01/examples/GETVault.json | 27 +- .../examples/GetPrivateLinkResource.json | 34 +++ .../examples/ListPrivateLinkResources.json | 56 ++++ .../stable/2016-06-01/examples/PUTVault.json | 15 +- .../stable/2016-06-01/vaults.json | 275 +++++++++++++++++- 5 files changed, 389 insertions(+), 18 deletions(-) create mode 100644 specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json create mode 100644 specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json index 501c08fe4a58..64cc2e1f7ca1 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json @@ -14,8 +14,31 @@ "tags": { "TestUpdatedKey": "TestUpdatedValue" }, + "identity": { + "tenantId": "d676e86e-2206-4a7c-999c-ece52c144b5b", + "principalId": "3137d6c7-5d6c-411c-b934-7a2a729ee247", + "type": "SystemAssigned" + }, "properties": { - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "privateEndpointConnections": [ + { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/Default-RecoveryServices-ResourceGroup/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateEndpointConnections/pe114-pemsi-ecy-rsv.5944358949303501042.backup.75061caa-cba4-4849-8e09-608da4914aad", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/Default-RecoveryServices-ResourceGroup/providers/Microsoft.Network/privateEndpoints/pe114-pemsi-ecy-rsv" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "None", + "actionsRequired": "None" + } + } + } + ], + "privateEndpointStateForBackup": "Enabled", + "privateEndpointStateForSiteRecovery": "None" }, "id": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/Default-RecoveryServices-ResourceGroup/providers/Microsoft.RecoveryServices/vaults/swaggerExample", "type": "Microsoft.RecoveryServices/vaults", @@ -25,4 +48,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json new file mode 100644 index 000000000000..27c225c76b01 --- /dev/null +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "subscriptionId": "6c48fa17-39c7-45f1-90ac-47a587128ace", + "resourceGroupName": "petesting", + "vaultName": "pemsi-ecy-rsv2", + "api-version": "2016-06-01", + "privateLinkResourceName": "backupResource" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", + "name": "backupResource", + "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } + } + } +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json new file mode 100644 index 000000000000..74641b8f9f13 --- /dev/null +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "subscriptionId": "6c48fa17-39c7-45f1-90ac-47a587128ace", + "resourceGroupName": "petesting", + "vaultName": "pemsi-ecy-rsv2", + "api-version": "2016-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", + "name": "backupResource", + "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + }, + { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", + "name": "siteRecoveryResource", + "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", + "groupId": "AzureSiteRecovery", + "requiredMembers": [ + "siteRecovery-rcm1", + "siteRecovery-prot2", + "siteRecovery-tel1", + "siteRecovery-srs1", + "siteRecovery-prot2b", + "siteRecovery-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.siterecovery.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } + ] + } + } + } +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json index d2a9dca8334c..05d5b667f2c7 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json @@ -9,7 +9,10 @@ "sku": { "name": "Standard" }, - "location": "West US" + "location": "West US", + "identity":{ + "type": "SystemAssigned" + } } }, "responses": { @@ -21,6 +24,11 @@ "tags": { "TestUpdatedKey": "TestUpdatedValue" }, + "identity": { + "tenantId": "d676e86e-2206-4a7c-999c-ece52c144b5b", + "principalId": "3137d6c7-5d6c-411c-b934-7a2a729ee247", + "type": "SystemAssigned" + }, "properties": { "provisioningState": "Succeeded" }, @@ -39,6 +47,11 @@ "tags": { "TestUpdatedKey": "TestUpdatedValue" }, + "identity": { + "tenantId": "d676e86e-2206-4a7c-999c-ece52c144b5b", + "principalId": "3137d6c7-5d6c-411c-b934-7a2a729ee247", + "type": "SystemAssigned" + }, "properties": { "provisioningState": "Succeeded" }, diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index fba28afd72a3..d12930b74e50 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -18,6 +18,96 @@ "application/json" ], "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources": { + "get": { + "tags": [ + "ListPrivateLinkResources" + ], + "summary": "Returns the list of private link resources that need to be created for Backup and SiteRecovery", + "operationId": "PrivateLinkResources_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/PrivateLinkResources" + } + } + }, + "deprecated": false, + "x-ms-pageable": { + "nextLinkName": "nextLink", + "itemName": "value" + }, + "x-ms-examples": { + "List PrivateLinkResources": { + "$ref": "./examples/ListPrivateLinkResources.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/{privateLinkResourceName}": { + "get": { + "tags": [ + "GetPrivateLinkResource" + ], + "summary": "Returns a specified private link resource that need to be created for Backup and SiteRecovery", + "operationId": "PrivateLinkResource_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/VaultName" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "name": "privateLinkResourceName", + "in": "path", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + }, + "deprecated": false, + "x-ms-examples": { + "Get PrivateLinkResource": { + "$ref": "./examples/GetPrivateLinkResource.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/locations/{location}/checkNameAvailability": { "post": { "tags": [ @@ -62,7 +152,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/CheckNameAvailabilityResultResource" + "$ref": "#/definitions/CheckNameAvailabilityResult" } } }, @@ -548,20 +638,6 @@ } } }, - "CheckNameAvailabilityResultResource": { - "description": "Response for check name availability API. Resource provider will set availability as true | false.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "properties": { - "$ref": "#/definitions/CheckNameAvailabilityResult", - "description": "CheckNameAvailabilityResultResource properties" - } - } - }, "ClientDiscoveryDisplay": { "description": "Localized display information of an operation.", "type": "object", @@ -839,6 +915,9 @@ } ], "properties": { + "identity": { + "$ref": "#/definitions/IdentityData" + }, "properties": { "$ref": "#/definitions/VaultProperties" }, @@ -928,6 +1007,172 @@ }, "upgradeDetails": { "$ref": "#/definitions/UpgradeDetails" + }, + "privateEndpointConnections": { + "type": "array", + "items":{ + "$ref": "#/definitions/PrivateEndpointConnectionVaultProperties" + }, + "description": "List of private endpoint connection.", + "readOnly": true + }, + "privateEndpointStateForBackup": { + "description": "Private endpoint state for backup.", + "enum": [ + "None", + "Enabled" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "VaultPrivateEndpointState", + "modelAsString": true + } + }, + "privateEndpointStateForSiteRecovery": { + "description": "Private endpoint state for site recovery.", + "enum": [ + "None", + "Enabled" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "VaultPrivateEndpointState", + "modelAsString": true + } + } + } + }, + "IdentityData": { + "description": "Managed Identity Data, as received from ARM headers.", + "required": [ + "type" + ], + "type": "object", + "properties": { + "tenantId": { + "description": "The tenant Id header.", + "type": "string" + }, + "principalId": { + "description": "The principal Id header.", + "type": "string" + }, + "type": { + "description": "The Identity type, can be SystemAssigned/UserAssigned/None.", + "type": "string" + } + } + }, + "PrivateEndpointConnectionVaultProperties": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "properties": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + }, + "PrivateEndpointConnection": { + "type": "object", + "properties": { + "provisioningState": { + "enum": [ + "Succeeded", + "Deleting", + "Failed", + "Pending" + ], + "type": "string", + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + } + }, + "privateEndpoint": { + "$ref": "#/definitions/PrivateEndpoint" + }, + "privateLinkServiceConnectionState": { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + } + } + }, + "PrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "type": "string" + } + } + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "status": { + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ], + "type": "string", + "x-ms-enum": { + "name": "PrivateEndpointConnectionStatus", + "modelAsString": true + } + }, + "description": { + "type": "string" + }, + "actionsRequired": { + "type": "string" + } + } + }, + "PrivateLinkResources": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + }, + "nextLink": { + "description": "Link to the next chunk of the response", + "type": "string" + } + } + }, + "PrivateLinkResource": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "groupId": { + "type": "string" + }, + "requiredMembers": { + "type": "array", + "items": { + "type": "string" + } + }, + "requiredZoneNames": { + "type": "array", + "items": { + "type": "string" + } } } } From febcec437288f170c5d2828f6a3999b9119488da Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Thu, 12 Mar 2020 13:00:49 +0530 Subject: [PATCH 02/17] Fixed PrettierCheck failure --- .../stable/2016-06-01/examples/GETVault.json | 2 +- .../examples/GetPrivateLinkResource.json | 38 ++++----- .../examples/ListPrivateLinkResources.json | 80 +++++++++---------- .../stable/2016-06-01/examples/PUTVault.json | 2 +- .../stable/2016-06-01/vaults.json | 14 ++-- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json index 64cc2e1f7ca1..3d2afa463e73 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GETVault.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json index 27c225c76b01..cc21cb636208 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -9,25 +9,25 @@ "responses": { "200": { "body": { - "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", - "name": "backupResource", - "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", + "name": "backupResource", + "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] } } } diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json index 74641b8f9f13..d5d6d3c2acb0 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -9,46 +9,46 @@ "200": { "body": { "value": [ - { - "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", - "name": "backupResource", - "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] - }, - { - "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", - "name": "siteRecoveryResource", - "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", - "groupId": "AzureSiteRecovery", - "requiredMembers": [ - "siteRecovery-rcm1", - "siteRecovery-prot2", - "siteRecovery-tel1", - "siteRecovery-srs1", - "siteRecovery-prot2b", - "siteRecovery-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.siterecovery.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] - } + { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", + "name": "backupResource", + "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + }, + { + "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", + "name": "siteRecoveryResource", + "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", + "groupId": "AzureSiteRecovery", + "requiredMembers": [ + "siteRecovery-rcm1", + "siteRecovery-prot2", + "siteRecovery-tel1", + "siteRecovery-srs1", + "siteRecovery-prot2b", + "siteRecovery-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.siterecovery.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } ] } } diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json index 05d5b667f2c7..9f7a754d4a1c 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/PUTVault.json @@ -10,7 +10,7 @@ "name": "Standard" }, "location": "West US", - "identity":{ + "identity": { "type": "SystemAssigned" } } diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index d12930b74e50..d7ee8be74121 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -56,9 +56,9 @@ "itemName": "value" }, "x-ms-examples": { - "List PrivateLinkResources": { + "List PrivateLinkResources": { "$ref": "./examples/ListPrivateLinkResources.json" - } + } } } }, @@ -104,8 +104,8 @@ "x-ms-examples": { "Get PrivateLinkResource": { "$ref": "./examples/GetPrivateLinkResource.json" - } - } + } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/locations/{location}/checkNameAvailability": { @@ -1010,12 +1010,12 @@ }, "privateEndpointConnections": { "type": "array", - "items":{ - "$ref": "#/definitions/PrivateEndpointConnectionVaultProperties" + "items": { + "$ref": "#/definitions/PrivateEndpointConnectionVaultProperties" }, "description": "List of private endpoint connection.", "readOnly": true - }, + }, "privateEndpointStateForBackup": { "description": "Private endpoint state for backup.", "enum": [ From 1398ace6be925591390277b2585c29fbc128f5f7 Mon Sep 17 00:00:00 2001 From: asmaskar Date: Tue, 17 Mar 2020 15:02:32 +0530 Subject: [PATCH 03/17] Update vaults.json --- .../stable/2016-06-01/vaults.json | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index d7ee8be74121..e2659714970c 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1045,23 +1045,29 @@ } }, "IdentityData": { - "description": "Managed Identity Data, as received from ARM headers.", - "required": [ - "type" - ], - "type": "object", + "description": "Identity for the resource.", "properties": { - "tenantId": { - "description": "The tenant Id header.", - "type": "string" - }, "principalId": { - "description": "The principal Id header.", - "type": "string" + "readOnly": true, + "type": "string", + "description": "The principal ID of resource identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant ID of resource." }, "type": { - "description": "The Identity type, can be SystemAssigned/UserAssigned/None.", - "type": "string" + "type": "string", + "description": "The identity type.", + "enum": [ + "SystemAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } } } }, From ac995f7b85bc4c8b69631a8f6f7bb4e30f0c239c Mon Sep 17 00:00:00 2001 From: asmaskar Date: Tue, 17 Mar 2020 15:26:58 +0530 Subject: [PATCH 04/17] Update vaults.json --- .../stable/2016-06-01/vaults.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index e2659714970c..6b2a485f1bdf 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1045,6 +1045,10 @@ } }, "IdentityData": { + "required": [ + "type" + ], + "type": "object", "description": "Identity for the resource.", "properties": { "principalId": { @@ -1066,7 +1070,7 @@ ], "x-ms-enum": { "name": "ResourceIdentityType", - "modelAsString": false + "modelAsString": true } } } From 862070147adf811cca7764c5c0ddc3ec0b37b530 Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Tue, 17 Mar 2020 18:53:05 +0530 Subject: [PATCH 05/17] Resolved PR commens related to PrivateLinkResources --- .../stable/2016-06-01/vaults.json | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index d7ee8be74121..e08078f6d69b 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1066,9 +1066,13 @@ } }, "PrivateEndpointConnectionVaultProperties": { + "description": "Information to be stored in Vault properties as an element of privateEndpointConnections List. It is to be returned to RRP from BMS as response of PUT PECP and PUT PEC calls.", + "readOnly": true, "type": "object", "properties": { "id": { + "description": "Format of id subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.[Service]/{resource}/{resourceName}/privateEndpointConnections/{connectionName}.", + "readOnly": true, "type": "string" }, "properties": { @@ -1077,9 +1081,13 @@ } }, "PrivateEndpointConnection": { + "description": "Private Endpoint Connection Response Properties.", + "readOnly": true, "type": "object", "properties": { "provisioningState": { + "description": "Gets or sets provisioning state of the private endpoint connection.", + "readOnly": true, "enum": [ "Succeeded", "Deleting", @@ -1101,17 +1109,25 @@ } }, "PrivateEndpoint": { + "description": "The Private Endpoint network resource that is linked to the Private Endpoint connection.", + "readOnly": true, "type": "object", "properties": { "id": { + "description": "Gets or sets id.", + "readOnly": true, "type": "string" } } }, "PrivateLinkServiceConnectionState": { + "description": "Gets or sets private link service connection state.", + "readOnly": true, "type": "object", "properties": { "status": { + "description": "Gets or sets the status.", + "readOnly": true, "enum": [ "Pending", "Approved", @@ -1125,14 +1141,19 @@ } }, "description": { + "description": "Gets or sets description.", + "readOnly": true, "type": "string" }, "actionsRequired": { + "description": "Gets or sets actions required.", + "readOnly": true, "type": "string" } } }, "PrivateLinkResources": { + "description": "Class which represent the stamps associated with the vault.", "type": "object", "properties": { "value": { @@ -1148,27 +1169,34 @@ } }, "PrivateLinkResource": { + "description": "Private Link Resource.", "type": "object", "properties": { "id": { + "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", "type": "string" }, "name": { + "description": "e.g. backupresource or siterecoveryresource.", "type": "string" }, "type": { + "description": "e.g. Microsoft.RecoveryServices/vaults/privateLinkResources", "type": "string" }, "groupId": { + "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", "type": "string" }, "requiredMembers": { + "description": "[backup-ecs1, backup-prot1, backup-prot1b, backup-prot1c, backup-id1]", "type": "array", "items": { "type": "string" } }, "requiredZoneNames": { + "description": "eg - [privatelink.eus.backup.windowsazure.com, privatelink.queue.core.windows.net]", "type": "array", "items": { "type": "string" From 197c62c627a66cde25cd9cf346d46a43787c7507 Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Wed, 18 Mar 2020 15:55:48 +0530 Subject: [PATCH 06/17] Resolved PR comments --- .../stable/2016-06-01/vaults.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index f2bcfa1f5ece..c57a83fcd528 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1164,6 +1164,7 @@ }, "PrivateLinkResources": { "description": "Class which represent the stamps associated with the vault.", + "readOnly": true, "type": "object", "properties": { "value": { @@ -1180,26 +1181,32 @@ }, "PrivateLinkResource": { "description": "Private Link Resource.", + "readOnly": true, "type": "object", "properties": { "id": { "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", - "type": "string" + "type": "string", + "readOnly": true }, "name": { "description": "e.g. backupresource or siterecoveryresource.", - "type": "string" + "type": "string", + "readOnly": true }, "type": { "description": "e.g. Microsoft.RecoveryServices/vaults/privateLinkResources", + "readOnly": true, "type": "string" }, "groupId": { "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", + "readOnly": true, "type": "string" }, "requiredMembers": { "description": "[backup-ecs1, backup-prot1, backup-prot1b, backup-prot1c, backup-id1]", + "readOnly": true, "type": "array", "items": { "type": "string" @@ -1207,6 +1214,7 @@ }, "requiredZoneNames": { "description": "eg - [privatelink.eus.backup.windowsazure.com, privatelink.queue.core.windows.net]", + "readOnly": true, "type": "array", "items": { "type": "string" From 7c5f2590bb0f958e739f2e22a0dd976ad0aa01f2 Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Thu, 26 Mar 2020 15:19:51 +0530 Subject: [PATCH 07/17] resolved PR comments --- .../Microsoft.RecoveryServices/stable/2016-06-01/vaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index c57a83fcd528..190a4a0f26bb 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1076,7 +1076,7 @@ } }, "PrivateEndpointConnectionVaultProperties": { - "description": "Information to be stored in Vault properties as an element of privateEndpointConnections List. It is to be returned to RRP from BMS as response of PUT PECP and PUT PEC calls.", + "description": "Information to be stored in Vault properties as an element of privateEndpointConnections List.", "readOnly": true, "type": "object", "properties": { From 31ba2d0ec394b13bdf9e41dc249d1a0d769206b2 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 16:42:32 +0530 Subject: [PATCH 08/17] Using x-ms-client-flatten for PrivateLinkResourceProperties --- .../stable/2016-06-01/vaults.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index 190a4a0f26bb..d9ee51100667 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1168,6 +1168,7 @@ "type": "object", "properties": { "value": { + "description": "A collection of private link resources", "type": "array", "items": { "$ref": "#/definitions/PrivateLinkResource" @@ -1180,10 +1181,15 @@ } }, "PrivateLinkResource": { - "description": "Private Link Resource.", + "description": "Information of the private link resource.", "readOnly": true, "type": "object", "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Properties of the private link resource.", + "x-ms-client-flatten": true + }, "id": { "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", "type": "string", @@ -1198,7 +1204,12 @@ "description": "e.g. Microsoft.RecoveryServices/vaults/privateLinkResources", "readOnly": true, "type": "string" - }, + } + } + }, + "PrivateLinkResourceProperties": { + "type": "object", + "properties": { "groupId": { "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", "readOnly": true, @@ -1273,4 +1284,4 @@ ] } ] -} +} \ No newline at end of file From b0d62a2886af2d771e23c4808781865aef36cd6d Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 18:47:00 +0530 Subject: [PATCH 09/17] Fixing examples for PrivateLinkResources --- .../examples/GetPrivateLinkResource.json | 36 +++++----- .../examples/ListPrivateLinkResources.json | 66 ++++++++++--------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json index cc21cb636208..7664fad619a7 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -12,23 +12,25 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } } } } -} +} \ No newline at end of file diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json index d5d6d3c2acb0..95d51038ecb3 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -13,44 +13,48 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } }, { "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", "name": "siteRecoveryResource", "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", - "groupId": "AzureSiteRecovery", - "requiredMembers": [ - "siteRecovery-rcm1", - "siteRecovery-prot2", - "siteRecovery-tel1", - "siteRecovery-srs1", - "siteRecovery-prot2b", - "siteRecovery-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.siterecovery.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureSiteRecovery", + "requiredMembers": [ + "siteRecovery-rcm1", + "siteRecovery-prot2", + "siteRecovery-tel1", + "siteRecovery-srs1", + "siteRecovery-prot2b", + "siteRecovery-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.siterecovery.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } } ] } } } -} +} \ No newline at end of file From 61715d3f1182f311a61bef1d6a397b80dec1a9d1 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 19:05:22 +0530 Subject: [PATCH 10/17] Revert "Fixing examples for PrivateLinkResources" This reverts commit b0d62a2886af2d771e23c4808781865aef36cd6d. --- .../examples/GetPrivateLinkResource.json | 36 +++++----- .../examples/ListPrivateLinkResources.json | 66 +++++++++---------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json index 7664fad619a7..cc21cb636208 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -12,25 +12,23 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "properties": { - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] - } + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] } } } -} \ No newline at end of file +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json index 95d51038ecb3..d5d6d3c2acb0 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -13,48 +13,44 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "properties": { - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] - } + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] }, { "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", "name": "siteRecoveryResource", "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", - "properties": { - "groupId": "AzureSiteRecovery", - "requiredMembers": [ - "siteRecovery-rcm1", - "siteRecovery-prot2", - "siteRecovery-tel1", - "siteRecovery-srs1", - "siteRecovery-prot2b", - "siteRecovery-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.siterecovery.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] - } + "groupId": "AzureSiteRecovery", + "requiredMembers": [ + "siteRecovery-rcm1", + "siteRecovery-prot2", + "siteRecovery-tel1", + "siteRecovery-srs1", + "siteRecovery-prot2b", + "siteRecovery-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.siterecovery.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] } ] } } } -} \ No newline at end of file +} From b9d93e047399d039c04b53483cdb69ad14138cb6 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 19:05:45 +0530 Subject: [PATCH 11/17] Revert "Using x-ms-client-flatten for PrivateLinkResourceProperties" This reverts commit 31ba2d0ec394b13bdf9e41dc249d1a0d769206b2. --- .../stable/2016-06-01/vaults.json | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index d9ee51100667..190a4a0f26bb 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1168,7 +1168,6 @@ "type": "object", "properties": { "value": { - "description": "A collection of private link resources", "type": "array", "items": { "$ref": "#/definitions/PrivateLinkResource" @@ -1181,15 +1180,10 @@ } }, "PrivateLinkResource": { - "description": "Information of the private link resource.", + "description": "Private Link Resource.", "readOnly": true, "type": "object", "properties": { - "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Properties of the private link resource.", - "x-ms-client-flatten": true - }, "id": { "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", "type": "string", @@ -1204,12 +1198,7 @@ "description": "e.g. Microsoft.RecoveryServices/vaults/privateLinkResources", "readOnly": true, "type": "string" - } - } - }, - "PrivateLinkResourceProperties": { - "type": "object", - "properties": { + }, "groupId": { "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", "readOnly": true, @@ -1284,4 +1273,4 @@ ] } ] -} \ No newline at end of file +} From 9c658057b7030138ac4f62aa69b1577f4b77b921 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 16:42:32 +0530 Subject: [PATCH 12/17] Using x-ms-client-flatten for PrivateLinkResourceProperties --- .../stable/2016-06-01/vaults.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index 190a4a0f26bb..d9ee51100667 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1168,6 +1168,7 @@ "type": "object", "properties": { "value": { + "description": "A collection of private link resources", "type": "array", "items": { "$ref": "#/definitions/PrivateLinkResource" @@ -1180,10 +1181,15 @@ } }, "PrivateLinkResource": { - "description": "Private Link Resource.", + "description": "Information of the private link resource.", "readOnly": true, "type": "object", "properties": { + "properties": { + "$ref": "#/definitions/PrivateLinkResourceProperties", + "description": "Properties of the private link resource.", + "x-ms-client-flatten": true + }, "id": { "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", "type": "string", @@ -1198,7 +1204,12 @@ "description": "e.g. Microsoft.RecoveryServices/vaults/privateLinkResources", "readOnly": true, "type": "string" - }, + } + } + }, + "PrivateLinkResourceProperties": { + "type": "object", + "properties": { "groupId": { "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", "readOnly": true, @@ -1273,4 +1284,4 @@ ] } ] -} +} \ No newline at end of file From 9a1d84cc86f6bb319e3267dc58197b0fe38c86a5 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Fri, 27 Mar 2020 18:47:00 +0530 Subject: [PATCH 13/17] Fixing examples for PrivateLinkResources --- .../examples/GetPrivateLinkResource.json | 36 +++++----- .../examples/ListPrivateLinkResources.json | 66 ++++++++++--------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json index cc21cb636208..7664fad619a7 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -12,23 +12,25 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } } } } -} +} \ No newline at end of file diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json index d5d6d3c2acb0..95d51038ecb3 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -13,44 +13,48 @@ "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/petesting/providers/Microsoft.RecoveryServices/Vaults/pemsi-ecy-rsv2/privateLinkResources/backupResource", "name": "backupResource", "type": "Microsoft.RecoveryServices/Vaults/privateLinkResources", - "groupId": "AzureBackup", - "requiredMembers": [ - "backup-fab1", - "backup-rec2", - "backup-prot1", - "backup-ecs1", - "backup-tel1", - "backup-wbcm1", - "backup-fc1", - "backup-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.backup.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureBackup", + "requiredMembers": [ + "backup-fab1", + "backup-rec2", + "backup-prot1", + "backup-ecs1", + "backup-tel1", + "backup-wbcm1", + "backup-fc1", + "backup-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.backup.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } }, { "id": "/subscriptions/6c48fa17-39c7-45f1-90ac-47a587128ace/resourceGroups/gaallarg/providers/Microsoft.RecoveryServices/vaults/amchandnTest2702A/privateLinkResources/siteRecoveryResource", "name": "siteRecoveryResource", "type": "Microsoft.RecoveryServices/vaults/privateLinkResources", - "groupId": "AzureSiteRecovery", - "requiredMembers": [ - "siteRecovery-rcm1", - "siteRecovery-prot2", - "siteRecovery-tel1", - "siteRecovery-srs1", - "siteRecovery-prot2b", - "siteRecovery-id1" - ], - "requiredZoneNames": [ - "privatelink.ecy.siterecovery.windowsazure.com", - "privatelink.queue.core.windows.net", - "privatelink.blob.core.windows.net" - ] + "properties": { + "groupId": "AzureSiteRecovery", + "requiredMembers": [ + "siteRecovery-rcm1", + "siteRecovery-prot2", + "siteRecovery-tel1", + "siteRecovery-srs1", + "siteRecovery-prot2b", + "siteRecovery-id1" + ], + "requiredZoneNames": [ + "privatelink.ecy.siterecovery.windowsazure.com", + "privatelink.queue.core.windows.net", + "privatelink.blob.core.windows.net" + ] + } } ] } } } -} +} \ No newline at end of file From ec6def8d0bc63a96ba16d919df112115a26aca27 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Mon, 30 Mar 2020 18:53:20 +0530 Subject: [PATCH 14/17] Adding description for privateLinkResourceProperties --- .../Microsoft.RecoveryServices/stable/2016-06-01/vaults.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index d9ee51100667..0842b2408b52 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -1187,7 +1187,7 @@ "properties": { "properties": { "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Properties of the private link resource.", + "description": "Resource properties", "x-ms-client-flatten": true }, "id": { @@ -1209,6 +1209,7 @@ }, "PrivateLinkResourceProperties": { "type": "object", + "description": "Properties of the private link resource.", "properties": { "groupId": { "description": "e.g. f9ad6492-33d4-4690-9999-6bfd52a0d081 (Backup) or f9ad6492-33d4-4690-9999-6bfd52a0d082 (SiteRecovery)", From 89c0f6e94d390cd4c3bfe992bac632db6058e9fd Mon Sep 17 00:00:00 2001 From: deymadhumanti Date: Tue, 31 Mar 2020 13:04:31 +0530 Subject: [PATCH 15/17] Resolved PR comments. Fixed SpellCheck and PrettierCheck and Java SDK failures --- .../2016-06-01/examples/GetPrivateLinkResource.json | 2 +- .../examples/ListPrivateLinkResources.json | 2 +- .../stable/2016-06-01/vaults.json | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json index 7664fad619a7..eb4c7a1cbb1a 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json @@ -33,4 +33,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json index 95d51038ecb3..3a245b92f5ac 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/ListPrivateLinkResources.json @@ -57,4 +57,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index 0842b2408b52..4fadc40e3f2c 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -46,7 +46,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/PrivateLinkResources" + "$ref": "#/definitions/PrivateLinkResourceList" } } }, @@ -1162,7 +1162,7 @@ } } }, - "PrivateLinkResources": { + "PrivateLinkResourceList": { "description": "Class which represent the stamps associated with the vault.", "readOnly": true, "type": "object", @@ -1191,12 +1191,12 @@ "x-ms-client-flatten": true }, "id": { - "description": "e.g. subscriptions/{subId}/resourceGroups/{groupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/backupresource.", + "description": "Fully qualified identifier of the resource.", "type": "string", "readOnly": true }, "name": { - "description": "e.g. backupresource or siterecoveryresource.", + "description": "Name of the resource.", "type": "string", "readOnly": true }, @@ -1225,7 +1225,7 @@ } }, "requiredZoneNames": { - "description": "eg - [privatelink.eus.backup.windowsazure.com, privatelink.queue.core.windows.net]", + "description": "The private link resource Private link DNS zone name.", "readOnly": true, "type": "array", "items": { @@ -1285,4 +1285,4 @@ ] } ] -} \ No newline at end of file +} From ea2451f5fc9d4b456f809ad519e6be6895fda444 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Tue, 31 Mar 2020 19:24:41 +0530 Subject: [PATCH 16/17] Changing operationId for PrivateLinkResource to PrivateLinkResources --- ...rivateLinkResource.json => GetPrivateLinkResources.json} | 0 .../stable/2016-06-01/vaults.json | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/{GetPrivateLinkResource.json => GetPrivateLinkResources.json} (100%) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResources.json similarity index 100% rename from specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResource.json rename to specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/examples/GetPrivateLinkResources.json diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index 4fadc40e3f2c..0f32e58fc1fb 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -65,10 +65,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/privateLinkResources/{privateLinkResourceName}": { "get": { "tags": [ - "GetPrivateLinkResource" + "GetPrivateLinkResources" ], "summary": "Returns a specified private link resource that need to be created for Backup and SiteRecovery", - "operationId": "PrivateLinkResource_Get", + "operationId": "PrivateLinkResources_Get", "produces": [ "application/json" ], @@ -103,7 +103,7 @@ "deprecated": false, "x-ms-examples": { "Get PrivateLinkResource": { - "$ref": "./examples/GetPrivateLinkResource.json" + "$ref": "./examples/GetPrivateLinkResources.json" } } } From 165b7fcfae9a0dd104445193789b90f6974b0943 Mon Sep 17 00:00:00 2001 From: Aman Chandna Date: Tue, 31 Mar 2020 22:00:56 +0530 Subject: [PATCH 17/17] Renaming PrivateLinkResourceList to PrivateLinkResources --- .../Microsoft.RecoveryServices/stable/2016-06-01/vaults.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json index 0f32e58fc1fb..120ec809c638 100644 --- a/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json +++ b/specification/recoveryservices/resource-manager/Microsoft.RecoveryServices/stable/2016-06-01/vaults.json @@ -46,7 +46,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/PrivateLinkResourceList" + "$ref": "#/definitions/PrivateLinkResources" } } }, @@ -1162,7 +1162,7 @@ } } }, - "PrivateLinkResourceList": { + "PrivateLinkResources": { "description": "Class which represent the stamps associated with the vault.", "readOnly": true, "type": "object",