Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Pprp #13294

Merged
merged 22 commits into from
Mar 8, 2021
Merged

Pprp #13294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f6997e8
Update to use common type
rapatank Nov 17, 2020
1e1ea6e
Change to use common types.
rapatank Dec 14, 2020
849d943
Change to use common types.
rapatank Dec 15, 2020
802c914
Change to use common types.
rapatank Dec 15, 2020
c78c44c
Change to use common types.
rapatank Dec 15, 2020
8381ca6
Change to use common types.
rapatank Dec 15, 2020
ad02e06
Update to use common type.
rapatank Mar 5, 2021
ff230a6
Update .gitignore
rapatank Mar 5, 2021
3d90d70
Update .gitignore
rapatank Mar 5, 2021
ca679c7
Revert "Update to use common type."
rapatank Mar 5, 2021
98b5969
Merge branch 'pprp' of https://github.com/Azure/azure-rest-api-specs …
rapatank Mar 5, 2021
a03ab7a
Delete .gitignore
rapatank Mar 5, 2021
de7f797
Merge branch 'pprp' of https://github.com/Azure/azure-rest-api-specs …
rapatank Mar 5, 2021
ac14fed
Updating the models.
rapatank Mar 5, 2021
3f92b7c
Use common types
rapatank Mar 6, 2021
7a201a5
Use common types
rapatank Mar 6, 2021
3146ae7
Use common types
rapatank Mar 8, 2021
b65a035
Use common types
rapatank Mar 8, 2021
828dff7
Use common types
rapatank Mar 8, 2021
c60c73a
Use common types
rapatank Mar 8, 2021
15d15f1
Use common types
rapatank Mar 8, 2021
1363da4
Use common types
rapatank Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions ...ication/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@
"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": {
"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",
Expand All @@ -73,13 +73,13 @@
"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
},
"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": {
Expand All @@ -100,7 +100,7 @@
"read",
"create"
],
"description": "The Azure Region where the resource lives"
"description": "The geo-location where the resource lives"
}
},
"allOf": [
Expand All @@ -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": [
{
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions ...resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
},
"parameters": [
{
"$ref": "../../common/v1/definitions.json#/parameters/ResourceGroupNameParameter"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
},
{
"name": "enterprisePolicyName",
Expand Down Expand Up @@ -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."
}
}
Expand Down
8 changes: 8 additions & 0 deletions ...osoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions ...t.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionListGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
8 changes: 8 additions & 0 deletions ...ft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateEndpointConnectionUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions ...r/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions ...crosoft.PowerPlatform/preview/2020-10-30-preview/examples/PrivateLinkResourceListGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"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"
}
]
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "User",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
}
}
]
Expand Down
10 changes: 10 additions & 0 deletions ...oft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions ...ager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion ...source-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion ...rce-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/subnetUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions ...r/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateEndpointConnection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@
"$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnectionProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
"description": "Metadata for the private endpoint connection."
}
},
"allOf": [
Expand Down
33 changes: 7 additions & 26 deletions ...urce-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/privateLinkResources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -191,39 +191,20 @@
"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
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
"description": "Metadata for the private link resource."
}
},
"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
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"description": "Metadata for the private link resource."
}
}
}
},
"parameters": {
Expand Down
8 changes: 7 additions & 1 deletion .../resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/subnetResources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,17 @@
"$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."
},
"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."
}
}
Expand All @@ -279,6 +284,7 @@
"properties": {
"id": {
"type": "string",
"pattern": "^/subscriptions/[^/]*/resourceGroups/[^/]*/providers/Microsoft.(ClassicNetwork|Network)/virtualNetworks/[^/]*/subnets/[^/]*$",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex allows double slashes? e.g. /subscriptions//resourceGroups/...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this is the same as the patterns other RPs have defined. Examples:
azure-rest-api-specs\specification\redis\resource-manager\Microsoft.Cache\stable\2017-02-01\redis.json

azure-rest-api-specs\specification\apimanagement\resource-manager\Microsoft.ApiManagement\preview\2019-12-01-preview\apimdeployment.json

"description": "Resource id of the subnet."
}
}
Expand Down