[Network] az network application-gateway rewrite-rule create: support url configuration (#12277)

Author: mmyyrroonn

src/azure-cli/azure/cli/command_modules/network/_params.py

@@ -238,6 +238,11 @@ def load_arguments(self, _):
         c.argument('request_headers', nargs='+', help='Space-separated list of HEADER=VALUE pairs.', validator=get_header_configuration_validator('request_headers'), completer=get_sdk_completer('application_gateways', 'list_available_request_headers'))
         c.argument('sequence', type=int, help='Determines the execution order of the rule in the rule set.')
 
+    with self.argument_context('network application-gateway rewrite-rule', arg_group='URL Configuration') as c:
+        c.argument('modified_path', help='Url path for url rewrite')
+        c.argument('modified_query_string', help='Query string for url rewrite.')
+        c.argument('enable_reroute', arg_type=get_three_state_flag(), help='If set as true, it will re-evaluate the url path map provided in path based request routing rules using modified path.')
+
     with self.argument_context('network application-gateway rewrite-rule condition') as c:
         c.argument('rule_name', rewrite_rule_name_type)
         c.argument('variable', help='The variable whose value is being evaluated.', completer=get_sdk_completer('application_gateways', 'list_available_server_variables'))

src/azure-cli/azure/cli/command_modules/network/custom.py

@@ -556,21 +556,31 @@ def update_ag_rewrite_rule_set(instance, parent, item_name):
 
 
 def create_ag_rewrite_rule(cmd, resource_group_name, application_gateway_name, rule_set_name, rule_name,
-                           sequence=None, request_headers=None, response_headers=None, no_wait=False):
-    ApplicationGatewayRewriteRule, ApplicationGatewayRewriteRuleActionSet = cmd.get_models(
-        'ApplicationGatewayRewriteRule', 'ApplicationGatewayRewriteRuleActionSet')
+                           sequence=None, request_headers=None, response_headers=None, no_wait=False,
+                           modified_path=None, modified_query_string=None, enable_reroute=None):
+    (ApplicationGatewayRewriteRule,
+     ApplicationGatewayRewriteRuleActionSet,
+     ApplicationGatewayUrlConfiguration) = cmd.get_models('ApplicationGatewayRewriteRule',
+                                                          'ApplicationGatewayRewriteRuleActionSet',
+                                                          'ApplicationGatewayUrlConfiguration')
     if not request_headers and not response_headers:
         raise CLIError('usage error: --response-headers HEADER=VALUE | --request-headers HEADER=VALUE')
     ncf = network_client_factory(cmd.cli_ctx).application_gateways
     ag = ncf.get(resource_group_name, application_gateway_name)
     rule_set = find_child_item(ag, rule_set_name,
                                path='rewrite_rule_sets', key_path='name')
+    url_configuration = None
+    if any([modified_path, modified_query_string, enable_reroute]):
+        url_configuration = ApplicationGatewayUrlConfiguration(modified_path=modified_path,
+                                                               modified_query_string=modified_query_string,
+                                                               reroute=enable_reroute)
     new_rule = ApplicationGatewayRewriteRule(
         name=rule_name,
         rule_sequence=sequence,
         action_set=ApplicationGatewayRewriteRuleActionSet(
             request_header_configurations=request_headers,
-            response_header_configurations=response_headers
+            response_header_configurations=response_headers,
+            url_configuration=url_configuration
         )
     )
     upsert_to_collection(rule_set, 'rewrite_rules', new_rule, 'name')
@@ -582,11 +592,19 @@ def create_ag_rewrite_rule(cmd, resource_group_name, application_gateway_name, r
 
 
 def update_ag_rewrite_rule(instance, parent, cmd, rule_set_name, rule_name, sequence=None,
-                           request_headers=None, response_headers=None):
+                           request_headers=None, response_headers=None,
+                           modified_path=None, modified_query_string=None, enable_reroute=None):
     with cmd.update_context(instance) as c:
         c.set_param('rule_sequence', sequence)
         c.set_param('action_set.request_header_configurations', request_headers)
         c.set_param('action_set.response_header_configurations', response_headers)
+        ApplicationGatewayUrlConfiguration = cmd.get_models('ApplicationGatewayUrlConfiguration')
+        url_configuration = None
+        if any([modified_path, modified_query_string, enable_reroute]):
+            url_configuration = ApplicationGatewayUrlConfiguration(modified_path=modified_path,
+                                                                   modified_query_string=modified_query_string,
+                                                                   reroute=enable_reroute)
+        c.set_param('action_set.url_configuration', url_configuration)
     return parent
 
 
@@ -2002,7 +2020,7 @@ def dict_matches_filter(d, filter_dict):
 
 def lists_match(l1, l2):
     try:
-        return Counter(l1) == Counter(l2)
+        return Counter(l1) == Counter(l2)  # pylint: disable=too-many-function-args
     except TypeError:
         return False
 # endregion