[Hub Generated] Review request for Microsoft.Logic to add version stable/2019-05-01 (#11627)

rarayudu · Rama Krishna Rayudu · web-flow · commit cc627fc1f017 · 2020-11-25T08:37:38.000+08:00
* Adding integration service environment encryption configuration details to Logic spec

* Correcting json format errors

* Correcting json formats

* Updating examples

* Fixing encryption key properties definition

Co-authored-by: Rama Krishna Rayudu &lt;rarayudu@microsoft.com&gt;
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Get.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Get.json
@@ -75,6 +75,15 @@
                 "type": "Microsoft.Network/virtualNetworks/subnets"
               }
             ]
+          },
+          "encryptionConfiguration": {
+            "encryptionKeyReference": {
+              "keyVault": {
+                "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+              },
+              "keyName": "testKeyName",
+              "keyVersion": "13b261d30b984753869902d7f47f4d55"
+            }
           }
         },
         "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/testIntegrationServiceEnvironment",
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListByResourceGroup.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListByResourceGroup.json
@@ -76,6 +76,15 @@
                     "type": "Microsoft.Network/virtualNetworks/subnets"
                   }
                 ]
+              },
+              "encryptionConfiguration": {
+                "encryptionKeyReference": {
+                  "keyVault": {
+                    "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+                  },
+                  "keyName": "testKeyName",
+                  "keyVersion": "13b261d30b984753869902d7f47f4d55"
+                }
               }
             },
             "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/ISE-ILB-NU",
@@ -151,6 +160,15 @@
                     "type": "Microsoft.Network/virtualNetworks/subnets"
                   }
                 ]
+              },
+              "encryptionConfiguration": {
+                "encryptionKeyReference": {
+                  "keyVault": {
+                    "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+                  },
+                  "keyName": "testKeyName",
+                  "keyVersion": "13b261d30b984753869902d7f47f4d55"
+                }
               }
             },
             "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/ISE-ILB-WCentralUS",
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListBySubscription.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListBySubscription.json
@@ -75,6 +75,15 @@
                     "type": "Microsoft.Network/virtualNetworks/subnets"
                   }
                 ]
+              },
+              "encryptionConfiguration": {
+                "encryptionKeyReference": {
+                  "keyVault": {
+                    "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+                  },
+                  "keyName": "testKeyName",
+                  "keyVersion": "13b261d30b984753869902d7f47f4d55"
+                }
               }
             },
             "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/ISE-ILB-NU",
@@ -150,6 +159,15 @@
                     "type": "Microsoft.Network/virtualNetworks/subnets"
                   }
                 ]
+              },
+              "encryptionConfiguration": {
+                "encryptionKeyReference": {
+                  "keyVault": {
+                    "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+                  },
+                  "keyName": "testKeyName",
+                  "keyVersion": "13b261d30b984753869902d7f47f4d55"
+                }
               }
             },
             "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/TestISE-WCentralUS",
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Patch.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Patch.json
@@ -87,6 +87,15 @@
                 "type": "Microsoft.Network/virtualNetworks/subnets"
               }
             ]
+          },
+          "encryptionConfiguration": {
+            "encryptionKeyReference": {
+              "keyVault": {
+                "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+              },
+              "keyName": "testKeyName",
+              "keyVersion": "13b261d30b984753869902d7f47f4d55"
+            }
           }
         },
         "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/testIntegrationServiceEnvironment",
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Put.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Put.json
@@ -29,6 +29,15 @@
               "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Network/virtualNetworks/testVNET/subnets/s4"
             }
           ]
+        },
+        "encryptionConfiguration": {
+          "encryptionKeyReference": {
+            "keyVault": {
+              "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"
+            },
+            "keyName": "testKeyName",
+            "keyVersion": "13b261d30b984753869902d7f47f4d55"
+          }
         }
       }
     }
diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json
@@ -8856,6 +8856,10 @@
         "networkConfiguration": {
           "$ref": "#/definitions/NetworkConfiguration",
           "description": "The network configuration."
+        },
+        "encryptionConfiguration": {
+          "$ref": "#/definitions/IntegrationServiceEnvironmenEncryptionConfiguration",
+          "description": "The encryption configuration."
         }
       }
     },
@@ -8917,6 +8921,34 @@
         "modelAsString": true
       }
     },
