Skip to content

Align all nested_privateEndpoint to the same API version #1053

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

Merged
eriqua merged 3 commits into from
Feb 28, 2022
Merged

Align all nested_privateEndpoint to the same API version #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e26281a
law 2
eriqua Feb 28, 2022
2cd4f89
Merge branch 'main' of https://github.com/Azure/ResourceModules
eriqua Feb 28, 2022
f6cb3c2
pe api update
eriqua Feb 28, 2022
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
4 changes: 2 additions & 2 deletions arm/Microsoft.Automation/automationAccounts/.bicep/nested_privateEndpoint.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var privateEndpoint_var = {
customDnsConfigs: (contains(privateEndpointObj, 'customDnsConfigs') ? (empty(privateEndpointObj.customDnsConfigs) ? null : privateEndpointObj.customDnsConfigs) : null)
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand All @@ -36,7 +36,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
}
}

resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = {
resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = {
name: '${privateEndpoint_var.name}/default'
properties: {
privateDnsZoneConfigs: [for privateDnsZoneResourceId in privateEndpoint_var.privateDnsZoneResourceIds: {
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Automation/automationAccounts/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ This module deploys an Azure Automation Account.
| `Microsoft.Automation/automationAccounts/softwareUpdateConfigurations` | 2019-06-01 |
| `Microsoft.Automation/automationAccounts/variables` | 2020-01-13-preview |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |
| `Microsoft.OperationalInsights/workspaces/linkedServices` | 2020-03-01-preview |
| `Microsoft.OperationsManagement/solutions` | 2015-11-01-preview |

Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.EventHub/namespaces/.bicep/nested_privateEndpoint.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var privateEndpoint_var = {
customDnsConfigs: contains(privateEndpointObj, 'customDnsConfigs') ? (!empty(privateEndpointObj.customDnsConfigs) ? privateEndpointObj.customDnsConfigs : null) : null
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.EventHub/namespaces/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This module deploys an event hub namespace.
| `Microsoft.EventHub/namespaces/eventhubs/authorizationRules` | 2021-06-01-preview |
| `Microsoft.EventHub/namespaces/eventhubs/consumergroups` | 2021-06-01-preview |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |

## Parameters
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_privateEndpoint.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var privateEndpoint_var = {
customDnsConfigs: (contains(privateEndpointObj, 'customDnsConfigs') ? (empty(privateEndpointObj.customDnsConfigs) ? null : privateEndpointObj.customDnsConfigs) : null)
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Insights/privateLinkScopes/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This module deploys an Azure Monitor Private Link Scope.
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `microsoft.insights/privateLinkScopes` | 2019-10-17-preview |
| `Microsoft.Insights/privateLinkScopes/scopedResources` | 2021-07-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |

## Parameters
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/privateEndpoints/.bicep/nested_rbac.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var builtInRoleNames = {
'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' existing = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' existing = {
name: last(split(resourceId, '/'))
}

Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/privateEndpoints/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module pid_cuaId '.bicep/nested_pid.bicep' = if (!empty(cuaId)) {
params: {}
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: name
location: location
tags: tags
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ var privateDnsZoneConfigs = [for privateDNSResourceId in privateDNSResourceIds:
}
}]

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' existing = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' existing = {
name: privateEndpointName
}

resource privateDnsZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = {
resource privateDnsZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = {
name: name
parent: privateEndpoint
properties: {
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This module deploys a private endpoint private DNS zone group

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |

## Parameters

Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/privateEndpoints/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ This template deploys a private endpoint for a generic service.
| :-- | :-- |
| `Microsoft.Authorization/locks` | 2017-04-01 |
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |

### Resource dependency

Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_privateEndpoint.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var privateEndpoint_var = {
customDnsConfigs: contains(privateEndpointObj, 'customDnsConfigs') ? (empty(privateEndpointObj.customDnsConfigs) ? null : privateEndpointObj.customDnsConfigs) : null
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand All @@ -36,7 +36,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
}
}

resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
name: 'default'
properties: {
privateDnsZoneConfigs: [for privateDnsZoneResourceId in privateEndpoint_var.privateDnsZoneResourceIds: {
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Synapse/privateLinkHubs/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ This module deploys Synapse PrivateLinkHubs.
| :-- | :-- |
| `Microsoft.Authorization/locks` | 2017-04-01 |
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |
| `Microsoft.Synapse/privateLinkHubs` | 2021-06-01 |

## Parameters
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Web/sites/.bicep/nested_privateEndpoint.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var privateEndpoint_var = {
customDnsConfigs: contains(privateEndpointObj, 'customDnsConfigs') ? (!empty(privateEndpointObj.customDnsConfigs) ? privateEndpointObj.customDnsConfigs : null) : null
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand All @@ -36,7 +36,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
}
}

resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
name: '${privateEndpoint.name}/default'
properties: {
privateDnsZoneConfigs: [for privateDnsZoneResourceId in privateEndpoint_var.privateDnsZoneResourceIds: {
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Web/sites/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ This module deploys a web or function app.
| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
| `Microsoft.Insights/components` | 2020-02-02 |
| `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |
| `Microsoft.Web/serverfarms` | 2021-02-01 |
| `Microsoft.Web/sites` | 2020-12-01 |
| `Microsoft.Web/sites/config` | 2021-02-01 |
Expand Down
10 changes: 5 additions & 5 deletions docs/wiki/ModulesDesign.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ This section gives you an overview of the design principals the bicep modules fo

---

Modules are written in a quite flexible way, therefore you don’t need to modify them from project to project, as the aim is to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it – i.e. you don’t have to know how the template of the particular module works inside, just take a look at the `readme.md` file of the given module to consume it.
Modules are written in a quite flexible way, therefore you don't need to modify them from project to project, as the aim is to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it - i.e. you don't have to know how the template of the particular module works inside, just take a look at the `readme.md` file of the given module to consume it.

The modules are multi-purpose, therefore contain a lot of dynamic expressions (functions, variables, etc.), so there’s no need to maintain multiple instances for different use cases.
The modules are multi-purpose, therefore contain a lot of dynamic expressions (functions, variables, etc.), so there's no need to maintain multiple instances for different use cases.

They can be deployed in different configurations just by changing the input parameters. They are perceived by the **user** as black boxes, where they don’t have to worry about the internal complexity of the code, as they only interact with them by their parameters.
They can be deployed in different configurations just by changing the input parameters. They are perceived by the **user** as black boxes, where they don't have to worry about the internal complexity of the code, as they only interact with them by their parameters.

# General guidelines

Expand Down Expand Up @@ -327,7 +327,7 @@ var privateEndpoint_var = {
customDnsConfigs: contains(privateEndpointObj, 'customDnsConfigs') ? (empty(privateEndpointObj.customDnsConfigs) ? null : privateEndpointObj.customDnsConfigs) : null
}

resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
name: privateEndpoint_var.name
location: privateEndpointVnetLocation
tags: tags
Expand All @@ -349,7 +349,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
}
}

resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = if (!empty(privateEndpoint_var.privateDnsZoneResourceIds)) {
name: 'default'
properties: {
privateDnsZoneConfigs: [for privateDnsZoneResourceId in privateEndpoint_var.privateDnsZoneResourceIds: {
Expand Down
9 changes: 9 additions & 0 deletions ...lines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-az-aut-law-001"
}
}
}