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

Updates for SystemData. #13348

Merged
merged 34 commits into from
Mar 12, 2021
Merged

Updates for SystemData. #13348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 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
d66ea6f
Use common types
rapatank Mar 9, 2021
65659fb
Merge branch 'master' into pprp
rapatank Mar 9, 2021
f3e548a
Use common types
rapatank Mar 10, 2021
f37f633
Use common types
rapatank Mar 10, 2021
475ab6e
Use common types
rapatank Mar 10, 2021
3097e1f
Use common types
rapatank Mar 10, 2021
422e24d
Use common types
rapatank Mar 11, 2021
d063763
Use common types
rapatank Mar 11, 2021
9e2cc27
Use common types
rapatank Mar 11, 2021
7b553ec
Use common types
rapatank Mar 11, 2021
d5894f9
Use common types
rapatank Mar 12, 2021
0622845
Use common types
rapatank Mar 12, 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
126 changes: 2 additions & 124 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 @@ -24,61 +24,7 @@
},
"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": {
"PatchTrackedResource": {
"description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'",
"type": "object",
"properties": {
Expand All @@ -105,77 +51,9 @@
},
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/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": {
Expand Down
89 changes: 57 additions & 32 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 @@ -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",
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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": {
Expand All @@ -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"
}
}
},
Expand All @@ -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",
Expand All @@ -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": {
Expand All @@ -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"
}
}
},
Expand Down Expand Up @@ -215,20 +215,20 @@
"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",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/EnterprisePolicy"
"$ref": "#/definitions/PatchEnterprisePolicy"
},
"description": "Parameters supplied to update EnterprisePolicy."
}
Expand All @@ -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"
}
}
},
Expand All @@ -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": {
Expand All @@ -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"
}
}
},
Expand Down Expand Up @@ -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": {
Expand All @@ -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"
}
}
},
Expand Down Expand Up @@ -363,20 +363,20 @@
"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": {
"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"
}
}
},
Expand All @@ -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/v2/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand All @@ -411,6 +411,35 @@
"$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."
}
}
},
"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."
}
}
},
Expand All @@ -437,10 +466,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."
}
}
},
Expand Down
Loading