Skip to content

Commit f34eaed

Browse files
authored
{Firewall} Remove __import__('pkg_resources').declare_namespace(__name__) (#9586)
1 parent 295accd commit f34eaed

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

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.0.1
7+
++++++
8+
* Remove `__import__('pkg_resources').declare_namespace(__name__)` to fix the namespace package issue.
9+
610
2.0.0
711
++++++
812
* `az network firewall packet-capture-operation`: Add packet capture operation support for the azure firewall

src/azure-firewall/azext_firewall/tests/latest/recordings/test_azure_firewall_packet_capture.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ interactions:
6565
User-Agent:
6666
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
6767
method: POST
68-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2025-01-01
68+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2025-06-01
6969
response:
7070
body:
7171
string: '{"nameAvailable":true}'
@@ -119,7 +119,7 @@ interactions:
119119
User-Agent:
120120
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
121121
method: PUT
122-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008?api-version=2025-01-01
122+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008?api-version=2025-06-01
123123
response:
124124
body:
125125
string: ''
@@ -269,7 +269,7 @@ interactions:
269269
User-Agent:
270270
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
271271
method: GET
272-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2025-01-01
272+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2025-06-01
273273
response:
274274
body:
275275
string: '{"value":[{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008","name":"fwpcap000008","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"keyCreationTime":{"key1":"2025-10-20T21:05:08.0251519Z","key2":"2025-10-20T21:05:08.0251519Z"},"allowCrossTenantReplication":false,"privateEndpointConnections":[],"minimumTlsVersion":"TLS1_0","allowBlobPublicAccess":false,"networkAcls":{"ipv6Rules":[],"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":true,"encryption":{"services":{"file":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"},"blob":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2025-10-20T21:05:07.8845236Z","primaryEndpoints":{"dfs":"https://fwpcap000008.dfs.core.windows.net/","web":"https://fwpcap000008.z19.web.core.windows.net/","blob":"https://fwpcap000008.blob.core.windows.net/","queue":"https://fwpcap000008.queue.core.windows.net/","table":"https://fwpcap000008.table.core.windows.net/","file":"https://fwpcap000008.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}}]}'
@@ -319,7 +319,7 @@ interactions:
319319
User-Agent:
320320
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
321321
method: POST
322-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008/listKeys?api-version=2025-01-01&$expand=kerb
322+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008/listKeys?api-version=2025-06-01&$expand=kerb
323323
response:
324324
body:
325325
string: '{"keys":[{"creationTime":"2025-10-20T21:05:08.0251519Z","keyName":"key1","value":"veryFakedStorageAccountKey==","permissions":"FULL"},{"creationTime":"2025-10-20T21:05:08.0251519Z","keyName":"key2","value":"veryFakedStorageAccountKey==","permissions":"FULL"}]}'
@@ -409,7 +409,7 @@ interactions:
409409
User-Agent:
410410
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
411411
method: GET
412-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008?api-version=2025-01-01
412+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008?api-version=2025-06-01
413413
response:
414414
body:
415415
string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008","name":"fwpcap000008","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"keyCreationTime":{"key1":"2025-10-20T21:05:08.0251519Z","key2":"2025-10-20T21:05:08.0251519Z"},"allowCrossTenantReplication":false,"privateEndpointConnections":[],"minimumTlsVersion":"TLS1_0","allowBlobPublicAccess":false,"networkAcls":{"ipv6Rules":[],"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":true,"encryption":{"services":{"file":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"},"blob":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2025-10-20T21:05:07.8845236Z","primaryEndpoints":{"dfs":"https://fwpcap000008.dfs.core.windows.net/","web":"https://fwpcap000008.z19.web.core.windows.net/","blob":"https://fwpcap000008.blob.core.windows.net/","queue":"https://fwpcap000008.queue.core.windows.net/","table":"https://fwpcap000008.table.core.windows.net/","file":"https://fwpcap000008.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}}'
@@ -455,7 +455,7 @@ interactions:
455455
User-Agent:
456456
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
457457
method: GET
458-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2025-01-01
458+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/storageAccounts?api-version=2025-06-01
459459
response:
460460
body:
461461
string: '{"value":[{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"StorageV2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008","name":"fwpcap000008","type":"Microsoft.Storage/storageAccounts","location":"centralus","tags":{},"properties":{"keyCreationTime":{"key1":"2025-10-20T21:05:08.0251519Z","key2":"2025-10-20T21:05:08.0251519Z"},"allowCrossTenantReplication":false,"privateEndpointConnections":[],"minimumTlsVersion":"TLS1_0","allowBlobPublicAccess":false,"networkAcls":{"ipv6Rules":[],"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"supportsHttpsTrafficOnly":true,"encryption":{"services":{"file":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"},"blob":{"keyType":"Account","enabled":true,"lastEnabledTime":"2025-10-20T21:05:08.0251519Z"}},"keySource":"Microsoft.Storage"},"accessTier":"Hot","provisioningState":"Succeeded","creationTime":"2025-10-20T21:05:07.8845236Z","primaryEndpoints":{"dfs":"https://fwpcap000008.dfs.core.windows.net/","web":"https://fwpcap000008.z19.web.core.windows.net/","blob":"https://fwpcap000008.blob.core.windows.net/","queue":"https://fwpcap000008.queue.core.windows.net/","table":"https://fwpcap000008.table.core.windows.net/","file":"https://fwpcap000008.file.core.windows.net/"},"primaryLocation":"centralus","statusOfPrimary":"available"}}]}'
@@ -505,7 +505,7 @@ interactions:
505505
User-Agent:
506506
- AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.13.9 (Windows-11-10.0.26100-SP0)
507507
method: POST
508-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008/listKeys?api-version=2025-01-01&$expand=kerb
508+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall_capture000001/providers/Microsoft.Storage/storageAccounts/fwpcap000008/listKeys?api-version=2025-06-01&$expand=kerb
509509
response:
510510
body:
511511
string: '{"keys":[{"creationTime":"2025-10-20T21:05:08.0251519Z","keyName":"key1","value":"veryFakedStorageAccountKey==","permissions":"FULL"},{"creationTime":"2025-10-20T21:05:08.0251519Z","keyName":"key2","value":"veryFakedStorageAccountKey==","permissions":"FULL"}]}'

src/azure-firewall/azext_firewall/tests/latest/recordings/test_azure_firewall_with_firewall_policy_premium.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ interactions:
277277
User-Agent:
278278
- 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)
279279
method: PUT
280-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_azure_firewall_with_firewall_policy_premium000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identitytest?api-version=2023-01-31
280+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_azure_firewall_with_firewall_policy_premium000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identitytest?api-version=2024-11-30
281281
response:
282282
body:
283283
string: '{"location":"westus2","tags":{},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_azure_firewall_with_firewall_policy_premium000001/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identitytest","name":"identitytest","type":"Microsoft.ManagedIdentity/userAssignedIdentities","properties":{"tenantId":"965228a1-a966-4f96-8d7b-af48d997d4d2","principalId":"aa8008a8-cda3-4848-9119-57aedca04df4","clientId":"6c735077-fb60-4e9e-80e0-c870fcf444f8"}}'

src/azure-firewall/azext_firewall/vendored_sdks/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
5-
6-
__import__('pkg_resources').declare_namespace(__name__)

src/azure-firewall/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from codecs import open
99
from setuptools import setup, find_packages
1010

11-
VERSION = "2.0.0"
11+
VERSION = "2.0.1"
1212

1313
CLASSIFIERS = [
1414
'Development Status :: 4 - Beta',

0 commit comments

Comments
 (0)