Skip to content

Commit

Permalink
feat: Updated to Bicep version 0.31.92 (Azure#3871)
Browse files Browse the repository at this point in the history
## Description

Fixed failing pipeline by updating Bicep to version 0.31.92 and running
Set-AVMModule

## Pipeline Reference




| Pipeline |
| -------- |

|[![avm.res.cdn.profile](https://github.com/gbeaud/bicep-registry-modules/actions/workflows/avm.res.cdn.profile.yml/badge.svg)](https://github.com/gbeaud/bicep-registry-modules/actions/workflows/avm.res.cdn.profile.yml)|

## Type of Change

<!-- Use the checkboxes [x] on the options that are relevant. -->

- [ ] Update to CI Environment or utilities (Non-module affecting
changes)
- [ ] Azure Verified Module updates:
- [x] Bugfix containing backwards-compatible bug fixes, and I have NOT
bumped the MAJOR or MINOR version in `version.json`:
- [ ] Someone has opened a bug report issue, and I have included "Closes
#{bug_report_issue_number}" in the PR description.
- [ ] The bug was found by the module author, and no one has opened an
issue to report it yet.
- [ ] Feature update backwards compatible feature updates, and I have
bumped the MINOR version in `version.json`.
- [ ] Breaking changes and I have bumped the MAJOR version in
`version.json`.
  - [ ] Update to documentation

## Checklist

- [x] I'm sure there are no other open Pull Requests for the same
update/change
- [x] I have run `Set-AVMModule` locally to generate the supporting
module files.
- [x] My corresponding pipelines / checks run clean and green without
any errors or warnings

<!-- Please keep up to date with the contribution guide at
https://aka.ms/avm/contribute/bicep -->
  • Loading branch information
gbeaud authored Dec 4, 2024
1 parent 8e36d95 commit e004eed
Show file tree
Hide file tree
Showing 14 changed files with 254 additions and 109 deletions.
4 changes: 2 additions & 2 deletions avm/res/cdn/profile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2145,13 +2145,13 @@ Array of Security Policy objects (see https://learn.microsoft.com/en-us/azure/te

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`associations`](#parameter-securitypoliciesassociations) | array | Domain names and URL patterns to math with this association. |
| [`associations`](#parameter-securitypoliciesassociations) | array | Domain names and URL patterns to match with this association. |
| [`name`](#parameter-securitypoliciesname) | string | Name of the security policy. |
| [`wafPolicyResourceId`](#parameter-securitypolicieswafpolicyresourceid) | string | Resource ID of WAF policy. |

### Parameter: `securityPolicies.associations`

Domain names and URL patterns to math with this association.
Domain names and URL patterns to match with this association.

- Required: Yes
- Type: array
Expand Down
41 changes: 30 additions & 11 deletions avm/res/cdn/profile/afdEndpoint/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "16899001110062450573"
"version": "0.31.92.45157",
"templateHash": "8817136365913068133"
},
"name": "CDN Profiles AFD Endpoints",
"description": "This module deploys a CDN Profile AFD Endpoint.",
Expand Down Expand Up @@ -314,7 +314,10 @@
"properties": {
"autoGeneratedDomainNameLabelScope": "[parameters('autoGeneratedDomainNameLabelScope')]",
"enabledState": "[parameters('enabledState')]"
}
},
"dependsOn": [
"profile"
]
},
"afdEndpoint_routes": {
"copy": {
Expand Down Expand Up @@ -380,8 +383,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "15873678240851060540"
"version": "0.31.92.45157",
"templateHash": "17863230728556651506"
},
"name": "CDN Profiles AFD Endpoint Route",
"description": "This module deploys a CDN Profile AFD Endpoint route.",
Expand Down Expand Up @@ -674,7 +677,10 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/afdEndpoints",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('afdEndpointName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('afdEndpointName'))]",
"dependsOn": [
"profile"
]
},
"profile::customDomains": {
"copy": {
Expand All @@ -684,13 +690,19 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/customDomains",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), coalesce(parameters('customDomainNames'), createArray())[copyIndex()])]"
"name": "[format('{0}/{1}', parameters('profileName'), coalesce(parameters('customDomainNames'), createArray())[copyIndex()])]",
"dependsOn": [
"profile"
]
},
"profile::originGroup": {
"existing": true,
"type": "Microsoft.Cdn/profiles/originGroups",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('originGroupName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('originGroupName'))]",
"dependsOn": [
"profile"
]
},
"profile::ruleSet": {
"copy": {
Expand All @@ -700,7 +712,10 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/ruleSets",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('ruleSets')[copyIndex()].name)]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('ruleSets')[copyIndex()].name)]",
"dependsOn": [
"profile"
]
},
"profile": {
"existing": true,
Expand Down Expand Up @@ -740,7 +755,10 @@
"originPath": "[parameters('originPath')]",
"patternsToMatch": "[parameters('patternsToMatch')]",
"supportedProtocols": "[parameters('supportedProtocols')]"
}
},
"dependsOn": [
"profile::afdEndpoint"
]
}
},
"outputs": {
Expand Down Expand Up @@ -769,7 +787,8 @@
}
},
"dependsOn": [
"afdEndpoint"
"afdEndpoint",
"profile"
]
}
},
Expand Down
29 changes: 22 additions & 7 deletions avm/res/cdn/profile/afdEndpoint/route/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "15873678240851060540"
"version": "0.31.92.45157",
"templateHash": "17863230728556651506"
},
"name": "CDN Profiles AFD Endpoint Route",
"description": "This module deploys a CDN Profile AFD Endpoint route.",
Expand Down Expand Up @@ -299,7 +299,10 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/afdEndpoints",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('afdEndpointName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('afdEndpointName'))]",
"dependsOn": [
"profile"
]
},
"profile::customDomains": {
"copy": {
Expand All @@ -309,13 +312,19 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/customDomains",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), coalesce(parameters('customDomainNames'), createArray())[copyIndex()])]"
"name": "[format('{0}/{1}', parameters('profileName'), coalesce(parameters('customDomainNames'), createArray())[copyIndex()])]",
"dependsOn": [
"profile"
]
},
"profile::originGroup": {
"existing": true,
"type": "Microsoft.Cdn/profiles/originGroups",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('originGroupName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('originGroupName'))]",
"dependsOn": [
"profile"
]
},
"profile::ruleSet": {
"copy": {
Expand All @@ -325,7 +334,10 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/ruleSets",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('ruleSets')[copyIndex()].name)]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('ruleSets')[copyIndex()].name)]",
"dependsOn": [
"profile"
]
},
"profile": {
"existing": true,
Expand Down Expand Up @@ -365,7 +377,10 @@
"originPath": "[parameters('originPath')]",
"patternsToMatch": "[parameters('patternsToMatch')]",
"supportedProtocols": "[parameters('supportedProtocols')]"
}
},
"dependsOn": [
"profile::afdEndpoint"
]
}
},
"outputs": {
Expand Down
14 changes: 10 additions & 4 deletions avm/res/cdn/profile/customdomain/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "10387694873442665915"
"version": "0.31.92.45157",
"templateHash": "420872064438039619"
},
"name": "CDN Profiles Custom Domains",
"description": "This module deploys a CDN Profile Custom Domains.",
Expand Down Expand Up @@ -160,7 +160,10 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/secrets",
"apiVersion": "2023-05-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('secretName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('secretName'))]",
"dependsOn": [
"profile"
]
},
"profile": {
"existing": true,
Expand All @@ -182,7 +185,10 @@
"minimumTlsVersion": "[parameters('minimumTlsVersion')]",
"secret": "[if(not(empty(parameters('secretName'))), createObject('id', resourceId('Microsoft.Cdn/profiles/secrets', parameters('profileName'), parameters('secretName'))), null())]"
}
}
},
"dependsOn": [
"profile"
]
}
},
"outputs": {
Expand Down
26 changes: 18 additions & 8 deletions avm/res/cdn/profile/endpoint/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "5709530270456479127"
"version": "0.31.92.45157",
"templateHash": "10963194836019535201"
},
"name": "CDN Profiles Endpoints",
"description": "This module deploys a CDN Profile Endpoint.",
Expand Down Expand Up @@ -59,7 +59,10 @@
"name": "[format('{0}/{1}', parameters('profileName'), parameters('name'))]",
"location": "[parameters('location')]",
"properties": "[parameters('properties')]",
"tags": "[parameters('tags')]"
"tags": "[parameters('tags')]",
"dependsOn": [
"profile"
]
},
"endpoint_origins": {
"copy": {
Expand Down Expand Up @@ -122,8 +125,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "12416203553821456162"
"version": "0.31.92.45157",
"templateHash": "11497360667926217808"
},
"name": "CDN Profiles Endpoints Origins",
"description": "This module deploys a CDN Profile Endpoint Origin.",
Expand Down Expand Up @@ -230,13 +233,19 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/endpoints",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('endpointName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('endpointName'))]",
"dependsOn": [
"profile"
]
},
"origin": {
"type": "Microsoft.Cdn/profiles/endpoints/origins",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}/{2}', parameters('profileName'), parameters('endpointName'), parameters('name'))]",
"properties": "[union(createObject('hostName', parameters('hostName'), 'httpPort', parameters('httpPort'), 'enabled', parameters('enabled'), 'httpsPort', parameters('httpsPort')), if(or(greater(parameters('priority'), 0), greater(parameters('weight'), 0)), createObject('priority', parameters('priority'), 'weight', parameters('weight')), createObject()), if(and(not(empty(parameters('privateLinkAlias'))), not(empty(parameters('privateLinkLocation')))), createObject('privateLinkAlias', parameters('privateLinkAlias'), 'privateLinkLocation', parameters('privateLinkLocation')), createObject()), if(not(empty(parameters('privateLinkResourceId'))), createObject('privateLinkResourceId', parameters('privateLinkResourceId')), createObject()), if(not(empty(parameters('originHostHeader'))), createObject('originHostHeader', parameters('originHostHeader')), createObject()))]"
"properties": "[union(createObject('hostName', parameters('hostName'), 'httpPort', parameters('httpPort'), 'enabled', parameters('enabled'), 'httpsPort', parameters('httpsPort')), if(or(greater(parameters('priority'), 0), greater(parameters('weight'), 0)), createObject('priority', parameters('priority'), 'weight', parameters('weight')), createObject()), if(and(not(empty(parameters('privateLinkAlias'))), not(empty(parameters('privateLinkLocation')))), createObject('privateLinkAlias', parameters('privateLinkAlias'), 'privateLinkLocation', parameters('privateLinkLocation')), createObject()), if(not(empty(parameters('privateLinkResourceId'))), createObject('privateLinkResourceId', parameters('privateLinkResourceId')), createObject()), if(not(empty(parameters('originHostHeader'))), createObject('originHostHeader', parameters('originHostHeader')), createObject()))]",
"dependsOn": [
"endpoint"
]
}
},
"outputs": {
Expand Down Expand Up @@ -272,7 +281,8 @@
}
},
"dependsOn": [
"endpoint"
"endpoint",
"profile"
]
}
},
Expand Down
14 changes: 10 additions & 4 deletions avm/res/cdn/profile/endpoint/origin/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.31.34.60546",
"templateHash": "12416203553821456162"
"version": "0.31.92.45157",
"templateHash": "11497360667926217808"
},
"name": "CDN Profiles Endpoints Origins",
"description": "This module deploys a CDN Profile Endpoint Origin.",
Expand Down Expand Up @@ -113,13 +113,19 @@
"existing": true,
"type": "Microsoft.Cdn/profiles/endpoints",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}', parameters('profileName'), parameters('endpointName'))]"
"name": "[format('{0}/{1}', parameters('profileName'), parameters('endpointName'))]",
"dependsOn": [
"profile"
]
},
"origin": {
"type": "Microsoft.Cdn/profiles/endpoints/origins",
"apiVersion": "2021-06-01",
"name": "[format('{0}/{1}/{2}', parameters('profileName'), parameters('endpointName'), parameters('name'))]",
"properties": "[union(createObject('hostName', parameters('hostName'), 'httpPort', parameters('httpPort'), 'enabled', parameters('enabled'), 'httpsPort', parameters('httpsPort')), if(or(greater(parameters('priority'), 0), greater(parameters('weight'), 0)), createObject('priority', parameters('priority'), 'weight', parameters('weight')), createObject()), if(and(not(empty(parameters('privateLinkAlias'))), not(empty(parameters('privateLinkLocation')))), createObject('privateLinkAlias', parameters('privateLinkAlias'), 'privateLinkLocation', parameters('privateLinkLocation')), createObject()), if(not(empty(parameters('privateLinkResourceId'))), createObject('privateLinkResourceId', parameters('privateLinkResourceId')), createObject()), if(not(empty(parameters('originHostHeader'))), createObject('originHostHeader', parameters('originHostHeader')), createObject()))]"
"properties": "[union(createObject('hostName', parameters('hostName'), 'httpPort', parameters('httpPort'), 'enabled', parameters('enabled'), 'httpsPort', parameters('httpsPort')), if(or(greater(parameters('priority'), 0), greater(parameters('weight'), 0)), createObject('priority', parameters('priority'), 'weight', parameters('weight')), createObject()), if(and(not(empty(parameters('privateLinkAlias'))), not(empty(parameters('privateLinkLocation')))), createObject('privateLinkAlias', parameters('privateLinkAlias'), 'privateLinkLocation', parameters('privateLinkLocation')), createObject()), if(not(empty(parameters('privateLinkResourceId'))), createObject('privateLinkResourceId', parameters('privateLinkResourceId')), createObject()), if(not(empty(parameters('originHostHeader'))), createObject('originHostHeader', parameters('originHostHeader')), createObject()))]",
"dependsOn": [
"endpoint"
]
}
},
"outputs": {
Expand Down
2 changes: 1 addition & 1 deletion avm/res/cdn/profile/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ type securityPolicyType = {
@description('Required. Name of the security policy.')
name: string

@description('Required. Domain names and URL patterns to math with this association.')
@description('Required. Domain names and URL patterns to match with this association.')
associations: associationsType

@description('Required. Resource ID of WAF policy.')
Expand Down
Loading

0 comments on commit e004eed

Please sign in to comment.