Skip to content

Commit edee9df

Browse files
author
Christoph Butz
committed
Merge remote-tracking branch 'origin/main' into cbutz/aks-preview-otlp-grpc
2 parents 56064be + f3f34b7 commit edee9df

82 files changed

Lines changed: 24293 additions & 7227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/azure-firewall/HISTORY.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Release History
44
===============
55

6+
2.2.1
7+
++++++
8+
* `az network firewall create` : Fix `managementIpConfiguration.subnet.id` not being set for non-Basic tier firewalls when `--m-conf-name` is provided.
9+
610
2.2.0
711
++++++
812
* `az network firewall policy create` : Updated parameter `--identity` to support multiple MSIs

‎src/azure-firewall/azext_firewall/custom.py‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -279,18 +279,20 @@ def pre_operations(self):
279279
"subnet": subnet_id if has_value(subnet_id) else None,
280280
"public_ip_address": args.public_ip if has_value(args.public_ip) else None}]
281281

282-
if has_value(args.tier) and has_value(args.sku):
283-
if tier.lower() == 'basic' and sku.lower() == 'azfw_vnet':
284-
management_subnet_id = resource_id(
285-
subscription=get_subscription_id(self.cli_ctx),
286-
resource_group=args.resource_group,
287-
namespace='Microsoft.Network',
288-
type='virtualNetworks',
289-
name=args.vnet_name,
290-
child_type_1='subnets',
291-
child_name_1='AzureFirewallManagementSubnet'
292-
)
293-
args.mgmt_ip_conf_subnet = management_subnet_id
282+
# A management IP configuration always requires the AzureFirewallManagementSubnet. It is created
283+
# either implicitly for Basic tier or explicitly whenever the user passes --m-conf-name.
284+
is_vnet_sku = not has_value(args.sku) or args.sku.to_serialized_data().lower() == 'azfw_vnet'
285+
is_basic_tier = has_value(args.tier) and args.tier.to_serialized_data().lower() == 'basic'
286+
if is_vnet_sku and (is_basic_tier or has_value(args.m_conf_name)):
287+
args.mgmt_ip_conf_subnet = resource_id(
288+
subscription=get_subscription_id(self.cli_ctx),
289+
resource_group=args.resource_group,
290+
namespace='Microsoft.Network',
291+
type='virtualNetworks',
292+
name=args.vnet_name,
293+
child_type_1='subnets',
294+
child_name_1='AzureFirewallManagementSubnet'
295+
)
294296

295297
if has_value(args.enable_explicit_proxy):
296298
args.additional_properties['Network.ExplicitProxy.EnableExplicitProxy'] = args.enable_explicit_proxy

‎src/azure-firewall/azext_firewall/tests/latest/recordings/test_azure_firewall_autoscale_configuration.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ interactions:
275275
User-Agent:
276276
- AZURECLI/2.77.0 azsdk-python-core/1.35.0 Python/3.12.3 (Linux-5.15.167.4-microsoft-standard-WSL2-x86_64-with-glibc2.39)
277277
method: PUT
278-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2024-07-01
278+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2025-07-01
279279
response:
280280
body:
281281
string: '{"name":"vnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet","etag":"W/\"cbd97992-4e83-4f53-93f3-a45ec84a3502\"","type":"Microsoft.Network/virtualNetworks","location":"westus","properties":{"provisioningState":"Updating","resourceGuid":"af00daea-f7b6-4903-bcba-137ef105e2de","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AzureFirewallSubnet","etag":"W/\"cbd97992-4e83-4f53-93f3-a45ec84a3502\"","properties":{"provisioningState":"Updating","addressPrefix":"10.0.1.0/26","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled"},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'
@@ -431,7 +431,7 @@ interactions:
431431
User-Agent:
432432
- AZURECLI/2.77.0 azsdk-python-core/1.35.0 Python/3.12.3 (Linux-5.15.167.4-microsoft-standard-WSL2-x86_64-with-glibc2.39)
433433
method: GET
434-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2024-07-01
434+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2025-07-01
435435
response:
436436
body:
437437
string: '{"name":"vnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet","etag":"W/\"525b779d-a39f-4f03-a38d-583db5984337\"","type":"Microsoft.Network/virtualNetworks","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"af00daea-f7b6-4903-bcba-137ef105e2de","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_autoscale_configuration000001/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AzureFirewallSubnet","etag":"W/\"525b779d-a39f-4f03-a38d-583db5984337\"","properties":{"provisioningState":"Succeeded","addressPrefix":"10.0.1.0/26","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled"},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'

