Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions src/azure-firewall/azext_firewall/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ def validate_af_nat_rule(namespace):
return namespace


def validate_af_application_rule(namespace):
return namespace


def validate_rule_group_collection(namespace):
from knack.util import CLIError
if namespace.target_fqdns is not None and namespace.fqdn_tags is not None:
Expand Down
2 changes: 1 addition & 1 deletion src/azure-firewall/azext_firewall/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"azext.isPreview": true,
"azext.minCliCoreVersion": "2.0.46"
"azext.minCliCoreVersion": "2.0.67"
}
4 changes: 2 additions & 2 deletions src/azure-firewall/azext_firewall/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from ._util import (
list_network_resource_property, get_network_resource_property_entry, delete_network_resource_property_entry)

from ._validators import validate_af_network_rule, validate_af_nat_rule, validate_af_application_rule
from ._validators import validate_af_network_rule, validate_af_nat_rule


# pylint: disable=too-many-locals, too-many-statements
Expand Down Expand Up @@ -67,7 +67,7 @@ def load_command_table(self, _):
af_rules = {
'network_rule': {'scope': 'network-rule', 'validator': validate_af_network_rule},
'nat_rule': {'scope': 'nat-rule', 'validator': validate_af_nat_rule},
'application_rule': {'scope': 'application-rule', 'validator': validate_af_application_rule}
'application_rule': {'scope': 'application-rule', 'validator': None}
}

