AGC-v2025.01.01 WAF (#8451)

* waf cli

* waf-cli

* fix linter

* udpate history

Author: cdxu-147

src/alb/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.0
+++++++
+* Upgrade API version to 2025-01-01, introducing Security Policy WAF.
+
 1.0.0
 ++++++
 * Upgrade API version to 2023-11-01 for GA.

src/alb/azext_alb/aaz/latest/__init__.py

@@ -4,3 +4,7 @@
 #
 # Code generated by aaz-dev-tools
 # --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+

src/alb/azext_alb/aaz/latest/network/alb/_create.py

@@ -18,13 +18,13 @@ class Create(AAZCommand):
     """Create an Application Gateway for Containers resource
 
     :example: Create an Application Gateway for Containers resource
-        az network alb create -g test-rg -n test-alb
+        az network alb create -g test-rg -n test-alb --waf-policy-id /subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Networking/securityPolicies/test-wp
     """
 
     _aaz_info = {
-        "version": "2023-11-01",
+        "version": "2025-01-01",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers/{}", "2023-11-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers/{}", "2025-01-01"],
         ]
     }
 
@@ -76,6 +76,15 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
         tags = cls._args_schema.tags
         tags.Element = AAZStrArg()
+
+        # define Arg Group "SecurityPolicyConfigurations"
+
+        _args_schema = cls._args_schema
+        _args_schema.waf_policy_id = AAZStrArg(
+            options=["--waf-policy-id"],
+            arg_group="SecurityPolicyConfigurations",
+            help="Resource ID of the Waf Security Policy",
+        )
         return cls._args_schema
 
     def _execute_operations(self):
@@ -159,7 +168,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-11-01",
+                    "api-version", "2025-01-01",
                     required=True,
                 ),
             }
@@ -185,8 +194,21 @@ def content(self):
                 typ_kwargs={"flags": {"required": True, "client_flatten": True}}
             )
             _builder.set_prop("location", AAZStrType, ".location", typ_kwargs={"flags": {"required": True}})
+            _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}})
             _builder.set_prop("tags", AAZDictType, ".tags")
 
+            properties = _builder.get(".properties")
+            if properties is not None:
+                properties.set_prop("securityPolicyConfigurations", AAZObjectType)
+
+            security_policy_configurations = _builder.get(".properties.securityPolicyConfigurations")
+            if security_policy_configurations is not None:
+                security_policy_configurations.set_prop("wafSecurityPolicy", AAZObjectType)
+
+            waf_security_policy = _builder.get(".properties.securityPolicyConfigurations.wafSecurityPolicy")
+            if waf_security_policy is not None:
+                waf_security_policy.set_prop("id", AAZStrType, ".waf_policy_id", typ_kwargs={"flags": {"required": True}})
+
             tags = _builder.get(".tags")
             if tags is not None:
                 tags.set_elements(AAZStrType, ".")
@@ -245,6 +267,14 @@ def _build_schema_on_200_201(cls):
             )
             properties.provisioning_state = AAZStrType(
                 serialized_name="provisioningState",
+                flags={"read_only": True},
+            )
+            properties.security_policies = AAZListType(
+                serialized_name="securityPolicies",
+                flags={"read_only": True},
+            )
+            properties.security_policy_configurations = AAZObjectType(
+                serialized_name="securityPolicyConfigurations",
             )
 
             associations = cls._schema_on_200_201.properties.associations
@@ -258,6 +288,20 @@ def _build_schema_on_200_201(cls):
             frontends.Element = AAZObjectType()
             _CreateHelper._build_schema_resource_id_read(frontends.Element)
 
+            security_policies = cls._schema_on_200_201.properties.security_policies
+            security_policies.Element = AAZObjectType()
+            _CreateHelper._build_schema_resource_id_read(security_policies.Element)
+
+            security_policy_configurations = cls._schema_on_200_201.properties.security_policy_configurations
+            security_policy_configurations.waf_security_policy = AAZObjectType(
+                serialized_name="wafSecurityPolicy",
+            )
+
+            waf_security_policy = cls._schema_on_200_201.properties.security_policy_configurations.waf_security_policy
+            waf_security_policy.id = AAZStrType(
+                flags={"required": True},
+            )
+
             system_data = cls._schema_on_200_201.system_data
             system_data.created_at = AAZStrType(
                 serialized_name="createdAt",

src/alb/azext_alb/aaz/latest/network/alb/_delete.py

@@ -23,9 +23,9 @@ class Delete(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2023-11-01",
+        "version": "2025-01-01",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers/{}", "2023-11-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers/{}", "2025-01-01"],
         ]
     }
 
@@ -83,25 +83,25 @@ def __call__(self, *args, **kwargs):
                 return self.client.build_lro_polling(
                     self.ctx.args.no_wait,
                     session,
-                    self.on_200,
+                    self.on_200_201,
                     self.on_error,
                     lro_options={"final-state-via": "location"},
                     path_format_arguments=self.url_parameters,
                 )
-            if session.http_response.status_code in [200]:
+            if session.http_response.status_code in [204]:
                 return self.client.build_lro_polling(
                     self.ctx.args.no_wait,
                     session,
-                    self.on_200,
+                    self.on_204,
                     self.on_error,
                     lro_options={"final-state-via": "location"},
                     path_format_arguments=self.url_parameters,
                 )
-            if session.http_response.status_code in [204]:
+            if session.http_response.status_code in [200, 201]:
                 return self.client.build_lro_polling(
                     self.ctx.args.no_wait,
                     session,
-                    self.on_204,
+                    self.on_200_201,
                     self.on_error,
                     lro_options={"final-state-via": "location"},
                     path_format_arguments=self.url_parameters,
@@ -146,16 +146,16 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-11-01",
+                    "api-version", "2025-01-01",
                     required=True,
                 ),
             }
             return parameters
 
