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
AzureSDKAutomation · Jun 8, 2021 · c32349e · c32349e
1 parent 261d0e3
commit c32349e
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/...resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json b/...resource-manager/Microsoft.PowerPlatform/preview/2020-10-30-preview/enterprisePolicy.json
@@ -407,6 +407,10 @@
           "$ref": "#/definitions/EnterprisePolicyIdentity",
           "description": "The identity of the EnterprisePolicy."
         },
+        "kind": {
+          "$ref": "#/definitions/EnterprisePolicyKind",
+          "description": "The kind (type) of Enterprise Policy."
+        },
         "properties": {
           "$ref": "#/definitions/Properties",
           "description": "The properties that define configuration for the enterprise policy",
@@ -416,7 +420,10 @@
           "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Metadata pertaining to creation and last modification of the resource."
         }
-      }
+      },
+      "required": [
+        "kind"
+      ]
     },
     "PatchEnterprisePolicy": {
       "type": "object",
@@ -432,6 +439,10 @@
           "$ref": "#/definitions/EnterprisePolicyIdentity",
           "description": "The identity of the EnterprisePolicy."
         },
+        "kind": {
+          "$ref": "#/definitions/EnterprisePolicyKind",
+          "description": "The kind (type) of Enterprise Policy."
+        },
         "properties": {
           "$ref": "#/definitions/Properties",
           "description": "The properties that define configuration for the enterprise policy",
@@ -524,6 +535,20 @@
         "NotConfigured"
       ]
     },
+    "EnterprisePolicyKind": {
+      "type": "string",
+      "description": "The Kind (type) of Enterprise Policy",
+      "x-ms-enum": {
+        "name": "EnterprisePolicyKind",
+        "modelAsString": true
+      },
+      "enum": [
+        "Lockbox",
+        "PrivateEndpoint",
+        "Encryption",
+        "NetworkInjection"
+      ]
+    },
     "KeyVaultProperties": {
       "type": "object",
       "description": "Settings concerning key vault encryption for a configuration store.",

diff --git a/...oft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json b/...oft.PowerPlatform/preview/2020-10-30-preview/examples/createOrUpdateEnterprisePolicy.json
@@ -11,7 +11,8 @@
       "identity": {
         "type": "SystemAssigned"
       },
-      "location": "East US"
+      "location": "East US",
+      "kind": "Lockbox"
     }
   },
   "responses": {
@@ -22,6 +23,7 @@
         "id": "/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
         "type": "Microsoft.PowerPlatform/enterprisePolicies",
         "location": "East US",
+        "kind": "Lockbox",
         "tags": {
           "Organization": "Administration"
         },
@@ -39,6 +41,7 @@
         "id": "/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
         "type": "Microsoft.PowerPlatform/enterprisePolicies",
         "location": "East US",
+        "kind": "Lockbox",
         "tags": {
           "Organization": "Administration"
         },

diff --git a/...ager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json b/...ager/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/getEnterprisePolicy.json
@@ -13,6 +13,7 @@
         "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
         "type": "Microsoft.PowerPlatform/enterprisePolicies",
         "location": "East US",
+        "kind": "Lockbox",
         "identity": {
           "systemAssignedIdentityPrincipalId": "principalId",
           "tenantId": "tenantId",

diff --git a/...erPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json b/...erPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesByResourceGroup.json
@@ -14,6 +14,7 @@
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy1",
             "type": "Microsoft.PowerPlatform/enterprisePolicies",
             "location": "East US",
+            "kind": "Lockbox",
             "identity": {
               "systemAssignedIdentityPrincipalId": "principalId",
               "tenantId": "tenantId",
@@ -33,6 +34,7 @@
             "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy2",
             "type": "Microsoft.PowerPlatform/enterprisePolicies",
             "location": "East US",
+            "kind": "Lockbox",
             "identity": {
               "systemAssignedIdentityPrincipalId": "principalId",
               "tenantId": "tenantId",

diff --git a/...werPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json b/...werPlatform/preview/2020-10-30-preview/examples/listEnterprisePoliciesBySubscription.json
@@ -13,6 +13,7 @@
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy1",
             "type": "Microsoft.PowerPlatform/enterprisePolicies",
             "location": "East US",
+            "kind": "Lockbox",
             "identity": {
               "systemAssignedIdentityPrincipalId": "principalId",
               "tenantId": "tenantId",
@@ -32,6 +33,7 @@
             "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy2",
             "type": "Microsoft.PowerPlatform/enterprisePolicies",
             "location": "East US",
+            "kind": "Lockbox",
             "identity": {
               "systemAssignedIdentityPrincipalId": "principalId",
               "tenantId": "tenantId",

diff --git a/...r/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json b/...r/Microsoft.PowerPlatform/preview/2020-10-30-preview/examples/updateEnterprisePolicy.json
@@ -22,6 +22,7 @@
         "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.PowerPlatform/enterprisePolicies/enterprisePolicy",
         "type": "Microsoft.PowerPlatform/enterprisePolicies",
         "location": "East US",
+        "kind": "Lockbox",
         "tags": {
           "Organization": "Administration"
         },