+    "IntegrationServiceEnvironmenEncryptionConfiguration": {
+      "type": "object",
+      "description": "The encryption configuration for the integration service environment.",
+      "properties": {
+        "encryptionKeyReference": {
+          "$ref": "#/definitions/IntegrationServiceEnvironmenEncryptionKeyReference",
+          "description": "The encryption key reference."
+        }
+      }
+    },
+    "IntegrationServiceEnvironmenEncryptionKeyReference": {
+      "type": "object",
+      "description": "The encryption key details for the integration service environment.",
+      "properties": {
+        "keyVault": {
+          "$ref": "#/definitions/ResourceReference",
+          "description": "The key vault reference."
+        },
+        "keyName": {
+          "type": "string",
+          "description": "Gets the key name in the Key Vault."
+        },
+        "keyVersion": {
+          "type": "string",
+          "description": "Gets the version of the key specified in the keyName property."
+        }
+      }
+    },
     "FlowAccessControlConfiguration": {
       "type": "object",
       "description": "The access control configuration.",

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,15 @@`
`75`	`75`	`"type": "Microsoft.Network/virtualNetworks/subnets"`
`76`	`76`	`}`
`77`	`77`	`]`
	`78`	`+ },`
	`79`	`+ "encryptionConfiguration": {`
	`80`	`+ "encryptionKeyReference": {`
	`81`	`+ "keyVault": {`
	`82`	`+ "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"`
	`83`	`+ },`
	`84`	`+ "keyName": "testKeyName",`
	`85`	`+ "keyVersion": "13b261d30b984753869902d7f47f4d55"`
	`86`	`+ }`
`78`	`87`	`}`
`79`	`88`	`},`
`80`	`89`	`"id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/testIntegrationServiceEnvironment",`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,15 @@`
`76`	`76`	`"type": "Microsoft.Network/virtualNetworks/subnets"`
`77`	`77`	`}`
`78`	`78`	`]`
	`79`	`+ },`
	`80`	`+ "encryptionConfiguration": {`
	`81`	`+ "encryptionKeyReference": {`
	`82`	`+ "keyVault": {`
	`83`	`+ "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"`
	`84`	`+ },`
	`85`	`+ "keyName": "testKeyName",`
	`86`	`+ "keyVersion": "13b261d30b984753869902d7f47f4d55"`
	`87`	`+ }`
`79`	`88`	`}`
`80`	`89`	`},`
`81`	`90`	`"id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/ISE-ILB-NU",`
`@@ -151,6 +160,15 @@`
`151`	`160`	`"type": "Microsoft.Network/virtualNetworks/subnets"`
`152`	`161`	`}`
`153`	`162`	`]`
	`163`	`+ },`
	`164`	`+ "encryptionConfiguration": {`
	`165`	`+ "encryptionKeyReference": {`
	`166`	`+ "keyVault": {`
	`167`	`+ "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"`
	`168`	`+ },`
	`169`	`+ "keyName": "testKeyName",`
	`170`	`+ "keyVersion": "13b261d30b984753869902d7f47f4d55"`
	`171`	`+ }`
`154`	`172`	`}`
`155`	`173`	`},`
`156`	`174`	`"id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/ISE-ILB-WCentralUS",`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,15 @@`
`87`	`87`	`"type": "Microsoft.Network/virtualNetworks/subnets"`
`88`	`88`	`}`
`89`	`89`	`]`
	`90`	`+ },`
	`91`	`+ "encryptionConfiguration": {`
	`92`	`+ "encryptionKeyReference": {`
	`93`	`+ "keyVault": {`
	`94`	`+ "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"`
	`95`	`+ },`
	`96`	`+ "keyName": "testKeyName",`
	`97`	`+ "keyVersion": "13b261d30b984753869902d7f47f4d55"`
	`98`	`+ }`
`90`	`99`	`}`
`91`	`100`	`},`
`92`	`101`	`"id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Logic/integrationServiceEnvironments/testIntegrationServiceEnvironment",`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,15 @@`
`29`	`29`	`"id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.Network/virtualNetworks/testVNET/subnets/s4"`
`30`	`30`	`}`
`31`	`31`	`]`
	`32`	`+ },`
	`33`	`+ "encryptionConfiguration": {`
	`34`	`+ "encryptionKeyReference": {`
	`35`	`+ "keyVault": {`
	`36`	`+ "id": "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourceGroups/testResourceGroup/providers/Microsoft.KeyVault/vaults/testKeyVault"`
	`37`	`+ },`
	`38`	`+ "keyName": "testKeyName",`
	`39`	`+ "keyVersion": "13b261d30b984753869902d7f47f4d55"`
	`40`	`+ }`
`32`	`41`	`}`
`33`	`42`	`}`
`34`	`43`	`}`