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

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

Merged
merged 5 commits into from
Nov 25, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a35d01d
Adding integration service environment encryption configuration detai…
Nov 11, 2020
7dfa7ec
Correcting json format errors
Nov 11, 2020
25e5e21
Correcting json formats
Nov 11, 2020
aae90de
Updating examples
Nov 11, 2020
58d4e98
Fixing encryption key properties definition
Nov 11, 2020
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
9 changes: 9 additions & 0 deletions ...anager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 18 additions & 0 deletions ....Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 18 additions & 0 deletions ...t.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions ...ager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions ...anager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_Put.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8856,6 +8856,10 @@
"networkConfiguration": {
"$ref": "#/definitions/NetworkConfiguration",
"description": "The network configuration."
},
"encryptionConfiguration": {
"$ref": "#/definitions/IntegrationServiceEnvironmenEncryptionConfiguration",
"description": "The encryption configuration."
}
}
},
Expand Down Expand Up @@ -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.",
Expand Down