for rule_type, af_rule in af_rules.items():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-resource/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-resource/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_azure_firewall000001?api-version=2019-07-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001","name":"cli_test_azure_firewall000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2019-10-27T05:41:36Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001","name":"cli_test_azure_firewall000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2019-11-07T08:39:55Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -30,7 +30,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:41:44 GMT
- Thu, 07 Nov 2019 08:40:00 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -63,32 +63,32 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1?api-version=2019-09-01
response:
body:
string: "{\r\n \"name\": \"af1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1\",\r\n
\ \"etag\": \"W/\\\"370aef2a-9b6c-4e58-9eff-6a439d22d6ec\\\"\",\r\n \"type\":
\ \"etag\": \"W/\\\"2460e175-26d1-4b4a-9c5b-22104f3aabb4\\\"\",\r\n \"type\":
\"Microsoft.Network/azureFirewalls\",\r\n \"location\": \"westus\",\r\n \"properties\":
{\r\n \"provisioningState\": \"Updating\",\r\n \"sku\": {\r\n \"name\":
\"AZFW_VNet\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"threatIntelMode\":
\"Alert\",\r\n \"ipConfigurations\": [],\r\n \"networkRuleCollections\":
[],\r\n \"applicationRuleCollections\": [],\r\n \"natRuleCollections\":
[],\r\n \"additionalProperties\": {}\r\n }\r\n}"
\"Alert\",\r\n \"additionalProperties\": {},\r\n \"ipConfigurations\":
[],\r\n \"networkRuleCollections\": [],\r\n \"applicationRuleCollections\":
[],\r\n \"natRuleCollections\": []\r\n }\r\n}"
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/76a2221f-943d-4635-845d-1b686a274fb9?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/579f9ed2-6d48-4a27-875d-61af15790085?api-version=2019-09-01
cache-control:
- no-cache
content-length:
- '690'
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:41:49 GMT
- Thu, 07 Nov 2019 08:40:04 GMT
expires:
- '-1'
pragma:
Expand All @@ -101,9 +101,9 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- 014394b1-e62c-439f-87d3-5c7eb3c124d2
- c71cc2bc-0d27-4747-8c51-27e05bc65287
x-ms-ratelimit-remaining-subscription-writes:
- '1199'
- '1198'
status:
code: 201
message: Created
Expand All @@ -122,9 +122,9 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/76a2221f-943d-4635-845d-1b686a274fb9?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/579f9ed2-6d48-4a27-875d-61af15790085?api-version=2019-09-01
response:
body:
string: "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand All @@ -136,7 +136,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:41:59 GMT
- Thu, 07 Nov 2019 08:40:15 GMT
expires:
- '-1'
pragma:
Expand All @@ -153,7 +153,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- 9fceb7c6-9c90-483b-906d-ef6a0e8d354d
- 4a9992ba-9ab2-443c-a5d0-2444a4852fb5
status:
code: 200
message: OK
Expand All @@ -172,19 +172,19 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1?api-version=2019-09-01
response:
body:
string: "{\r\n \"name\": \"af1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1\",\r\n
\ \"etag\": \"W/\\\"3104e67b-1e33-4265-b09e-b44049e9bea9\\\"\",\r\n \"type\":
\ \"etag\": \"W/\\\"a3026d14-7f5e-45f3-a9b7-e1f706e49455\\\"\",\r\n \"type\":
\"Microsoft.Network/azureFirewalls\",\r\n \"location\": \"westus\",\r\n \"properties\":
{\r\n \"provisioningState\": \"Succeeded\",\r\n \"sku\": {\r\n \"name\":
\"AZFW_VNet\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"threatIntelMode\":
\"Alert\",\r\n \"ipConfigurations\": [],\r\n \"networkRuleCollections\":
[],\r\n \"applicationRuleCollections\": [],\r\n \"natRuleCollections\":
[],\r\n \"additionalProperties\": {}\r\n }\r\n}"
\"Alert\",\r\n \"additionalProperties\": {},\r\n \"ipConfigurations\":
[],\r\n \"networkRuleCollections\": [],\r\n \"applicationRuleCollections\":
[],\r\n \"natRuleCollections\": []\r\n }\r\n}"
headers:
cache-control:
- no-cache
Expand All @@ -193,9 +193,9 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:42:00 GMT
- Thu, 07 Nov 2019 08:40:15 GMT
etag:
- W/"3104e67b-1e33-4265-b09e-b44049e9bea9"
- W/"a3026d14-7f5e-45f3-a9b7-e1f706e49455"
expires:
- '-1'
pragma:
Expand All @@ -212,7 +212,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- cad9bb29-76bf-43dc-a9b7-b3ec58b1439d
- 42b1fe68-05fd-4fb4-80d7-a2ebc1d616d7
status:
code: 200
message: OK
Expand All @@ -231,21 +231,21 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1?api-version=2019-09-01
response:
body:
string: "{\r\n \"name\": \"af1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1\",\r\n
\ \"etag\": \"W/\\\"3104e67b-1e33-4265-b09e-b44049e9bea9\\\"\",\r\n \"type\":
\ \"etag\": \"W/\\\"a3026d14-7f5e-45f3-a9b7-e1f706e49455\\\"\",\r\n \"type\":
\"Microsoft.Network/azureFirewalls\",\r\n \"location\": \"westus\",\r\n \"properties\":
{\r\n \"provisioningState\": \"Succeeded\",\r\n \"sku\": {\r\n \"name\":
\"AZFW_VNet\",\r\n \"tier\": \"Standard\"\r\n },\r\n \"threatIntelMode\":
\"Alert\",\r\n \"ipConfigurations\": [],\r\n \"networkRuleCollections\":
[],\r\n \"applicationRuleCollections\": [],\r\n \"natRuleCollections\":
[],\r\n \"additionalProperties\": {}\r\n }\r\n}"
\"Alert\",\r\n \"additionalProperties\": {},\r\n \"ipConfigurations\":
[],\r\n \"networkRuleCollections\": [],\r\n \"applicationRuleCollections\":
[],\r\n \"natRuleCollections\": []\r\n }\r\n}"
headers:
cache-control:
- no-cache
Expand All @@ -254,9 +254,9 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:42:02 GMT
- Thu, 07 Nov 2019 08:40:17 GMT
etag:
- W/"3104e67b-1e33-4265-b09e-b44049e9bea9"
- W/"a3026d14-7f5e-45f3-a9b7-e1f706e49455"
expires:
- '-1'
pragma:
Expand All @@ -273,7 +273,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- 7b61afed-59b1-4d99-be1e-c5a8c770c7ec
- 20e40197-1476-42b0-9f61-778ce064e9d4
status:
code: 200
message: OK
Expand All @@ -292,7 +292,7 @@ interactions:
- -g
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
accept-language:
- en-US
method: GET
Expand All @@ -301,14 +301,14 @@ interactions:
body:
string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"af1\",\r\n \"id\":
\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_azure_firewall000001/providers/Microsoft.Network/azureFirewalls/af1\",\r\n
\ \"etag\": \"W/\\\"3104e67b-1e33-4265-b09e-b44049e9bea9\\\"\",\r\n \"type\":
\ \"etag\": \"W/\\\"a3026d14-7f5e-45f3-a9b7-e1f706e49455\\\"\",\r\n \"type\":
\"Microsoft.Network/azureFirewalls\",\r\n \"location\": \"westus\",\r\n
\ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n
\ \"sku\": {\r\n \"name\": \"AZFW_VNet\",\r\n \"tier\":
\"Standard\"\r\n },\r\n \"threatIntelMode\": \"Alert\",\r\n
\ \"ipConfigurations\": [],\r\n \"networkRuleCollections\": [],\r\n
\ \"applicationRuleCollections\": [],\r\n \"natRuleCollections\":
[],\r\n \"additionalProperties\": {}\r\n }\r\n }\r\n ]\r\n}"
\ \"additionalProperties\": {},\r\n \"ipConfigurations\": [],\r\n
\ \"networkRuleCollections\": [],\r\n \"applicationRuleCollections\":
[],\r\n \"natRuleCollections\": []\r\n }\r\n }\r\n ]\r\n}"
headers:
cache-control:
- no-cache
Expand All @@ -317,7 +317,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:42:03 GMT
- Thu, 07 Nov 2019 08:40:18 GMT
expires:
- '-1'
pragma:
Expand All @@ -334,7 +334,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- ef5a3539-d075-4089-9e59-c82d7893791f
- f616b3cc-0b87-417b-a3d6-ab7c64964073
status:
code: 200
message: OK
Expand All @@ -355,7 +355,7 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
accept-language:
- en-US
method: DELETE
Expand All @@ -365,17 +365,17 @@ interactions:
string: ''
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/214eddb0-1bf0-48cd-9e81-a01180773803?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/23793012-29d6-4c49-94ad-109ac7a75b32?api-version=2019-09-01
cache-control:
- no-cache
content-length:
- '0'
date:
- Sun, 27 Oct 2019 05:42:05 GMT
- Thu, 07 Nov 2019 08:40:20 GMT
expires:
- '-1'
location:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operationResults/214eddb0-1bf0-48cd-9e81-a01180773803?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operationResults/23793012-29d6-4c49-94ad-109ac7a75b32?api-version=2019-09-01
pragma:
- no-cache
server:
Expand All @@ -386,9 +386,9 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- 6db7c119-5878-4357-9af7-c1072a747bad
- 879492b6-035d-48d8-8be6-2ce0d4906ad3
x-ms-ratelimit-remaining-subscription-deletes:
- '14999'
- '14998'
status:
code: 202
message: Accepted
Expand All @@ -407,9 +407,9 @@ interactions:
- -g -n
User-Agent:
- python/3.7.4 (Windows-10-10.0.18362-SP0) msrest/0.6.10 msrest_azure/0.6.2
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.75
azure-mgmt-network/7.0.0 Azure-SDK-For-Python AZURECLI/2.0.76
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/214eddb0-1bf0-48cd-9e81-a01180773803?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/23793012-29d6-4c49-94ad-109ac7a75b32?api-version=2019-09-01
response:
body:
string: "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand All @@ -421,7 +421,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Sun, 27 Oct 2019 05:42:16 GMT
- Thu, 07 Nov 2019 08:40:31 GMT
expires:
- '-1'
pragma:
Expand All @@ -438,7 +438,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-arm-service-request-id:
- e0218169-7fcb-4833-bba9-c9920943f84a
- af256898-9993-4e75-bcf9-54d3a397d9ac
status:
code: 200
message: OK
Expand Down
Loading