Skip to content

Commit c32349e

Browse files
authored
Adding "kind" property to Enterprise Policy model (Azure#14674)
* Initial commit * Fixed the formatting * Fixed the formatting * Making kind property required * Made kinf property required and updated examples * Resolved merge conflicts * Added missing "kind" property in example
1 parent 261d0e3 commit c32349e

File tree

6 files changed

+36
-2
lines changed

6 files changed

+36
-2
lines changed

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,10 @@
407407
"$ref": "#/definitions/EnterprisePolicyIdentity",
408408
"description": "The identity of the EnterprisePolicy."
409409
},
410+
"kind": {
411+
"$ref": "#/definitions/EnterprisePolicyKind",
412+
"description": "The kind (type) of Enterprise Policy."
413+
},
410414
"properties": {
411415
"$ref": "#/definitions/Properties",
412416
"description": "The properties that define configuration for the enterprise policy",
@@ -416,7 +420,10 @@
416420
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
417421
"description": "Metadata pertaining to creation and last modification of the resource."
418422
}
419-
}
423+
},
424+
"required": [
425+
"kind"
426+
]
420427
},
421428
"PatchEnterprisePolicy": {
422429
"type": "object",
@@ -432,6 +439,10 @@
432439
"$ref": "#/definitions/EnterprisePolicyIdentity",
433440
"description": "The identity of the EnterprisePolicy."
434441
},
442+
"kind": {
443+
"$ref": "#/definitions/EnterprisePolicyKind",
444+
"description": "The kind (type) of Enterprise Policy."
445+
},
435446
"properties": {
436447
"$ref": "#/definitions/Properties",
437448
"description": "The properties that define configuration for the enterprise policy",
@@ -524,6 +535,20 @@
524535
"NotConfigured"
525536
]
526537
},
538+
"EnterprisePolicyKind": {
539+
"type": "string",
540+
"description": "The Kind (type) of Enterprise Policy",
541+
"x-ms-enum": {
542+
"name": "EnterprisePolicyKind",
543+
"modelAsString": true
544+
},
545+
"enum": [
546+
"Lockbox",
547+
"PrivateEndpoint",
548+
"Encryption",
549+
"NetworkInjection"
550+
]
551+
},
527552
"KeyVaultProperties": {
528553
"type": "object",
529554
"description": "Settings concerning key vault encryption for a configuration store.",

specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"identity": {
1212
"type": "SystemAssigned"
1313
},
14-
"location": "East US"
14+
"location": "East US",
15+
"kind": "Lockbox"
1516
}
1617
},
1718
"responses": {
@@ -22,6 +23,7 @@
2223
"id": "/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
2324
"type": "Microsoft.PowerPlatform/enterprisePolicies",
2425
"location": "East US",
26+
"kind": "Lockbox",
2527
"tags": {
2628
"Organization": "Administration"
2729
},
@@ -39,6 +41,7 @@
3941
"id": "/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
4042
"type": "Microsoft.PowerPlatform/enterprisePolicies",
4143
"location": "East US",
44+
"kind": "Lockbox",
4245
"tags": {
4346
"Organization": "Administration"
4447
},

specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
1414
"type": "Microsoft.PowerPlatform/enterprisePolicies",
1515
"location": "East US",
16+
"kind": "Lockbox",
1617
"identity": {
1718
"systemAssignedIdentityPrincipalId": "principalId",
1819
"tenantId": "tenantId",

specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy1",
1515
"type": "Microsoft.PowerPlatform/enterprisePolicies",
1616
"location": "East US",
17+
"kind": "Lockbox",
1718
"identity": {
1819
"systemAssignedIdentityPrincipalId": "principalId",
1920
"tenantId": "tenantId",
@@ -33,6 +34,7 @@
3334
"id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy2",
3435
"type": "Microsoft.PowerPlatform/enterprisePolicies",
3536
"location": "East US",
37+
"kind": "Lockbox",
3638
"identity": {
3739
"systemAssignedIdentityPrincipalId": "principalId",
3840
"tenantId": "tenantId",

specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy1",
1414
"type": "Microsoft.PowerPlatform/enterprisePolicies",
1515
"location": "East US",
16+
"kind": "Lockbox",
1617
"identity": {
1718
"systemAssignedIdentityPrincipalId": "principalId",
1819
"tenantId": "tenantId",
@@ -32,6 +33,7 @@
3233
"id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy2",
3334
"type": "Microsoft.PowerPlatform/enterprisePolicies",
3435
"location": "East US",
36+
"kind": "Lockbox",
3537
"identity": {
3638
"systemAssignedIdentityPrincipalId": "principalId",
3739
"tenantId": "tenantId",

specification/powerplatform/resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
2323
"type": "Microsoft.PowerPlatform/enterprisePolicies",
2424
"location": "East US",
25+
"kind": "Lockbox",
2526
"tags": {
2627
"Organization": "Administration"
2728
},

0 commit comments

Comments
 (0)