From f6997e8ccc464e88f50217728594a1815bb7c14c Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Tue, 17 Nov 2020 13:07:43 -0800 Subject: [PATCH 01/37] Update to use common type --- .../preview/2020-10-30-preview/enterprisePolicy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index b9b6ba659420..7bcd4c8bbaf3 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -157,7 +157,7 @@ }, "parameters": [ { - "$ref": "../../common/v1/definitions.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "enterprisePolicyName", From 1e1ea6e834717169038f5667511a9724566ab0b9 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Mon, 14 Dec 2020 14:34:20 -0800 Subject: [PATCH 02/37] Change to use common types. --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 3 +-- .../preview/2020-10-30-preview/enterprisePolicy.json | 3 +-- .../2020-10-30-preview/privateEndpointConnection.json | 2 +- .../preview/2020-10-30-preview/privateLinkResources.json | 4 ++-- .../preview/2020-10-30-preview/subnetResources.json | 8 +++++++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 07979d47210d..f2f6163e618b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -110,8 +110,7 @@ ] }, "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", + "description": "The resource model definition for an Azure Resource Manager proxy resource. It will have everything other than required location and tags", "allOf": [ { "$ref": "#/definitions/Resource" diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 7bcd4c8bbaf3..505200d7c52e 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -398,8 +398,7 @@ "description": "Definition of the EnterprisePolicy.", "allOf": [ { - "description": "The resource model definition for a ARM tracked top level resource.", - "$ref": "../../common/v1/definitions.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index b4e23df2f5ab..ac47c3279171 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -313,7 +313,7 @@ }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ] } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 9ee5e981113d..afcc343f9ac7 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -191,14 +191,14 @@ "type": "object", "properties": { "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", + "$ref": "../../../../../common-types/resource-management/v1/privateLinks.json#/definitions/PrivateLinkResourceProperties", "description": "Resource properties.", "x-ms-client-flatten": true } }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ] }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 1d7b553e551a..cf725c44955b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -243,6 +243,11 @@ "description": "A subnet", "type": "object", "properties": { + "vnetid": { + "readOnly": true, + "type": "string", + "description": "The virtual network ID. This is typically a GUID. Expect a null GUID by default." + }, "properties": { "$ref": "#/definitions/SubnetProperties", "description": "Resource properties.", @@ -251,7 +256,7 @@ }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ] }, @@ -279,6 +284,7 @@ "properties": { "id": { "type": "string", + "pattern": "^/subscriptions/[^/]*/resourceGroups/[^/]*/providers/Microsoft.(ClassicNetwork|Network)/virtualNetworks/[^/]*/subnets/[^/]*$", "description": "Resource id of the subnet." } } From 849d943b515f356f8548977d75ebf2a4a06143c4 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Mon, 14 Dec 2020 16:00:18 -0800 Subject: [PATCH 03/37] Change to use common types. --- .../preview/2020-10-30-preview/enterprisePolicy.json | 3 ++- .../preview/2020-10-30-preview/privateEndpointConnection.json | 2 +- .../preview/2020-10-30-preview/privateLinkResources.json | 4 ++-- .../preview/2020-10-30-preview/subnetResources.json | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 505200d7c52e..7bcd4c8bbaf3 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -398,7 +398,8 @@ "description": "Definition of the EnterprisePolicy.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "description": "The resource model definition for a ARM tracked top level resource.", + "$ref": "../../common/v1/definitions.json#/definitions/TrackedResource" } ], "properties": { diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index ac47c3279171..b4e23df2f5ab 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -313,7 +313,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" } ] } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index afcc343f9ac7..9ee5e981113d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -191,14 +191,14 @@ "type": "object", "properties": { "properties": { - "$ref": "../../../../../common-types/resource-management/v1/privateLinks.json#/definitions/PrivateLinkResourceProperties", + "$ref": "#/definitions/PrivateLinkResourceProperties", "description": "Resource properties.", "x-ms-client-flatten": true } }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" } ] }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index cf725c44955b..02bd5d96680d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -256,7 +256,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" } ] }, From 802c914b4898bcb78e45df4d3d588a69e19bc1b4 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Mon, 14 Dec 2020 16:41:12 -0800 Subject: [PATCH 04/37] Change to use common types. --- .../preview/2020-10-30-preview/subnetResources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 02bd5d96680d..5155cc159df0 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -243,11 +243,6 @@ "description": "A subnet", "type": "object", "properties": { - "vnetid": { - "readOnly": true, - "type": "string", - "description": "The virtual network ID. This is typically a GUID. Expect a null GUID by default." - }, "properties": { "$ref": "#/definitions/SubnetProperties", "description": "Resource properties.", @@ -268,6 +263,11 @@ "$ref": "#/definitions/SubnetEndpointProperty", "description": "Endpoint of the subnet." }, + "vnetid": { + "readOnly": true, + "type": "string", + "description": "The virtual network ID. This is typically a GUID. Expect a null GUID by default." + }, "status": { "$ref": "#/definitions/SubnetState", "description": "Connection State of the subnet." From c78c44cb4c9294717928fec9b34dfaddfd8dd51c Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Mon, 14 Dec 2020 17:09:07 -0800 Subject: [PATCH 05/37] Change to use common types. --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index f2f6163e618b..8eda89ad26fb 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -111,6 +111,7 @@ }, "ProxyResource": { "description": "The resource model definition for an Azure Resource Manager proxy resource. It will have everything other than required location and tags", + "type": "object", "allOf": [ { "$ref": "#/definitions/Resource" From 8381ca6027cd538437f0c56fe7e5ca209b8c8fd0 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Mon, 14 Dec 2020 17:22:03 -0800 Subject: [PATCH 06/37] Change to use common types. --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 8eda89ad26fb..07979d47210d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -110,7 +110,7 @@ ] }, "ProxyResource": { - "description": "The resource model definition for an Azure Resource Manager proxy resource. It will have everything other than required location and tags", + "description": "ARM proxy resource.", "type": "object", "allOf": [ { From ad02e0631776f2e016300a02c56ab0bd85f4c97c Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 4 Mar 2021 23:00:47 -0800 Subject: [PATCH 07/37] Update to use common type. --- .gitignore | 3 ++- .../preview/2020-10-30-preview/privateLinkResources.json | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a1c5fcb7f71a..a090a40a4c19 100644 --- a/.gitignore +++ b/.gitignore @@ -113,4 +113,5 @@ warnings.txt *.js *.d.ts *.js.map -*.d.ts.map \ No newline at end of file +*.d.ts.map +/azure-rest-api-specs diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 9ee5e981113d..2e254e03e2f6 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -181,7 +181,7 @@ "type": "array", "description": "Array of private link resources", "items": { - "$ref": "#/definitions/PrivateLinkResource" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResource" } } } @@ -219,6 +219,13 @@ }, "readOnly": true }, + "requiredZoneNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The private link resource Private link DNS zone name." + }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata for the private link resource." From ff230a670ef7ce18085f28b7a39fbf6179bd3327 Mon Sep 17 00:00:00 2001 From: rapatank <69176921+rapatank@users.noreply.github.com> Date: Fri, 5 Mar 2021 13:37:33 -0800 Subject: [PATCH 08/37] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a090a40a4c19..163c3c4090ae 100644 --- a/.gitignore +++ b/.gitignore @@ -114,4 +114,3 @@ warnings.txt *.d.ts *.js.map *.d.ts.map -/azure-rest-api-specs From 3d90d70c65105cad31490a9cb7d1c988a060d4d0 Mon Sep 17 00:00:00 2001 From: rapatank <69176921+rapatank@users.noreply.github.com> Date: Fri, 5 Mar 2021 13:38:20 -0800 Subject: [PATCH 09/37] Update .gitignore From ca679c7d2b4d859c0f3371645581833b0b8e04ae Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 5 Mar 2021 13:42:43 -0800 Subject: [PATCH 10/37] Revert "Update to use common type." This reverts commit ad02e0631776f2e016300a02c56ab0bd85f4c97c. --- .gitignore | 3 +-- .../preview/2020-10-30-preview/privateLinkResources.json | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a090a40a4c19..a1c5fcb7f71a 100644 --- a/.gitignore +++ b/.gitignore @@ -113,5 +113,4 @@ warnings.txt *.js *.d.ts *.js.map -*.d.ts.map -/azure-rest-api-specs +*.d.ts.map \ No newline at end of file diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 2e254e03e2f6..9ee5e981113d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -181,7 +181,7 @@ "type": "array", "description": "Array of private link resources", "items": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResource" + "$ref": "#/definitions/PrivateLinkResource" } } } @@ -219,13 +219,6 @@ }, "readOnly": true }, - "requiredZoneNames": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The private link resource Private link DNS zone name." - }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata for the private link resource." From a03ab7a3797a3f81c6dc6dda8d645d4e1e477fba Mon Sep 17 00:00:00 2001 From: rapatank <69176921+rapatank@users.noreply.github.com> Date: Fri, 5 Mar 2021 13:51:57 -0800 Subject: [PATCH 11/37] Delete .gitignore --- .gitignore | 116 ----------------------------------------------------- 1 file changed, 116 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 163c3c4090ae..000000000000 --- a/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -#### linux gitignore - -*~ - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - - -#### win gitignore - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - - -#### osx gitignore - -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Ignore repo files -/scripts/stostools/restoredPackages -/scripts/stostools/restoredpackages - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# npm -node_modules - -#### JetBrains -.idea - -# ignore code gen virtual env folder -SdkCodeGen - -# Visual Studio # -.settings/ -.vs/ -/app.js -*.suo -*.user -.ntvs_analysis.* -.njsproj -*.etl -*.etl.tmp -*.vspx -*.njsperf -*.sdf -*.opensdf -bin/*.dll - -# Visual Studio Code -.settings/ - -# Builds # -out/* -tmp/* -obj/ - - -# AutoRest Nightly # -AutoRest.* -output/* -errors.txt -warnings.txt - -# VS Code files -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -*.js -*.d.ts -*.js.map -*.d.ts.map From ac14fed6d853c7f8261d166df73a5495ace8517f Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 5 Mar 2021 15:37:20 -0800 Subject: [PATCH 12/37] Updating the models. --- .../2020-10-30-preview/enterprisePolicy.json | 4 ---- .../examples/PrivateLinkResourceListGet.json | 10 +--------- ...listEnterprisePoliciesByResourceGroup.json | 18 +---------------- .../listEnterprisePoliciesBySubscription.json | 20 ++----------------- .../listSubnetsByEnterprisePolicy.json | 19 +----------------- .../privateLinkResources.json | 6 +----- .../2020-10-30-preview/subnetResources.json | 4 ---- 7 files changed, 6 insertions(+), 75 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 7bcd4c8bbaf3..f5008d1affcb 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -437,10 +437,6 @@ "description": "Key vault properties." } } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json index a4e079ac2a17..58c46f63bc1c 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json @@ -18,15 +18,7 @@ "requiredMembers": [ "ddb1", "ddb1-westus" - ], - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + ] } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json index 1d6c31b7fb5f..f260aa1e258c 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json @@ -17,15 +17,7 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" } } }, @@ -39,14 +31,6 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json index 6b240cbee0e0..4c3c705d1ba8 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json @@ -15,15 +15,7 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" } }, { @@ -34,15 +26,7 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json index a630f91380c1..b4415ad97160 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json @@ -18,15 +18,7 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" }, - "status": "Enabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "status": "Enabled" } }, { @@ -36,15 +28,6 @@ "properties": { "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet2" - }, - "status": "Disabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 9ee5e981113d..c8c99f7e30ab 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -181,7 +181,7 @@ "type": "array", "description": "Array of private link resources", "items": { - "$ref": "#/definitions/PrivateLinkResource" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResource" } } } @@ -218,10 +218,6 @@ "type": "string" }, "readOnly": true - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata for the private link resource." } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 5155cc159df0..a03b2bfd8ef0 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -271,10 +271,6 @@ "status": { "$ref": "#/definitions/SubnetState", "description": "Connection State of the subnet." - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata for the subnet." } } }, From 3f92b7cb6efdc857310dac9dc8b1dc7346795f0c Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 5 Mar 2021 16:28:42 -0800 Subject: [PATCH 13/37] Use common types --- .../privateEndpointConnection.json | 39 ++------------ .../privateLinkResources.json | 54 +------------------ 2 files changed, 6 insertions(+), 87 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index b4e23df2f5ab..ceaed961f7a5 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -55,7 +55,7 @@ "200": { "description": "Successfully retrieved private endpoint connections.", "schema": { - "$ref": "#/definitions/PrivateEndpointConnectionListResult" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionListResult" } }, "default": { @@ -106,7 +106,7 @@ "200": { "description": "Successfully retrieved a specified private endpoint connection.", "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" } }, "default": { @@ -155,7 +155,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" }, "description": "Parameters supplied to create or update a private endpoint connection." } @@ -164,7 +164,7 @@ "200": { "description": "Successfully approved or rejected private endpoint connection.", "schema": { - "$ref": "#/definitions/PrivateEndpointConnection" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" } }, "202": { @@ -287,37 +287,6 @@ } } }, - "definitions": { - "PrivateEndpointConnectionListResult": { - "description": "A list of private endpoint connections", - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private endpoint connections", - "items": { - "$ref": "#/definitions/PrivateEndpointConnection" - } - } - } - }, - "PrivateEndpointConnection": { - "description": "A private endpoint connection", - "type": "object", - "properties": { - "properties": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" - } - ] - } - }, "parameters": { "PrivateEndpointConnectionNameParameter": { "name": "privateEndpointConnectionName", diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index c8c99f7e30ab..616b780dc13d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -55,7 +55,7 @@ "200": { "description": "Successfully retrieved private link resources.", "schema": { - "$ref": "#/definitions/PrivateLinkResourceListResult" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResourceListResult" } }, "default": { @@ -106,7 +106,7 @@ "200": { "description": "Successfully retrieved a specified private link resource.", "schema": { - "$ref": "#/definitions/PrivateLinkResource" + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResource" } }, "default": { @@ -172,56 +172,6 @@ } } }, - "definitions": { - "PrivateLinkResourceListResult": { - "description": "A list of private link resources", - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResource" - } - } - } - }, - "PrivateLinkResource": { - "description": "A private link resource", - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/PrivateLinkResourceProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" - } - ] - }, - "PrivateLinkResourceProperties": { - "description": "Properties of a private link resource.", - "type": "object", - "properties": { - "groupId": { - "description": "The private link resource group id.", - "type": "string", - "readOnly": true - }, - "requiredMembers": { - "description": "The private link resource required member names.", - "type": "array", - "items": { - "type": "string" - }, - "readOnly": true - } - } - } - }, "parameters": { "GroupNameParameter": { "name": "groupName", From 7a201a5056671faacbb510edd7d3ccc18f295893 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 5 Mar 2021 21:28:36 -0800 Subject: [PATCH 14/37] Use common types --- .../2020-10-30-preview/enterprisePolicy.json | 4 +++ ...listEnterprisePoliciesByResourceGroup.json | 18 +++++++++- .../listEnterprisePoliciesBySubscription.json | 20 +++++++++-- .../listSubnetsByEnterprisePolicy.json | 19 +++++++++- .../privateLinkResources.json | 35 +++++++++++++++++++ .../2020-10-30-preview/subnetResources.json | 4 +++ 6 files changed, 96 insertions(+), 4 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index f5008d1affcb..7bcd4c8bbaf3 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -437,6 +437,10 @@ "description": "Key vault properties." } } + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata pertaining to creation and last modification of the resource." } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json index f260aa1e258c..1d6c31b7fb5f 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json @@ -17,7 +17,15 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned" + "type": "SystemAssigned", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } }, @@ -31,6 +39,14 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json index 4c3c705d1ba8..6b240cbee0e0 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json @@ -15,7 +15,15 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned" + "type": "SystemAssigned", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } }, { @@ -26,7 +34,15 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned" + "type": "SystemAssigned", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json index b4415ad97160..a630f91380c1 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json @@ -18,7 +18,15 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" }, - "status": "Enabled" + "status": "Enabled", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } }, { @@ -28,6 +36,15 @@ "properties": { "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet2" + }, + "status": "Disabled", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 616b780dc13d..172be9292a9c 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -172,6 +172,41 @@ } } }, + "definitions": { + "PrivateLinkResourceListResult": { + "description": "A list of private link resources", + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private link resources", + "items": { + "$ref": "#/definitions/PrivateLinkResource" + } + } + } + }, + "PrivateLinkResource": { + "description": "A private link resource", + "type": "object", + "properties": { + "properties": { + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResourceProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata for the private link resource." + } + }, + "allOf": [ + { + "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + } + ] + } + }, "parameters": { "GroupNameParameter": { "name": "groupName", diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index a03b2bfd8ef0..5155cc159df0 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -271,6 +271,10 @@ "status": { "$ref": "#/definitions/SubnetState", "description": "Connection State of the subnet." + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata for the subnet." } } }, From 3146ae72db8677c493b8ddf4101ba8a403ab95fb Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 17:05:17 -0800 Subject: [PATCH 15/37] Use common types --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 07979d47210d..39e07e2873df 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -110,7 +110,7 @@ ] }, "ProxyResource": { - "description": "ARM proxy resource.", + "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", "type": "object", "allOf": [ { From b65a0354832ef5a8c5cf64820f53a2c4fda844b9 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 17:23:44 -0800 Subject: [PATCH 16/37] Use common types --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 39e07e2873df..5b21c16cb51d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -52,7 +52,7 @@ "description": "An error response from the PowerPlatform service." }, "Resource": { - "description": "The core properties of ARM resources", + "description": "Common fields that are returned in the response for all Azure Resource Manager resources", "type": "object", "properties": { "id": { @@ -79,7 +79,7 @@ "x-ms-azure-resource": true }, "TrackedResource": { - "description": "The resource model definition for a ARM tracked top level resource", + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", "type": "object", "properties": { "tags": { From 828dff7a0d84184d99b920f0191f96359168c61f Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 17:38:07 -0800 Subject: [PATCH 17/37] Use common types --- .../common/v1/definitions.json | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 5b21c16cb51d..303d17cd4878 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -58,12 +58,12 @@ "id": { "type": "string", "readOnly": true, - "description": "ARM resource id of the EnterprisePolicy." + "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { "type": "string", "readOnly": true, - "description": "Name of the EnterprisePolicy." + "description": "The name of the resource" }, "location": { "type": "string", @@ -73,7 +73,7 @@ "type": { "readOnly": true, "type": "string", - "description": "The type of the resource." + "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" } }, "x-ms-azure-resource": true @@ -100,7 +100,7 @@ "read", "create" ], - "description": "The Azure Region where the resource lives" + "description": "The geo-location where the resource lives" } }, "allOf": [ @@ -120,37 +120,38 @@ "properties": {} }, "Operation": { - "description": "PowerPlatform REST API operation", + "title": "REST API Operation", + "description": "Details of a REST API operation, returned from the Resource Provider Operations API", "type": "object", "properties": { "name": { - "description": "Operation name: For ex. providers/Microsoft.PowerPlatform/enterprisePolicies/write or read", + "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", "type": "string" }, "isDataAction": { - "description": "Indicates whether the operation is a data action", + "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", "type": "string" }, "display": { "properties": { "provider": { - "description": "Service provider: Microsoft.PowerPlatform", + "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", "type": "string" }, "resource": { - "description": "Resource on which the operation is performed.", + "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", "type": "string" }, "operation": { - "description": "Operation type: Read, write, delete, etc.", + "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", "type": "string" }, "description": { - "description": "Description about operation.", + "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", "type": "string" } }, - "description": "Provider, Resource, Operation and description values." + "description": "Localized display information for this particular operation." }, "properties": { "properties": { From c60c73a837ddf327ffed7988f369bd5a78e5c954 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 18:30:45 -0800 Subject: [PATCH 18/37] Use common types --- .../PrivateEndpointConnectionGet.json | 8 ++++ .../PrivateEndpointConnectionListGet.json | 8 ++++ .../PrivateEndpointConnectionUpdate.json | 8 ++++ .../examples/PrivateLinkResourceGet.json | 8 ++++ .../examples/PrivateLinkResourceListGet.json | 8 ++++ .../createOrUpdateEnterprisePolicy.json | 10 +++++ .../examples/getEnterprisePolicy.json | 10 +++++ .../examples/subnetGet.json | 10 ++++- .../examples/subnetUpdate.json | 10 ++++- .../examples/updateEnterprisePolicy.json | 10 +++++ .../privateEndpointConnection.json | 43 +++++++++++++++++-- 11 files changed, 127 insertions(+), 6 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionGet.json index 956cb49ea6de..0e81c7f4c2de 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionGet.json @@ -21,6 +21,14 @@ "description": "Auto-approved", "actionsRequired": "None" } + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionListGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionListGet.json index 33ebd4ab5bf9..2fd7f9ce6618 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionListGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionListGet.json @@ -37,6 +37,14 @@ "description": "Auto-approved", "actionsRequired": "None" } + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionUpdate.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionUpdate.json index e895fd751243..a58b53e409eb 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionUpdate.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionUpdate.json @@ -29,6 +29,14 @@ "description": "Auto-approved", "actionsRequired": "None" } + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceGet.json index 461589beb21c..71842d0a54f3 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceGet.json @@ -18,6 +18,14 @@ "ddb1", "ddb1-westus" ] + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json index 58c46f63bc1c..b64875322e29 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json @@ -19,6 +19,14 @@ "ddb1", "ddb1-westus" ] + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json index c41b857d5fa9..65cda77af305 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json @@ -46,6 +46,16 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "properties": { + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json index 7b7ae06b29b7..53e6339933ff 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json @@ -17,6 +17,16 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "properties": { + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json index 14ba1ba62fa7..4439d5b03e6c 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json @@ -16,7 +16,15 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" }, - "status": "Enabled" + "status": "Enabled", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json index 485a69b7ddaa..138b0b192512 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json @@ -13,7 +13,15 @@ "name": "subnetName", "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", "properties": { - "status": "Disabled" + "status": "Disabled", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json index 4237ba2e50e0..178bf0f3c458 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json @@ -29,6 +29,16 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "properties": { + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index ceaed961f7a5..06d97c8ada95 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -55,7 +55,7 @@ "200": { "description": "Successfully retrieved private endpoint connections.", "schema": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionListResult" + "$ref": "#/definitions/PrivateEndpointConnectionListResult" } }, "default": { @@ -106,7 +106,7 @@ "200": { "description": "Successfully retrieved a specified private endpoint connection.", "schema": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "#/definitions/PrivateEndpointConnection" } }, "default": { @@ -155,7 +155,7 @@ "in": "body", "required": true, "schema": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "#/definitions/PrivateEndpointConnection" }, "description": "Parameters supplied to create or update a private endpoint connection." } @@ -164,7 +164,7 @@ "200": { "description": "Successfully approved or rejected private endpoint connection.", "schema": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" + "$ref": "#/definitions/PrivateEndpointConnection" } }, "202": { @@ -287,6 +287,41 @@ } } }, + "definitions": { + "PrivateEndpointConnectionListResult": { + "description": "A list of private endpoint connections", + "type": "object", + "properties": { + "value": { + "type": "array", + "description": "Array of private endpoint connections", + "items": { + "$ref": "#/definitions/PrivateEndpointConnection" + } + } + } + }, + "PrivateEndpointConnection": { + "description": "A private endpoint connection", + "type": "object", + "properties": { + "properties": { + "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata for the private endpoint connection." + } + }, + "allOf": [ + { + "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + } + ] + } + }, "parameters": { "PrivateEndpointConnectionNameParameter": { "name": "privateEndpointConnectionName", From 15d15f1296d6cb587dcde259cb365e0f2e7a7b52 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 22:01:11 -0800 Subject: [PATCH 19/37] Use common types --- .../preview/2020-10-30-preview/privateEndpointConnection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index 06d97c8ada95..5a366e14237d 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -311,7 +311,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", "description": "Metadata for the private endpoint connection." } }, From 1363da42c169b45c45d02a80b6a9c88cc44292a0 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Sun, 7 Mar 2021 22:25:35 -0800 Subject: [PATCH 20/37] Use common types --- .../preview/2020-10-30-preview/enterprisePolicy.json | 2 +- .../preview/2020-10-30-preview/privateLinkResources.json | 2 +- .../preview/2020-10-30-preview/subnetResources.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 7bcd4c8bbaf3..ff600e37e4e2 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -439,7 +439,7 @@ } }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", "description": "Metadata pertaining to creation and last modification of the resource." } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 172be9292a9c..6125b3e30d7e 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -196,7 +196,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", "description": "Metadata for the private link resource." } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 5155cc159df0..875b0dd44b35 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -273,7 +273,7 @@ "description": "Connection State of the subnet." }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", "description": "Metadata for the subnet." } } From d66ea6febf8be555c4012d9b8bb3280faf9ce77f Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Tue, 9 Mar 2021 11:52:35 -0800 Subject: [PATCH 21/37] Use common types --- .../common/v1/definitions.json | 4 +++ .../2020-10-30-preview/enterprisePolicy.json | 4 --- .../createOrUpdateEnterprisePolicy.json | 10 ------ .../examples/getEnterprisePolicy.json | 10 ------ ...listEnterprisePoliciesByResourceGroup.json | 34 +++++++++--------- .../listEnterprisePoliciesBySubscription.json | 36 +++++++++---------- .../listSubnetsByEnterprisePolicy.json | 36 +++++++++---------- .../examples/subnetGet.json | 18 +++++----- .../examples/subnetUpdate.json | 18 +++++----- .../examples/updateEnterprisePolicy.json | 10 ------ .../2020-10-30-preview/subnetResources.json | 8 ++--- 11 files changed, 79 insertions(+), 109 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 303d17cd4878..4bf4aa6ab0d2 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -74,6 +74,10 @@ "readOnly": true, "type": "string", "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "description": "Metadata pertaining to creation and last modification of the resource." } }, "x-ms-azure-resource": true diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index ff600e37e4e2..f5008d1affcb 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -437,10 +437,6 @@ "description": "Key vault properties." } } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json index 65cda77af305..c41b857d5fa9 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json @@ -46,16 +46,6 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" - }, - "properties": { - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json index 53e6339933ff..7b7ae06b29b7 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json @@ -17,16 +17,6 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" - }, - "properties": { - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json index 1d6c31b7fb5f..f43fa493ae1c 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json @@ -17,16 +17,16 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" } + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } }, { @@ -39,15 +39,15 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json index 6b240cbee0e0..100d68113d74 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json @@ -15,15 +15,15 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } }, { @@ -34,15 +34,15 @@ "identity": { "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", - "type": "SystemAssigned", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "type": "SystemAssigned" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json index a630f91380c1..21356b1fb472 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json @@ -18,15 +18,15 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" }, - "status": "Enabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "status": "Enabled" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } }, { @@ -37,15 +37,15 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet2" }, - "status": "Disabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "status": "Disabled" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } ] diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json index 4439d5b03e6c..bb729648fceb 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json @@ -16,15 +16,15 @@ "subnet": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" }, - "status": "Enabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "status": "Enabled" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json index 138b0b192512..2833415fc554 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json @@ -13,15 +13,15 @@ "name": "subnetName", "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", "properties": { - "status": "Disabled", - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } + "status": "Disabled" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json index 178bf0f3c458..4237ba2e50e0 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json @@ -29,16 +29,6 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" - }, - "properties": { - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 875b0dd44b35..8f9df4a8cff6 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -247,6 +247,10 @@ "$ref": "#/definitions/SubnetProperties", "description": "Resource properties.", "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "description": "Metadata for the subnet." } }, "allOf": [ @@ -271,10 +275,6 @@ "status": { "$ref": "#/definitions/SubnetState", "description": "Connection State of the subnet." - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", - "description": "Metadata for the subnet." } } }, From f3e548aa9221d6485ca95da4d843010cc9866101 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Tue, 9 Mar 2021 21:38:32 -0800 Subject: [PATCH 22/37] Use common types --- .../Microsoft.PowerPlatform/common/v1/definitions.json | 4 ---- .../preview/2020-10-30-preview/enterprisePolicy.json | 6 +++++- .../examples/createOrUpdateEnterprisePolicy.json | 8 ++++++++ .../2020-10-30-preview/examples/getEnterprisePolicy.json | 8 ++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 4bf4aa6ab0d2..303d17cd4878 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -74,10 +74,6 @@ "readOnly": true, "type": "string", "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." } }, "x-ms-azure-resource": true diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index f5008d1affcb..4bb42f401ae8 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -399,7 +399,7 @@ "allOf": [ { "description": "The resource model definition for a ARM tracked top level resource.", - "$ref": "../../common/v1/definitions.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "properties": { @@ -411,6 +411,10 @@ "$ref": "#/definitions/Properties", "description": "The properties that define configuration for the enterprise policy", "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "description": "Metadata pertaining to creation and last modification of the resource." } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json index c41b857d5fa9..6d940ca9b32f 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json @@ -46,6 +46,14 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json index 7b7ae06b29b7..7309bf3530cd 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json @@ -17,6 +17,14 @@ "systemAssignedIdentityPrincipalId": "principalId", "tenantId": "tenantId", "type": "SystemAssigned" + }, + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } From 475ab6eab2903dd3bab1df1d28c290446a899930 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Tue, 9 Mar 2021 21:48:43 -0800 Subject: [PATCH 23/37] Use common types --- .../preview/2020-10-30-preview/enterprisePolicy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index af50f7cf344d..09e276d6cc88 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -399,7 +399,7 @@ "allOf": [ { "description": "The resource model definition for a ARM tracked top level resource.", - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" } ], "properties": { From 3097e1ffc53a5b2a395f48c0bf776624e60ab413 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Tue, 9 Mar 2021 22:09:03 -0800 Subject: [PATCH 24/37] Use common types --- .../2020-10-30-preview/enterprisePolicy.json | 42 +++++++++---------- .../examples/updateEnterprisePolicy.json | 4 +- .../privateEndpointConnection.json | 26 ++++++------ .../privateLinkResources.json | 14 +++---- .../2020-10-30-preview/subnetResources.json | 24 +++++------ 5 files changed, 50 insertions(+), 60 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 09e276d6cc88..49e4856766d5 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -48,13 +48,13 @@ "description": "Name of the EnterprisePolicy." }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "name": "parameters", @@ -114,13 +114,13 @@ "description": "The EnterprisePolicy name." }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -157,7 +157,7 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "enterprisePolicyName", @@ -167,10 +167,10 @@ "description": "Name of the EnterprisePolicy" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -215,13 +215,13 @@ "description": "Name of the EnterprisePolicy." }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "name": "parameters", @@ -270,13 +270,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -318,10 +318,10 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -363,7 +363,7 @@ "operationId": "Operations_List", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -413,7 +413,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata pertaining to creation and last modification of the resource." } } @@ -441,10 +441,6 @@ "description": "Key vault properties." } } - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json index 178bf0f3c458..2518a91f3f7b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json @@ -30,15 +30,13 @@ "tenantId": "tenantId", "type": "SystemAssigned" }, - "properties": { - "systemData": { + "systemData": { "createdBy": "user1", "createdByType": "User", "createdAt": "2020-01-01T17:18:19.1234567Z", "lastModifiedBy": "user2", "lastModifiedByType": "User", "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } } } } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index 5fc87af217b8..95a7d5e81838 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -39,13 +39,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -87,13 +87,13 @@ "operationId": "PrivateEndpointConnections_Get", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -136,13 +136,13 @@ "operationId": "PrivateEndpointConnections_CreateOrUpdate", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -198,13 +198,13 @@ "operationId": "PrivateEndpointConnections_Delete", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -269,7 +269,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata for the private endpoint connection." } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index f952b63ba0d1..385e1e37a88a 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -39,13 +39,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -87,13 +87,13 @@ "operationId": "PrivateLinkResources_Get", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -154,7 +154,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata for the private link resource." } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 27ab78c87808..afd0c8f2fa0b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -37,13 +37,13 @@ "operationId": "Subnets_Get", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -88,13 +88,13 @@ "operationId": "Subnets_CreateOrUpdate", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -145,13 +145,13 @@ }, "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" @@ -207,7 +207,7 @@ "x-ms-client-flatten": true }, "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", "description": "Metadata for the subnet." } }, @@ -233,10 +233,6 @@ "status": { "$ref": "#/definitions/SubnetState", "description": "Connection State of the subnet." - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData", - "description": "Metadata for the subnet." } } }, From 422e24d7da44d958eebf457b0fbae9ce1f6815f4 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Wed, 10 Mar 2021 17:00:57 -0800 Subject: [PATCH 25/37] Use common types --- .../2020-10-30-preview/enterprisePolicy.json | 16 ++++++++-------- .../examples/listOperations.json | 10 ++++------ .../privateEndpointConnection.json | 10 +++++----- .../2020-10-30-preview/privateLinkResources.json | 6 +++--- .../2020-10-30-preview/subnetResources.json | 8 ++++---- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 49e4856766d5..4288561194b1 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -82,7 +82,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -133,7 +133,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -183,7 +183,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -243,7 +243,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -289,7 +289,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -334,7 +334,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -370,13 +370,13 @@ "200": { "description": "OK", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/OperationList" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listOperations.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listOperations.json index 73e6845fe313..0d19fa2a6b78 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listOperations.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listOperations.json @@ -9,25 +9,23 @@ "value": [ { "name": "Microsoft.PowerPlatform/enterprisePolicies/write", - "isDataAction": "false", + "isDataAction": false, "display": { "provider": "Microsoft PowerPlatform", "resource": "Microsoft.PowerPlatform/enterprisePolicies", "operation": "Microsoft.PowerPlatform/enterprisePolicies/write", "description": "Create new enterprisePolicy." - }, - "properties": null + } }, { "name": "Microsoft.PowerPlatform/enterprisePolicies/read", - "isDataAction": "false", + "isDataAction": false, "display": { "provider": "Microsoft PowerPlatform", "resource": "Microsoft.PowerPlatform/enterprisePolicies", "operation": "Microsoft.PowerPlatform/enterprisePolicies/read", "description": "Get enterprisePolicy." - }, - "properties": null + } } ] } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index 95a7d5e81838..5b5f0c812871 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -61,7 +61,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -112,7 +112,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -173,7 +173,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -226,7 +226,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -275,7 +275,7 @@ }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ] } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 385e1e37a88a..d4855e719fe4 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -61,7 +61,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } }, @@ -112,7 +112,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } }, @@ -160,7 +160,7 @@ }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ] } diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index afd0c8f2fa0b..4933c282183f 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -62,7 +62,7 @@ "default": { "description": "App Service error response.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -113,7 +113,7 @@ "default": { "description": "App Service error response.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -167,7 +167,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -213,7 +213,7 @@ }, "allOf": [ { - "$ref": "../../common/v1/definitions.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ] }, From d063763662201f29317cf655ffcb911838d24e25 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Wed, 10 Mar 2021 17:07:04 -0800 Subject: [PATCH 26/37] Use common types --- .../examples/updateEnterprisePolicy.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json index 2518a91f3f7b..a9d9caf02a13 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json @@ -31,12 +31,12 @@ "type": "SystemAssigned" }, "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2020-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" } } } From 9e2cc270b027b68aeed75be43580170d93ad0864 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Wed, 10 Mar 2021 17:53:57 -0800 Subject: [PATCH 27/37] Use common types --- .../common/v1/definitions.json | 155 ------------------ 1 file changed, 155 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 303d17cd4878..2f672e29367b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -23,161 +23,6 @@ "title": "Common types" }, "paths": {}, - "definitions": { - "ErrorResponse": { - "description": "ARM error response body.", - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/ErrorResponseBody", - "description": "Details about the error." - } - } - }, - "ErrorResponseBody": { - "properties": { - "code": { - "type": "string", - "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." - }, - "message": { - "type": "string", - "description": "A message describing the error, intended to be suitable for display in a user interface." - }, - "target": { - "type": "string", - "description": "The target of the particular error. For example, the name of the property in error." - } - }, - "description": "An error response from the PowerPlatform service." - }, - "Resource": { - "description": "Common fields that are returned in the response for all Azure Resource Manager resources", - "type": "object", - "properties": { - "id": { - "type": "string", - "readOnly": true, - "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" - }, - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the resource" - }, - "location": { - "type": "string", - "readOnly": true, - "description": "Region where the EnterprisePolicy is located." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\"" - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", - "type": "object", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The geo-location where the resource lives" - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, - "Operation": { - "title": "REST API Operation", - "description": "Details of a REST API operation, returned from the Resource Provider Operations API", - "type": "object", - "properties": { - "name": { - "description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"", - "type": "string" - }, - "isDataAction": { - "description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.", - "type": "string" - }, - "display": { - "properties": { - "provider": { - "description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".", - "type": "string" - }, - "resource": { - "description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".", - "type": "string" - }, - "operation": { - "description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".", - "type": "string" - }, - "description": { - "description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.", - "type": "string" - } - }, - "description": "Localized display information for this particular operation." - }, - "properties": { - "properties": { - "statusCode": { - "description": "Service provider: Microsoft.PowerPlatform", - "type": "string" - } - }, - "x-ms-client-flatten": true, - "description": "Provider, Resource, Operation and description values." - } - } - }, - "OperationList": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - }, - "description": "List of PowerPlatform operations supported by the PowerPlatform resource provider." - } - }, - "description": "The response model for the list of PowerPlatform operations" - } - }, "parameters": { "EnterprisePolicyNameParameter": { "name": "enterprisePolicyName", From 7b553ec719e5d7a8ed051aa309b1161a2ae378ef Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Wed, 10 Mar 2021 21:02:44 -0800 Subject: [PATCH 28/37] Use common types --- .../preview/2020-10-30-preview/privateLinkResources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index d4855e719fe4..d3590fc87938 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -61,7 +61,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -112,7 +112,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -160,7 +160,7 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ] } From d5894f92f8e9ad4433a86229c1e51e0519a6907a Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 11 Mar 2021 21:04:36 -0800 Subject: [PATCH 29/37] Use common types --- .../preview/2020-10-30-preview/privateEndpointConnection.json | 2 +- .../preview/2020-10-30-preview/privateLinkResources.json | 2 +- .../preview/2020-10-30-preview/subnetResources.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json index 5b5f0c812871..6410cfa62237 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json @@ -270,7 +270,7 @@ }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata for the private endpoint connection." + "description": "Metadata pertaining to creation and last modification of the resource." } }, "allOf": [ diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index d3590fc87938..0e7f9799d64b 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -155,7 +155,7 @@ }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata for the private link resource." + "description": "Metadata pertaining to creation and last modification of the resource." } }, "allOf": [ diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json index 4933c282183f..4864446dab89 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json @@ -208,7 +208,7 @@ }, "systemData": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata for the subnet." + "description": "Metadata pertaining to creation and last modification of the resource." } }, "allOf": [ From 0622845241d7e01ecab79306eae7a9a90c4684c5 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 11 Mar 2021 21:49:56 -0800 Subject: [PATCH 30/37] Use common types --- .../common/v1/definitions.json | 33 +++++++++++++++++++ .../2020-10-30-preview/enterprisePolicy.json | 27 ++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json index 2f672e29367b..8386afcfc438 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json @@ -23,6 +23,39 @@ "title": "Common types" }, "paths": {}, + "definitions": { + "PatchTrackedResource": { + "description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'", + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives" + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/Resource" + } + ] + } + }, "parameters": { "EnterprisePolicyNameParameter": { "name": "enterprisePolicyName", diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 4288561194b1..f37c899d3410 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -228,7 +228,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/EnterprisePolicy" + "$ref": "#/definitions/PatchEnterprisePolicy" }, "description": "Parameters supplied to update EnterprisePolicy." } @@ -418,6 +418,31 @@ } } }, + "PatchEnterprisePolicy": { + "type": "object", + "description": "Definition of the EnterprisePolicy.", + "allOf": [ + { + "description": "The resource model definition for a ARM tracked top level resource.", + "$ref": "../../common/v1/definitions.json#/definitions/PatchTrackedResource" + } + ], + "properties": { + "identity": { + "$ref": "#/definitions/EnterprisePolicyIdentity", + "description": "The identity of the EnterprisePolicy." + }, + "properties": { + "$ref": "#/definitions/Properties", + "description": "The properties that define configuration for the enterprise policy", + "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata pertaining to creation and last modification of the resource." + } + } + }, "Properties": { "type": "object", "description": "The properties that define configuration for the enterprise policy.", From f7665e55082734f0176099e14a4cbeddf6771446 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 25 Mar 2021 19:46:30 -0700 Subject: [PATCH 31/37] Updates for network injection. --- .../2020-10-30-preview/enterprisePolicy.json | 53 +++++++++++++++---- .../examples/getEnterprisePolicy.json | 13 +++++ 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index f37c899d3410..9396f3c5bc23 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -451,8 +451,8 @@ "type": "object", "description": "Settings concerning lockbox.", "properties": { - "status": { - "$ref": "#/definitions/status", + "state": { + "$ref": "#/definitions/state", "description": "lockbox configuration" } } @@ -461,9 +461,23 @@ "type": "object", "description": "The encryption settings for a configuration store.", "properties": { - "keyVaultProperties": { + "keyVault": { "$ref": "#/definitions/KeyVaultProperties", "description": "Key vault properties." + }, + "state": { + "description": "The state of onboarding, which only appears in the response.", + "$ref": "#/definitions/state" + } + } + }, + "networkInjection": { + "type": "object", + "description": "Settings concerning network injection.", + "properties": { + "virtualNetwork": { + "$ref": "#/definitions/VirtualNetworkProperties", + "description": "Network injection configuration" } } } @@ -497,12 +511,11 @@ } } }, - "status": { + "state": { "type": "string", - "readOnly": true, "description": "The state of onboarding, which only appears in the response.", "x-ms-enum": { - "name": "status", + "name": "state", "modelAsString": true }, "enum": [ @@ -522,10 +535,6 @@ "key": { "$ref": "#/definitions/keyProperties", "description": "Identity of the secret that includes name and version." - }, - "status": { - "description": "The state of onboarding, which only appears in the response.", - "$ref": "#/definitions/status" } } }, @@ -542,6 +551,30 @@ }, "description": "Url and version of the KeyVault Secret" }, + "VirtualNetworkProperties": { + "type": "object", + "description": "Settings concerning the virtual network.", + "properties": { + "id": { + "type": "string", + "description": "Uri of the virtual network." + }, + "subnet": { + "$ref": "#/definitions/SubnetProperties", + "description": "Identity of the subnet delegated for network injection." + } + } + }, + "SubnetProperties": { + "type": "object", + "description": "Settings concerning subnet.", + "properties": { + "name": { + "type": "string", + "description": "Subnet name." + } + } + }, "EnterprisePolicyList": { "properties": { "value": { diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json index 7309bf3530cd..272117361a15 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json @@ -18,6 +18,19 @@ "tenantId": "tenantId", "type": "SystemAssigned" }, + "properties": { + "lockbox": { + "state": "succeeded" + }, + "networkInjection": { + "virtualNetwork": { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/virtualNetwork", + "subnet": { + "name": "testSubnet" + } + } + } + }, "systemData": { "createdBy": "user1", "createdByType": "User", From b34d293fc2ad3fedf21ffedccd3425f86ce10c16 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 25 Mar 2021 20:38:55 -0700 Subject: [PATCH 32/37] Updates for network injection. --- .../preview/2020-10-30-preview/enterprisePolicy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index 9396f3c5bc23..fb8317adbe26 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -561,13 +561,13 @@ }, "subnet": { "$ref": "#/definitions/SubnetProperties", - "description": "Identity of the subnet delegated for network injection." + "description": "Properties of a subnet." } } }, "SubnetProperties": { "type": "object", - "description": "Settings concerning subnet.", + "description": "Properties of a subnet.", "properties": { "name": { "type": "string", From 7dbf257ca80484edc06e95c3fb3f4b513f92988f Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 25 Mar 2021 20:52:28 -0700 Subject: [PATCH 33/37] Updates for network injection. --- .../preview/2020-10-30-preview/enterprisePolicy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index fb8317adbe26..f46c8f75d008 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -560,12 +560,12 @@ "description": "Uri of the virtual network." }, "subnet": { - "$ref": "#/definitions/SubnetProperties", + "$ref": "#/definitions/subnetProperties", "description": "Properties of a subnet." } } }, - "SubnetProperties": { + "subnetProperties": { "type": "object", "description": "Properties of a subnet.", "properties": { From dd5f09d829d0df5553635dcaa99235b182fb8c76 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 25 Mar 2021 21:00:12 -0700 Subject: [PATCH 34/37] Updates for network injection. --- .../2020-10-30-preview/enterprisePolicy.json | 4 +- .../listSubnetsByEnterprisePolicy.json | 55 ---- .../examples/subnetGet.json | 32 -- .../examples/subnetUpdate.json | 29 -- .../2020-10-30-preview/subnetResources.json | 275 ------------------ 5 files changed, 2 insertions(+), 393 deletions(-) delete mode 100644 specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json delete mode 100644 specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json delete mode 100644 specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json delete mode 100644 specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index f46c8f75d008..fb8317adbe26 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -560,12 +560,12 @@ "description": "Uri of the virtual network." }, "subnet": { - "$ref": "#/definitions/subnetProperties", + "$ref": "#/definitions/SubnetProperties", "description": "Properties of a subnet." } } }, - "subnetProperties": { + "SubnetProperties": { "type": "object", "description": "Properties of a subnet.", "properties": { diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json deleted file mode 100644 index 21356b1fb472..000000000000 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listSubnetsByEnterprisePolicy.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "enterprisePolicyName": "ep1", - "api-version": "2020-10-30-preview", - "subnetName": "subnetName" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/ep1/subnets", - "name": "subnetName", - "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", - "properties": { - "subnet": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" - }, - "status": "Enabled" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/ep1/subnets", - "name": "subnetName", - "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", - "properties": { - "subnet": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet2" - }, - "status": "Disabled" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } - } - ] - } - } - } -} diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json deleted file mode 100644 index bb729648fceb..000000000000 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "enterprisePolicyName": "ddb1", - "api-version": "2020-10-30-preview", - "subnetName": "subnetName" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/ddb1/subnets", - "name": "subnetName", - "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", - "properties": { - "subnet": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vn1/subnets/subnet1" - }, - "status": "Enabled" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } - } - } - } -} diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json deleted file mode 100644 index 2833415fc554..000000000000 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "rg1", - "enterprisePolicyName": "ddb1", - "api-version": "2020-10-30-preview", - "subnetName": "subnetName" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/ddb1/subnets/subnetName", - "name": "subnetName", - "type": "Microsoft.PowerPlatform/enterprisePolicies/subnets", - "properties": { - "status": "Disabled" - }, - "systemData": { - "createdBy": "user1", - "createdByType": "User", - "createdAt": "2020-01-01T17:18:19.1234567Z", - "lastModifiedBy": "user2", - "lastModifiedByType": "User", - "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" - } - } - } - } -} diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json deleted file mode 100644 index 4864446dab89..000000000000 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2020-10-30-preview", - "title": "PowerPlatform" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PowerPlatform/enterprisePolicies/{enterprisePolicyName}/subnets/{subnetName}": { - "get": { - "tags": [ - "Subnets" - ], - "summary": "Gets Subnets associated with EnterprisePolicy authorized for outbound calls from PowerPlatform.", - "description": "Description of Subnets that are authorized for outbound calls from PowerPlatform.", - "operationId": "Subnets_Get", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" - }, - { - "$ref": "#/parameters/SubnetNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Subnet" - } - }, - "default": { - "description": "App Service error response.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "Gets subnet.": { - "$ref": "./examples/subnetGet.json" - } - }, - "x-ms-long-running-operation": false, - "produces": [ - "application/json" - ], - "consumes": [ - "application/json" - ] - }, - "put": { - "tags": [ - "PowerPlatform" - ], - "summary": "Create or Update Subnet that PowerPlatform resources can access.", - "description": "Description of the Subnet that PowerPlatform resources can access.", - "operationId": "Subnets_CreateOrUpdate", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" - }, - { - "$ref": "#/parameters/SubnetNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Subnet" - } - }, - "default": { - "description": "App Service error response.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "Creates or Updates subnet.": { - "$ref": "./examples/subnetUpdate.json" - } - }, - "x-ms-long-running-operation": false, - "produces": [ - "application/json" - ], - "consumes": [ - "application/json" - ] - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PowerPlatform/enterprisePolicies/{enterprisePolicyName}/subnets": { - "get": { - "tags": [ - "Subnets" - ], - "operationId": "Subnets_ListByEnterprisePolicy", - "description": "Retrieve a list of subnets within a given enterprisePolicy", - "x-ms-examples": { - "List EnterprisePolicies by resource group": { - "$ref": "./examples/listSubnetsByEnterprisePolicy.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../common/v1/definitions.json#/parameters/EnterprisePolicyNameParameter" - } - ], - "responses": { - "200": { - "description": "OK. List of subnets.", - "schema": { - "$ref": "#/definitions/SubnetListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-pageable": { - "nextLinkName": null - }, - "produces": [ - "application/json" - ], - "consumes": [ - "application/json" - ] - } - } - }, - "definitions": { - "SubnetListResult": { - "description": "A list of subnets", - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of subnets", - "items": { - "$ref": "#/definitions/Subnet" - } - } - } - }, - "Subnet": { - "description": "A subnet", - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/SubnetProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" - } - ] - }, - "SubnetProperties": { - "description": "Properties of a subnet.", - "type": "object", - "properties": { - "subnet": { - "$ref": "#/definitions/SubnetEndpointProperty", - "description": "Endpoint of the subnet." - }, - "vnetid": { - "readOnly": true, - "type": "string", - "description": "The virtual network ID. This is typically a GUID. Expect a null GUID by default." - }, - "status": { - "$ref": "#/definitions/SubnetState", - "description": "Connection State of the subnet." - } - } - }, - "SubnetEndpointProperty": { - "type": "object", - "description": "Endpoint of the subnet.", - "properties": { - "id": { - "type": "string", - "pattern": "^/subscriptions/[^/]*/resourceGroups/[^/]*/providers/Microsoft.(ClassicNetwork|Network)/virtualNetworks/[^/]*/subnets/[^/]*$", - "description": "Resource id of the subnet." - } - } - }, - "SubnetState": { - "type": "string", - "readOnly": true, - "description": "The state of onboarding, which only appears in the response.", - "x-ms-enum": { - "name": "status", - "modelAsString": true - }, - "enum": [ - "Enabled", - "Disabled", - "NotConfigured" - ] - } - }, - "parameters": { - "SubnetNameParameter": { - "name": "subnetName", - "in": "path", - "required": true, - "type": "string", - "x-ms-parameter-location": "method", - "description": "The name of the subnet." - } - } -} From 6631b83ff0030bb30ddf0f7c15a689c67d7054f3 Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Thu, 25 Mar 2021 21:04:22 -0700 Subject: [PATCH 35/37] Updates for network injection. --- specification/powerplatform/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/powerplatform/resource-manager/readme.md b/specification/powerplatform/resource-manager/readme.md index d66f7b64acdd..270868f6c8a7 100644 --- a/specification/powerplatform/resource-manager/readme.md +++ b/specification/powerplatform/resource-manager/readme.md @@ -38,7 +38,6 @@ input-file: - Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json - Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json - Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json - - Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json ``` --- From c23c48c4b190a08fc4b73c999dc9eb6db58db3ec Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 26 Mar 2021 13:34:17 -0700 Subject: [PATCH 36/37] Updates for network injection. --- .../privateLinkResources.json | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json index 0e7f9799d64b..c046989249d3 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json @@ -130,41 +130,6 @@ } } }, - "definitions": { - "PrivateLinkResourceListResult": { - "description": "A list of private link resources", - "type": "object", - "properties": { - "value": { - "type": "array", - "description": "Array of private link resources", - "items": { - "$ref": "#/definitions/PrivateLinkResource" - } - } - } - }, - "PrivateLinkResource": { - "description": "A private link resource", - "type": "object", - "properties": { - "properties": { - "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResourceProperties", - "description": "Resource properties.", - "x-ms-client-flatten": true - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Metadata pertaining to creation and last modification of the resource." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" - } - ] - } - }, "parameters": { "GroupNameParameter": { "name": "groupName", From 9eba06a4f0ec0bc77c1a0b0852431f59ed6611dd Mon Sep 17 00:00:00 2001 From: Rashmi Patankar Date: Fri, 2 Apr 2021 17:29:47 -0700 Subject: [PATCH 37/37] Enterprise Policies update --- .../2020-10-30-preview/enterprisePolicy.json | 16 ++++++++++++++-- .../examples/getEnterprisePolicy.json | 12 +++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json index fb8317adbe26..59fa3d128b77 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json @@ -475,8 +475,8 @@ "type": "object", "description": "Settings concerning network injection.", "properties": { - "virtualNetwork": { - "$ref": "#/definitions/VirtualNetworkProperties", + "virtualNetworks": { + "$ref": "#/definitions/VirtualNetworkPropertiesList", "description": "Network injection configuration" } } @@ -551,6 +551,18 @@ }, "description": "Url and version of the KeyVault Secret" }, + "VirtualNetworkPropertiesList": { + "properties": { + "value": { + "type": "array", + "description": "Array of virtual networks.", + "items": { + "$ref": "#/definitions/VirtualNetworkProperties" + } + } + }, + "description": "A list of private link resources" + }, "VirtualNetworkProperties": { "type": "object", "description": "Settings concerning the virtual network.", diff --git a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json index 272117361a15..2adac882e965 100644 --- a/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json +++ b/specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json @@ -23,12 +23,14 @@ "state": "succeeded" }, "networkInjection": { - "virtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/virtualNetwork", - "subnet": { - "name": "testSubnet" + "virtualNetworks": [ + { + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/virtualNetwork", + "subnet": { + "name": "testSubnet" + } } - } + ] } }, "systemData": {