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.

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

fix: Minor edits to get version publishing working #1953

Merged
merged 23 commits into from
May 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cf5fede
Adding new workflow
hundredacres Mar 25, 2024
ff7c683
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 26, 2024
c883d2b
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 27, 2024
5d11b9b
Merge remote-tracking branch 'upstream/main'
hundredacres Mar 28, 2024
abcb62e
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 8, 2024
318eacd
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 22, 2024
98c9667
Merge branch 'Azure:main' into main
hundredacres Apr 24, 2024
d4f9aaa
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 29, 2024
cf5d59a
Merge remote-tracking branch 'upstream/main'
hundredacres Apr 30, 2024
0f43d8b
Merge branch 'Azure:main' into main
hundredacres May 1, 2024
a84760a
chore: shortening module statuses (#1809)
matebarabas May 1, 2024
d992d08
fix: repair automatic assignment of issues (#1817)
rahalan May 2, 2024
5b95ae1
fix: Removed orphaned file & reference (#1822)
JFolberth May 2, 2024
e9f11ba
Merge branch 'Azure:main' into main
hundredacres May 2, 2024
2a3fd4c
Merge remote-tracking branch 'upstream/main'
hundredacres May 6, 2024
9061cfe
Merge remote-tracking branch 'upstream/main'
hundredacres May 8, 2024
9893b9a
Merge remote-tracking branch 'upstream/main'
hundredacres May 10, 2024
15ea104
Merge branch 'Azure:main' into main
hundredacres May 14, 2024
7932e38
Merge branch 'Azure:main' into main
hundredacres May 15, 2024
fc79840
Merge remote-tracking branch 'upstream/main'
hundredacres May 16, 2024
d44797b
Minor change to get version publishing working
hundredacres May 16, 2024
e6811b8
Fixing issue with static tests
hundredacres May 16, 2024
15a9593
Removing stray workflow
hundredacres May 16, 2024
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
Prev Previous commit
Next Next commit
Minor change to get version publishing working
hundredacres committed May 16, 2024
commit d44797b6f3a07bed8ad5b5f00376625067dc17ea
6 changes: 3 additions & 3 deletions avm/res/network/azure-firewall/README.md
Original file line number Diff line number Diff line change
@@ -2234,12 +2234,12 @@ Zone numbers e.g. 1,2,3.

| Output | Type | Description |
| :-- | :-- | :-- |
| `applicationRuleCollections` | array | List of Application Rule Collections. |
| `applicationRuleCollections` | array | List of Application Rule Collections used by Azure Firewall. |
| `ipConfAzureFirewallSubnet` | object | The Public IP configuration object for the Azure Firewall Subnet. |
| `location` | string | The location the resource was deployed into. |
| `name` | string | The name of the Azure Firewall. |
| `natRuleCollections` | array | Collection of NAT rule collections used by Azure Firewall. |
| `networkRuleCollections` | array | List of Network Rule Collections. |
| `natRuleCollections` | array | List of NAT rule collections used by Azure Firewall. |
| `networkRuleCollections` | array | List of Network Rule Collections used by Azure Firewall. |
| `privateIp` | string | The private IP of the Azure firewall. |
| `resourceGroupName` | string | The resource group the Azure firewall was deployed into. |
| `resourceId` | string | The resource ID of the Azure Firewall. |
6 changes: 3 additions & 3 deletions avm/res/network/azure-firewall/main.bicep
Original file line number Diff line number Diff line change
@@ -372,13 +372,13 @@ output ipConfAzureFirewallSubnet object = contains(azureFirewall.properties, 'ip
? azureFirewall.properties.ipConfigurations[0]
: {}

@description('List of Application Rule Collections.')
@description('List of Application Rule Collections used by Azure Firewall.')
output applicationRuleCollections array = applicationRuleCollections ?? []

@description('List of Network Rule Collections.')
@description('List of Network Rule Collections used by Azure Firewall.')
output networkRuleCollections array = networkRuleCollections ?? []

@description('Collection of NAT rule collections used by Azure Firewall.')
@description('List of NAT rule collections used by Azure Firewall.')
output natRuleCollections array = natRuleCollections ?? []

@description('The location the resource was deployed into.')
8 changes: 4 additions & 4 deletions avm/res/network/azure-firewall/main.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.27.1.19265",
"templateHash": "5299175231300175796"
"templateHash": "18119107920030966169"
},
"name": "Azure Firewalls",
"description": "This module deploys an Azure Firewall.",
@@ -2280,21 +2280,21 @@
"applicationRuleCollections": {
"type": "array",
"metadata": {
"description": "List of Application Rule Collections."
"description": "List of Application Rule Collections used by Azure Firewall."
},
"value": "[coalesce(parameters('applicationRuleCollections'), createArray())]"
},
"networkRuleCollections": {
"type": "array",
"metadata": {
"description": "List of Network Rule Collections."
"description": "List of Network Rule Collections used by Azure Firewall."
},
"value": "[coalesce(parameters('networkRuleCollections'), createArray())]"
},
"natRuleCollections": {
"type": "array",
"metadata": {
"description": "Collection of NAT rule collections used by Azure Firewall."
"description": "List of NAT rule collections used by Azure Firewall."
},
"value": "[coalesce(parameters('natRuleCollections'), createArray())]"
},