Skip to content

Commit a7d95a7

Browse files
rapatankrapatank
authored
Updates for SystemData. (#13348)
* Update to use common type * Change to use common types. * Change to use common types. * Change to use common types. * Change to use common types. * Change to use common types. * Update to use common type. * Update .gitignore * Update .gitignore * Revert "Update to use common type." This reverts commit ad02e06. * Delete .gitignore * Updating the models. * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types * Use common types
1 parent 26128b7 commit a7d95a7

14 files changed

+202
-307
lines changed

‎specification/powerplatform/resource-manager/Microsoft.PowerPlatform/common/v1/definitions.json‎

Lines changed: 2 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,7 @@
2424
},
2525
"paths": {},
2626
"definitions": {
27-
"ErrorResponse": {
28-
"description": "ARM error response body.",
29-
"type": "object",
30-
"properties": {
31-
"error": {
32-
"$ref": "#/definitions/ErrorResponseBody",
33-
"description": "Details about the error."
34-
}
35-
}
36-
},
37-
"ErrorResponseBody": {
38-
"properties": {
39-
"code": {
40-
"type": "string",
41-
"description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
42-
},
43-
"message": {
44-
"type": "string",
45-
"description": "A message describing the error, intended to be suitable for display in a user interface."
46-
},
47-
"target": {
48-
"type": "string",
49-
"description": "The target of the particular error. For example, the name of the property in error."
50-
}
51-
},
52-
"description": "An error response from the PowerPlatform service."
53-
},
54-
"Resource": {
55-
"description": "Common fields that are returned in the response for all Azure Resource Manager resources",
56-
"type": "object",
57-
"properties": {
58-
"id": {
59-
"type": "string",
60-
"readOnly": true,
61-
"description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
62-
},
63-
"name": {
64-
"type": "string",
65-
"readOnly": true,
66-
"description": "The name of the resource"
67-
},
68-
"location": {
69-
"type": "string",
70-
"readOnly": true,
71-
"description": "Region where the EnterprisePolicy is located."
72-
},
73-
"type": {
74-
"readOnly": true,
75-
"type": "string",
76-
"description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\""
77-
}
78-
},
79-
"x-ms-azure-resource": true
80-
},
81-
"TrackedResource": {
27+
"PatchTrackedResource": {
8228
"description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'",
8329
"type": "object",
8430
"properties": {
@@ -105,77 +51,9 @@
10551
},
10652
"allOf": [
10753
{
108-
"$ref": "#/definitions/Resource"
54+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
10955
}
11056
]
111-
},
112-
"ProxyResource": {
113-
"description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location",
114-
"type": "object",
115-
"allOf": [
116-
{
117-
"$ref": "#/definitions/Resource"
118-
}
119-
],
120-
"properties": {}
121-
},
122-
"Operation": {
123-
"title": "REST API Operation",
124-
"description": "Details of a REST API operation, returned from the Resource Provider Operations API",
125-
"type": "object",
126-
"properties": {
127-
"name": {
128-
"description": "The name of the operation, as per Resource-Based Access Control (RBAC). Examples: \"Microsoft.Compute/virtualMachines/write\", \"Microsoft.Compute/virtualMachines/capture/action\"",
129-
"type": "string"
130-
},
131-
"isDataAction": {
132-
"description": "Whether the operation applies to data-plane. This is \"true\" for data-plane operations and \"false\" for ARM/control-plane operations.",
133-
"type": "string"
134-
},
135-
"display": {
136-
"properties": {
137-
"provider": {
138-
"description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".",
139-
"type": "string"
140-
},
141-
"resource": {
142-
"description": "The localized friendly name of the resource type related to this operation. E.g. \"Virtual Machines\" or \"Job Schedule Collections\".",
143-
"type": "string"
144-
},
145-
"operation": {
146-
"description": "The concise, localized friendly name for the operation; suitable for dropdowns. E.g. \"Create or Update Virtual Machine\", \"Restart Virtual Machine\".",
147-
"type": "string"
148-
},
149-
"description": {
150-
"description": "The short, localized friendly description of the operation; suitable for tool tips and detailed views.",
151-
"type": "string"
152-
}
153-
},
154-
"description": "Localized display information for this particular operation."
155-
},
156-
"properties": {
157-
"properties": {
158-
"statusCode": {
159-
"description": "Service provider: Microsoft.PowerPlatform",
160-
"type": "string"
161-
}
162-
},
163-
"x-ms-client-flatten": true,
164-
"description": "Provider, Resource, Operation and description values."
165-
}
166-
}
167-
},
168-
"OperationList": {
169-
"properties": {
170-
"value": {
171-
"type": "array",
172-
"items": {
173-
"$ref": "#/definitions/Operation"
174-
},
175-
"description": "List of PowerPlatform operations supported by the PowerPlatform resource provider."
176-
}
177-
},
178-
"description": "The response model for the list of PowerPlatform operations"
17957
}
18058
},
18159
"parameters": {

‎specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json‎

Lines changed: 57 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
"description": "Name of the EnterprisePolicy."
4949
},
5050
{
51-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
51+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
5252
},
5353
{
54-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
54+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
5555
},
5656
{
57-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
57+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
5858
},
5959
{
6060
"name": "parameters",
@@ -82,7 +82,7 @@
8282
"default": {
8383
"description": "Error response describing why the operation failed.",
8484
"schema": {
85-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
85+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
8686
}
8787
}
8888
},
@@ -114,13 +114,13 @@
114114
"description": "The EnterprisePolicy name."
115115
},
116116
{
117-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
117+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
118118
},
119119
{
120-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
120+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
121121
},
122122
{
123-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
123+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
124124
}
125125
],
126126
"responses": {
@@ -133,7 +133,7 @@
133133
"default": {
134134
"description": "Error response describing why the operation failed.",
135135
"schema": {
136-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
136+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
137137
}
138138
}
139139
},
@@ -157,7 +157,7 @@
157157
},
158158
"parameters": [
159159
{
160-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
160+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
161161
},
162162
{
163163
"name": "enterprisePolicyName",
@@ -167,10 +167,10 @@
167167
"description": "Name of the EnterprisePolicy"
168168
},
169169
{
170-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
170+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
171171
},
172172
{
173-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
173+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
174174
}
175175
],
176176
"responses": {
@@ -183,7 +183,7 @@
183183
"default": {
184184
"description": "Error response describing why the operation failed.",
185185
"schema": {
186-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
186+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
187187
}
188188
}
189189
},
@@ -215,20 +215,20 @@
215215
"description": "Name of the EnterprisePolicy."
216216
},
217217
{
218-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
218+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
219219
},
220220
{
221-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
221+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
222222
},
223223
{
224-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
224+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
225225
},
226226
{
227227
"name": "parameters",
228228
"in": "body",
229229
"required": true,
230230
"schema": {
231-
"$ref": "#/definitions/EnterprisePolicy"
231+
"$ref": "#/definitions/PatchEnterprisePolicy"
232232
},
233233
"description": "Parameters supplied to update EnterprisePolicy."
234234
}
@@ -243,7 +243,7 @@
243243
"default": {
244244
"description": "Error response describing why the operation failed.",
245245
"schema": {
246-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
246+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
247247
}
248248
}
249249
},
@@ -270,13 +270,13 @@
270270
},
271271
"parameters": [
272272
{
273-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
273+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
274274
},
275275
{
276-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
276+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
277277
},
278278
{
279-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
279+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
280280
}
281281
],
282282
"responses": {
@@ -289,7 +289,7 @@
289289
"default": {
290290
"description": "Error response describing why the operation failed.",
291291
"schema": {
292-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
292+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
293293
}
294294
}
295295
},
@@ -318,10 +318,10 @@
318318
},
319319
"parameters": [
320320
{
321-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
321+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
322322
},
323323
{
324-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
324+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
325325
}
326326
],
327327
"responses": {
@@ -334,7 +334,7 @@
334334
"default": {
335335
"description": "Error response describing why the operation failed.",
336336
"schema": {
337-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
337+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
338338
}
339339
}
340340
},
@@ -363,20 +363,20 @@
363363
"operationId": "Operations_List",
364364
"parameters": [
365365
{
366-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
366+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
367367
}
368368
],
369369
"responses": {
370370
"200": {
371371
"description": "OK",
372372
"schema": {
373-
"$ref": "../../common/v1/definitions.json#/definitions/OperationList"
373+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
374374
}
375375
},
376376
"default": {
377377
"description": "Error response describing why the operation failed.",
378378
"schema": {
379-
"$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse"
379+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
380380
}
381381
}
382382
},
@@ -399,7 +399,7 @@
399399
"allOf": [
400400
{
401401
"description": "The resource model definition for a ARM tracked top level resource.",
402-
"$ref": "../../common/v1/definitions.json#/definitions/TrackedResource"
402+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
403403
}
404404
],
405405
"properties": {
@@ -411,6 +411,35 @@
411411
"$ref": "#/definitions/Properties",
412412
"description": "The properties that define configuration for the enterprise policy",
413413
"x-ms-client-flatten": true
414+
},
415+
"systemData": {
416+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
417+
"description": "Metadata pertaining to creation and last modification of the resource."
418+
}
419+
}
420+
},
421+
"PatchEnterprisePolicy": {
422+
"type": "object",
423+
"description": "Definition of the EnterprisePolicy.",
424+
"allOf": [
425+
{
426+
"description": "The resource model definition for a ARM tracked top level resource.",
427+
"$ref": "../../common/v1/definitions.json#/definitions/PatchTrackedResource"
428+
}
429+
],
430+
"properties": {
431+
"identity": {
432+
"$ref": "#/definitions/EnterprisePolicyIdentity",
433+
"description": "The identity of the EnterprisePolicy."
434+
},
435+
"properties": {
436+
"$ref": "#/definitions/Properties",
437+
"description": "The properties that define configuration for the enterprise policy",
438+
"x-ms-client-flatten": true
439+
},
440+
"systemData": {
441+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
442+
"description": "Metadata pertaining to creation and last modification of the resource."
414443
}
415444
}
416445
},
@@ -437,10 +466,6 @@
437466
"description": "Key vault properties."
438467
}
439468
}
440-
},
441-
"systemData": {
442-
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
443-
"description": "Metadata pertaining to creation and last modification of the resource."
444469
}
445470
}
446471
},

0 commit comments

Comments
 (0)