-        def on_200(self, session):
+        def on_204(self, session):
             pass
 
-        def on_204(self, session):
+        def on_200_201(self, session):
             pass
 
 

src/alb/azext_alb/aaz/latest/network/alb/_list.py

@@ -25,10 +25,10 @@ class List(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2023-11-01",
+        "version": "2025-01-01",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/providers/microsoft.servicenetworking/trafficcontrollers", "2023-11-01"],
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers", "2023-11-01"],
+            ["mgmt-plane", "/subscriptions/{}/providers/microsoft.servicenetworking/trafficcontrollers", "2025-01-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.servicenetworking/trafficcontrollers", "2025-01-01"],
         ]
     }
 
@@ -54,12 +54,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
 
     def _execute_operations(self):
         self.pre_operations()
-        condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
-        condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
+        condition_0 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
+        condition_1 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
         if condition_0:
-            self.TrafficControllerInterfaceListByResourceGroup(ctx=self.ctx)()
-        if condition_1:
             self.TrafficControllerInterfaceListBySubscription(ctx=self.ctx)()
+        if condition_1:
+            self.TrafficControllerInterfaceListByResourceGroup(ctx=self.ctx)()
         self.post_operations()
 
     @register_callback
@@ -75,7 +75,7 @@ def _output(self, *args, **kwargs):
         next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
         return result, next_link
 
-    class TrafficControllerInterfaceListByResourceGroup(AAZHttpOperation):
+    class TrafficControllerInterfaceListBySubscription(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -89,7 +89,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceNetworking/trafficControllers",
+                "/subscriptions/{subscriptionId}/providers/Microsoft.ServiceNetworking/trafficControllers",
                 **self.url_parameters
             )
 
@@ -104,10 +104,6 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
-                **self.serialize_url_param(
-                    "resourceGroupName", self.ctx.args.resource_group,
-                    required=True,
-                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,
@@ -119,7 +115,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-11-01",
+                    "api-version", "2025-01-01",
                     required=True,
                 ),
             }
@@ -197,6 +193,14 @@ def _build_schema_on_200(cls):
             )
             properties.provisioning_state = AAZStrType(
                 serialized_name="provisioningState",
+                flags={"read_only": True},
+            )
+            properties.security_policies = AAZListType(
+                serialized_name="securityPolicies",
+                flags={"read_only": True},
+            )
+            properties.security_policy_configurations = AAZObjectType(
+                serialized_name="securityPolicyConfigurations",
             )
 
             associations = cls._schema_on_200.value.Element.properties.associations
@@ -210,6 +214,20 @@ def _build_schema_on_200(cls):
             frontends.Element = AAZObjectType()
             _ListHelper._build_schema_resource_id_read(frontends.Element)
 
+            security_policies = cls._schema_on_200.value.Element.properties.security_policies
+            security_policies.Element = AAZObjectType()
+            _ListHelper._build_schema_resource_id_read(security_policies.Element)
+
+            security_policy_configurations = cls._schema_on_200.value.Element.properties.security_policy_configurations
+            security_policy_configurations.waf_security_policy = AAZObjectType(
+                serialized_name="wafSecurityPolicy",
+            )
+
+            waf_security_policy = cls._schema_on_200.value.Element.properties.security_policy_configurations.waf_security_policy
+            waf_security_policy.id = AAZStrType(
+                flags={"required": True},
+            )
+
             system_data = cls._schema_on_200.value.Element.system_data
             system_data.created_at = AAZStrType(
                 serialized_name="createdAt",
@@ -235,7 +253,7 @@ def _build_schema_on_200(cls):
 
             return cls._schema_on_200
 
-    class TrafficControllerInterfaceListBySubscription(AAZHttpOperation):
+    class TrafficControllerInterfaceListByResourceGroup(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -249,7 +267,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/providers/Microsoft.ServiceNetworking/trafficControllers",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceNetworking/trafficControllers",
                 **self.url_parameters
             )
 
@@ -264,6 +282,10 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
+                **self.serialize_url_param(
+                    "resourceGroupName", self.ctx.args.resource_group,
+                    required=True,
+                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,
@@ -275,7 +297,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-11-01",
+                    "api-version", "2025-01-01",
                     required=True,
                 ),
             }
@@ -353,6 +375,14 @@ def _build_schema_on_200(cls):
             )
             properties.provisioning_state = AAZStrType(
                 serialized_name="provisioningState",
+                flags={"read_only": True},
+            )
+            properties.security_policies = AAZListType(
+                serialized_name="securityPolicies",
+                flags={"read_only": True},
+            )
+            properties.security_policy_configurations = AAZObjectType(
+                serialized_name="securityPolicyConfigurations",
             )
 
             associations = cls._schema_on_200.value.Element.properties.associations
@@ -366,6 +396,20 @@ def _build_schema_on_200(cls):
             frontends.Element = AAZObjectType()
             _ListHelper._build_schema_resource_id_read(frontends.Element)
 
+            security_policies = cls._schema_on_200.value.Element.properties.security_policies
+            security_policies.Element = AAZObjectType()
+            _ListHelper._build_schema_resource_id_read(security_policies.Element)
+
+            security_policy_configurations = cls._schema_on_200.value.Element.properties.security_policy_configurations
+            security_policy_configurations.waf_security_policy = AAZObjectType(
+                serialized_name="wafSecurityPolicy",
+            )
+
+            waf_security_policy = cls._schema_on_200.value.Element.properties.security_policy_configurations.waf_security_policy
+            waf_security_policy.id = AAZStrType(
+                flags={"required": True},
+            )
+
             system_data = cls._schema_on_200.value.Element.system_data
             system_data.created_at = AAZStrType(
                 serialized_name="createdAt",