‎src/azure-firewall/azext_firewall/tests/latest/recordings/test_azure_firewall_extended_location.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ interactions:
276276
User-Agent:
277277
- AZURECLI/2.84.0 azsdk-python-core/1.38.0 Python/3.12.10 (Windows-11-10.0.26200-SP0)
278278
method: PUT
279-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2024-07-01
279+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2025-07-01
280280
response:
281281
body:
282282
string: '{"name":"vnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet","etag":"W/\"3ccd3ad1-c29e-4dc8-9eba-ee2ad13854b6\"","type":"Microsoft.Network/virtualNetworks","location":"westus","extendedLocation":{"type":"EdgeZone","name":"losangeles"},"properties":{"provisioningState":"Updating","resourceGuid":"d356e69f-2593-44ea-909a-f94a7ec9b0f0","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AzureFirewallSubnet","etag":"W/\"3ccd3ad1-c29e-4dc8-9eba-ee2ad13854b6\"","properties":{"provisioningState":"Updating","addressPrefix":"10.0.1.0/26","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled","defaultOutboundAccess":false},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'
@@ -432,7 +432,7 @@ interactions:
432432
User-Agent:
433433
- AZURECLI/2.84.0 azsdk-python-core/1.38.0 Python/3.12.10 (Windows-11-10.0.26200-SP0)
434434
method: GET
435-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2024-07-01
435+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet?api-version=2025-07-01
436436
response:
437437
body:
438438
string: '{"name":"vnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet","etag":"W/\"cacd31b4-2df5-4d16-a599-5d4aff7a6833\"","type":"Microsoft.Network/virtualNetworks","location":"westus","extendedLocation":{"type":"EdgeZone","name":"losangeles"},"properties":{"provisioningState":"Succeeded","resourceGuid":"d356e69f-2593-44ea-909a-f94a7ec9b0f0","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_az_firewall_extended_location000001/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AzureFirewallSubnet","etag":"W/\"cacd31b4-2df5-4d16-a599-5d4aff7a6833\"","properties":{"provisioningState":"Succeeded","addressPrefix":"10.0.1.0/26","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled","defaultOutboundAccess":false},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'

‎src/azure-firewall/azext_firewall/tests/latest/recordings/test_azure_firewall_ip_config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ interactions:
689689
User-Agent:
690690
- AZURECLI/2.77.0 azsdk-python-core/1.35.0 Python/3.12.3 (Linux-5.15.167.4-microsoft-standard-WSL2-x86_64-with-glibc2.39)
691691
method: PUT
692-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet?api-version=2024-07-01
692+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet?api-version=2025-07-01
693693
response:
694694
body:
695695
string: '{"name":"myvnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet","etag":"W/\"8bac3273-6799-469d-a516-b2e8acdd6f57\"","type":"Microsoft.Network/virtualNetworks","location":"westus","properties":{"provisioningState":"Updating","resourceGuid":"3d9c7783-ade2-4ba6-af94-eb60da1bc213","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/AzureFirewallSubnet","etag":"W/\"8bac3273-6799-469d-a516-b2e8acdd6f57\"","properties":{"provisioningState":"Updating","addressPrefix":"10.0.0.0/24","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled"},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'
@@ -845,7 +845,7 @@ interactions:
845845
User-Agent:
846846
- AZURECLI/2.77.0 azsdk-python-core/1.35.0 Python/3.12.3 (Linux-5.15.167.4-microsoft-standard-WSL2-x86_64-with-glibc2.39)
847847
method: GET
848-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet?api-version=2024-07-01
848+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet?api-version=2025-07-01
849849
response:
850850
body:
851851
string: '{"name":"myvnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet","etag":"W/\"a725d237-671e-45e9-a3ab-250c5f6ae9fc\"","type":"Microsoft.Network/virtualNetworks","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"3d9c7783-ade2-4ba6-af94-eb60da1bc213","addressSpace":{"addressPrefixes":["10.0.0.0/16"]},"privateEndpointVNetPolicies":"Disabled","subnets":[{"name":"AzureFirewallSubnet","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_ip_config000001/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/AzureFirewallSubnet","etag":"W/\"a725d237-671e-45e9-a3ab-250c5f6ae9fc\"","properties":{"provisioningState":"Succeeded","addressPrefix":"10.0.0.0/24","delegations":[],"privateEndpointNetworkPolicies":"Disabled","privateLinkServiceNetworkPolicies":"Enabled"},"type":"Microsoft.Network/virtualNetworks/subnets"}],"virtualNetworkPeerings":[],"enableDdosProtection":false}}'

0 commit comments

Comments
 (0)