CodeGen from PR 25378 in Azure/azure-rest-api-specs

Merge 658fb5c422a8caaffe413286e71c6a1a7722187d into 624dbc769880e5676ae8bb20d3c82ebd1783c64a

Author: SDKAuto

sdk/webpubsub/azure-mgmt-webpubsub/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "9975d3476c05bcc6bd9535ad3dfb564e6a168fa5",
+  "commit": "e4f05ae0d0ec8fd2258803174f88602cd6ad31cb",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.6.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/webpubsub/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/webpubsub/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
   "readme": "specification/webpubsub/resource-manager/readme.md"
 }

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_configuration.py

@@ -29,14 +29,14 @@ class WebPubSubManagementClientConfiguration(Configuration):  # pylint: disable=
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(WebPubSubManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-06-01-preview")
+        api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_serialization.py

@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
 
         :param data: The data to be serialized.
         :param str data_type: The type to be serialized from.
+        :keyword bool skip_quote: Whether to skip quote the serialized result.
+        Defaults to False.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get("skip_quote", False)
+                return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
 
             # Not a list, regular serialization
             output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_vendor.py

@@ -5,8 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import List, cast
-
 from azure.core.pipeline.transport import HttpRequest
 
 
@@ -16,15 +14,3 @@ def _convert_request(request, files=None):
     if files:
         request.set_formdata_body(files)
     return request
-
-
-def _format_url_section(template, **kwargs):
-    components = template.split("/")
-    while components:
-        try:
-            return template.format(**kwargs)
-        except KeyError as key:
-            # Need the cast, as for some reasons "split" is typed as list[str | Any]
-            formatted_components = cast(List[str], template.split("/"))
-            components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.0.0b1"
+VERSION = "0.1.0"

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/_web_pub_sub_management_client.py

@@ -69,7 +69,7 @@ class WebPubSubManagementClient:  # pylint: disable=client-accepts-api-version-k
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_configuration.py

@@ -29,14 +29,14 @@ class WebPubSubManagementClientConfiguration(Configuration):  # pylint: disable=
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(WebPubSubManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-06-01-preview")
+        api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/aio/_web_pub_sub_management_client.py

@@ -69,7 +69,7 @@ class WebPubSubManagementClient:  # pylint: disable=client-accepts-api-version-k
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
      this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/__init__.py

@@ -20,6 +20,7 @@
 from ._models_py3 import EventListenerEndpoint
 from ._models_py3 import EventListenerFilter
 from ._models_py3 import EventNameFilter
+from ._models_py3 import IPRule
 from ._models_py3 import LiveTraceCategory
 from ._models_py3 import LiveTraceConfiguration
 from ._models_py3 import LogSpecification
@@ -106,6 +107,7 @@
     "EventListenerEndpoint",
     "EventListenerFilter",
     "EventNameFilter",
+    "IPRule",
     "LiveTraceCategory",
     "LiveTraceConfiguration",
     "LogSpecification",

sdk/webpubsub/azure-mgmt-webpubsub/azure/mgmt/webpubsub/models/_models_py3.py

@@ -707,6 +707,34 @@ def __init__(
         self.user_event_pattern = user_event_pattern
 
 
+class IPRule(_serialization.Model):
+    """An IP rule.
+
+    :ivar value: An IP or CIDR or ServiceTag.
+    :vartype value: str
+    :ivar action: Azure Networking ACL Action. Known values are: "Allow" and "Deny".
+    :vartype action: str or ~azure.mgmt.webpubsub.models.ACLAction
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "str"},
+        "action": {"key": "action", "type": "str"},
+    }
+
+    def __init__(
+        self, *, value: Optional[str] = None, action: Optional[Union[str, "_models.ACLAction"]] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword value: An IP or CIDR or ServiceTag.
+        :paramtype value: str
+        :keyword action: Azure Networking ACL Action. Known values are: "Allow" and "Deny".
+        :paramtype action: str or ~azure.mgmt.webpubsub.models.ACLAction
+        """
+        super().__init__(**kwargs)
+        self.value = value
+        self.action = action
+
+
 class LiveTraceCategory(_serialization.Model):
     """Live trace category configuration of a Microsoft.SignalRService resource.
 
@@ -1669,6 +1697,14 @@ class Replica(TrackedResource):
     :ivar provisioning_state: Provisioning state of the resource. Known values are: "Unknown",
      "Succeeded", "Failed", "Canceled", "Running", "Creating", "Updating", "Deleting", and "Moving".
     :vartype provisioning_state: str or ~azure.mgmt.webpubsub.models.ProvisioningState
+    :ivar region_endpoint_enabled: Enable or disable the regional endpoint. Default to "Enabled".
+     When it's Disabled, new connections will not be routed to this endpoint, however existing
+     connections will not be affected.
+    :vartype region_endpoint_enabled: str
+    :ivar resource_stopped: Stop or start the resource.  Default to "false".
+     When it's true, the data plane of the resource is shutdown.
+     When it's false, the data plane of the resource is started.
+    :vartype resource_stopped: str
     """
 
     _validation = {
@@ -1689,6 +1725,8 @@ class Replica(TrackedResource):
         "location": {"key": "location", "type": "str"},
         "sku": {"key": "sku", "type": "ResourceSku"},
         "provisioning_state": {"key": "properties.provisioningState", "type": "str"},
+        "region_endpoint_enabled": {"key": "properties.regionEndpointEnabled", "type": "str"},
+        "resource_stopped": {"key": "properties.resourceStopped", "type": "str"},
     }
 
     def __init__(
@@ -1697,6 +1735,8 @@ def __init__(
         location: str,
         tags: Optional[Dict[str, str]] = None,
         sku: Optional["_models.ResourceSku"] = None,
+        region_endpoint_enabled: str = "Enabled",
+        resource_stopped: str = "false",
         **kwargs: Any
     ) -> None:
         """
@@ -1706,10 +1746,21 @@ def __init__(
         :paramtype location: str
         :keyword sku: The billing information of the resource.
         :paramtype sku: ~azure.mgmt.webpubsub.models.ResourceSku
+        :keyword region_endpoint_enabled: Enable or disable the regional endpoint. Default to
+         "Enabled".
+         When it's Disabled, new connections will not be routed to this endpoint, however existing
+         connections will not be affected.
+        :paramtype region_endpoint_enabled: str
+        :keyword resource_stopped: Stop or start the resource.  Default to "false".
+         When it's true, the data plane of the resource is shutdown.
+         When it's false, the data plane of the resource is started.
+        :paramtype resource_stopped: str
         """
         super().__init__(tags=tags, location=location, **kwargs)
         self.sku = sku
         self.provisioning_state = None
+        self.region_endpoint_enabled = region_endpoint_enabled
+        self.resource_stopped = resource_stopped
 
 
 class ReplicaList(_serialization.Model):
@@ -2655,12 +2706,19 @@ class WebPubSubNetworkACLs(_serialization.Model):
     :vartype public_network: ~azure.mgmt.webpubsub.models.NetworkACL
     :ivar private_endpoints: ACLs for requests from private endpoints.
     :vartype private_endpoints: list[~azure.mgmt.webpubsub.models.PrivateEndpointACL]
+    :ivar ip_rules: IP rules for filtering public traffic.
+    :vartype ip_rules: list[~azure.mgmt.webpubsub.models.IPRule]
     """
 
+    _validation = {
+        "ip_rules": {"max_items": 30, "min_items": 0},
+    }
+
     _attribute_map = {
         "default_action": {"key": "defaultAction", "type": "str"},
         "public_network": {"key": "publicNetwork", "type": "NetworkACL"},
         "private_endpoints": {"key": "privateEndpoints", "type": "[PrivateEndpointACL]"},
+        "ip_rules": {"key": "ipRules", "type": "[IPRule]"},
     }
 
     def __init__(
@@ -2669,6 +2727,7 @@ def __init__(
         default_action: Optional[Union[str, "_models.ACLAction"]] = None,
         public_network: Optional["_models.NetworkACL"] = None,
         private_endpoints: Optional[List["_models.PrivateEndpointACL"]] = None,
+        ip_rules: Optional[List["_models.IPRule"]] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -2678,11 +2737,14 @@ def __init__(
         :paramtype public_network: ~azure.mgmt.webpubsub.models.NetworkACL
         :keyword private_endpoints: ACLs for requests from private endpoints.
         :paramtype private_endpoints: list[~azure.mgmt.webpubsub.models.PrivateEndpointACL]
+        :keyword ip_rules: IP rules for filtering public traffic.
+        :paramtype ip_rules: list[~azure.mgmt.webpubsub.models.IPRule]
         """
         super().__init__(**kwargs)
         self.default_action = default_action
         self.public_network = public_network
         self.private_endpoints = private_endpoints
+        self.ip_rules = ip_rules
 
 
 class WebPubSubResource(TrackedResource):  # pylint: disable=too-many-instance-attributes
@@ -2760,6 +2822,16 @@ class WebPubSubResource(TrackedResource):  # pylint: disable=too-many-instance-a
      Enable or disable aad auth
      When set as true, connection with AuthType=aad won't work.
     :vartype disable_aad_auth: bool
+    :ivar region_endpoint_enabled: Enable or disable the regional endpoint. Default to "Enabled".
+     When it's Disabled, new connections will not be routed to this endpoint, however existing
+     connections will not be affected.
+     This property is replica specific. Disable the regional endpoint without replica is not
+     allowed.
+    :vartype region_endpoint_enabled: str
+    :ivar resource_stopped: Stop or start the resource.  Default to "false".
+     When it's true, the data plane of the resource is shutdown.
+     When it's false, the data plane of the resource is started.
+    :vartype resource_stopped: str
     """
 
     _validation = {
@@ -2814,6 +2886,8 @@ class WebPubSubResource(TrackedResource):  # pylint: disable=too-many-instance-a
         "public_network_access": {"key": "properties.publicNetworkAccess", "type": "str"},
         "disable_local_auth": {"key": "properties.disableLocalAuth", "type": "bool"},
         "disable_aad_auth": {"key": "properties.disableAadAuth", "type": "bool"},
+        "region_endpoint_enabled": {"key": "properties.regionEndpointEnabled", "type": "str"},
+        "resource_stopped": {"key": "properties.resourceStopped", "type": "str"},
     }
 
     def __init__(  # pylint: disable=too-many-locals
@@ -2831,6 +2905,8 @@ def __init__(  # pylint: disable=too-many-locals
         public_network_access: str = "Enabled",
         disable_local_auth: bool = False,
         disable_aad_auth: bool = False,
+        region_endpoint_enabled: str = "Enabled",
+        resource_stopped: str = "false",
         **kwargs: Any
     ) -> None:
         """
@@ -2867,6 +2943,17 @@ def __init__(  # pylint: disable=too-many-locals
          Enable or disable aad auth
          When set as true, connection with AuthType=aad won't work.
         :paramtype disable_aad_auth: bool
+        :keyword region_endpoint_enabled: Enable or disable the regional endpoint. Default to
+         "Enabled".
+         When it's Disabled, new connections will not be routed to this endpoint, however existing
+         connections will not be affected.
+         This property is replica specific. Disable the regional endpoint without replica is not
+         allowed.
+        :paramtype region_endpoint_enabled: str
+        :keyword resource_stopped: Stop or start the resource.  Default to "false".
+         When it's true, the data plane of the resource is shutdown.
+         When it's false, the data plane of the resource is started.
+        :paramtype resource_stopped: str
         """
         super().__init__(tags=tags, location=location, **kwargs)
         self.sku = sku
@@ -2888,6 +2975,8 @@ def __init__(  # pylint: disable=too-many-locals
         self.public_network_access = public_network_access
         self.disable_local_auth = disable_local_auth
         self.disable_aad_auth = disable_aad_auth
+        self.region_endpoint_enabled = region_endpoint_enabled
+        self.resource_stopped = resource_stopped
 
 
 class WebPubSubResourceList(_serialization.Model):