diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/_params.py b/src/azure-cli/azure/cli/command_modules/eventhubs/_params.py index 315df225353..77a59224b49 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/_params.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/_params.py @@ -57,7 +57,7 @@ def load_arguments_eh(self, _): help='This determines if traffic is allowed over public network. By default it is enabled. If value is SecuredByPerimeter then Inbound and Outbound communication is controlled by the network security perimeter and profile\' access rules.') c.argument('alternate_name', help='Alternate name specified when alias and namespace names are same.') c.argument('max_replication_lag_duration_in_seconds', type=int, options_list=['--max-replication-lag-duration-in-seconds', '--max-lag'], help='The maximum acceptable lag for data replication operations from the primary replica to a quorum of secondary replicas') - + c.argument('ip_address_type', help='The IP address type for the namespace. Determines whether the namespace supports IPv4 only or both IPv4 and IPv6 (dualstack). Allowed values: DualStack, IPv4.') with self.argument_context('eventhubs namespace create') as c: c.argument('cluster_arm_id', options_list=['--cluster-arm-id'], help='Cluster ARM ID of the Namespace') diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/__cmd_group.py index 847567ccb68..68949c75910 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/__cmd_group.py @@ -15,9 +15,9 @@ "eventhubs", ) class __CMDGroup(AAZCommandGroup): - """eventhubs + """Manage Event Hub """ pass -__all__ = ["__CMDGroup"] \ No newline at end of file +__all__ = ["__CMDGroup"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_available_region.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_available_region.py index 92144f3d17c..23b2f9530d4 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_available_region.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_available_region.py @@ -19,9 +19,9 @@ class AvailableRegion(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/availableclusterregions", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/availableclusterregions", "2026-01-01"], ] } @@ -98,7 +98,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_create.py index 3136343b78a..a7e43a6ec21 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2026-01-01"], ] } @@ -61,7 +61,6 @@ def _build_arguments_schema(cls, *args, **kwargs): _args_schema.location = AAZResourceLocationArg( arg_group="Parameters", help="Resource location.", - required=True, fmt=AAZResourceLocationArgFormat( resource_group_arg="resource_group", ), @@ -78,16 +77,32 @@ def _build_arguments_schema(cls, *args, **kwargs): # define Arg Group "Properties" _args_schema = cls._args_schema - _args_schema.provisioning_state = AAZStrArg( - options=["--provisioning-state"], + _args_schema.platform_capabilities = AAZObjectArg( + options=["--platform-capabilities"], arg_group="Properties", - help="Provisioning state of the Cluster.", ) _args_schema.supports_scaling = AAZBoolArg( options=["--supports-scaling"], arg_group="Properties", help="A value that indicates whether Scaling is Supported.", ) + _args_schema.zone_redundant = AAZBoolArg( + options=["--zone-redundant"], + arg_group="Properties", + help="A value that indicates whether the cluster is zone redundant.", + ) + + platform_capabilities = cls._args_schema.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectArg( + options=["confidential-compute"], + ) + + confidential_compute = cls._args_schema.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrArg( + options=["mode"], + help="Setting to Enable or Disable Confidential Compute", + enum={"Disabled": "Disabled", "Enabled": "Enabled"}, + ) # define Arg Group "Sku" @@ -139,7 +154,7 @@ def __call__(self, *args, **kwargs): session, self.on_200_201, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) if session.http_response.status_code in [200, 201]: @@ -148,7 +163,7 @@ def __call__(self, *args, **kwargs): session, self.on_200_201, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) @@ -191,7 +206,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -216,15 +231,24 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("location", AAZStrType, ".location", typ_kwargs={"flags": {"required": True}}) + _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) _builder.set_prop("sku", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") properties = _builder.get(".properties") if properties is not None: - properties.set_prop("provisioningState", AAZStrType, ".provisioning_state") + properties.set_prop("platformCapabilities", AAZObjectType, ".platform_capabilities") properties.set_prop("supportsScaling", AAZBoolType, ".supports_scaling") + properties.set_prop("zoneRedundant", AAZBoolType, ".zone_redundant") + + platform_capabilities = _builder.get(".properties.platformCapabilities") + if platform_capabilities is not None: + platform_capabilities.set_prop("confidentialCompute", AAZObjectType, ".confidential_compute") + + confidential_compute = _builder.get(".properties.platformCapabilities.confidentialCompute") + if confidential_compute is not None: + confidential_compute.set_prop("mode", AAZStrType, ".mode") sku = _builder.get(".sku") if sku is not None: @@ -284,8 +308,12 @@ def _build_schema_on_200_201(cls): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -297,6 +325,17 @@ def _build_schema_on_200_201(cls): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = cls._schema_on_200_201.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200_201.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = cls._schema_on_200_201.sku sku.capacity = AAZIntType() @@ -334,4 +373,4 @@ class _CreateHelper: """Helper class for Create""" -__all__ = ["Create"] \ No newline at end of file +__all__ = ["Create"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_delete.py index c53ab000f0a..307ac3bb511 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_delete.py @@ -20,9 +20,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2026-01-01"], ] } @@ -83,7 +83,7 @@ def __call__(self, *args, **kwargs): session, self.on_200, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) if session.http_response.status_code in [200]: @@ -92,7 +92,7 @@ def __call__(self, *args, **kwargs): session, self.on_200, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) if session.http_response.status_code in [204]: @@ -101,7 +101,7 @@ def __call__(self, *args, **kwargs): session, self.on_204, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) @@ -144,7 +144,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_list.py index 32340ffaed1..748adc75b35 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_list.py @@ -19,13 +19,15 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/clusters", "2023-01-01-preview"], - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/clusters", "2026-01-01"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters", "2026-01-01"], ] } + AZ_SUPPORT_PAGINATION = True + def _handler(self, command_args): super()._handler(command_args) return self.build_paging(self._execute_operations, self._output) @@ -46,12 +48,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.ClustersListByResourceGroup(ctx=self.ctx)() - if condition_1: self.ClustersListBySubscription(ctx=self.ctx)() + if condition_1: + self.ClustersListByResourceGroup(ctx=self.ctx)() self.post_operations() @register_callback @@ -67,7 +69,7 @@ def _output(self, *args, **kwargs): next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link - class ClustersListByResourceGroup(AAZHttpOperation): + class ClustersListBySubscription(AAZHttpOperation): CLIENT_TYPE = "MgmtClient" def __call__(self, *args, **kwargs): @@ -81,7 +83,7 @@ def __call__(self, *args, **kwargs): @property def url(self): return self.client.format_url( - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters", + "/subscriptions/{subscriptionId}/providers/Microsoft.EventHub/clusters", **self.url_parameters ) @@ -96,10 +98,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, @@ -111,7 +109,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -147,7 +145,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() @@ -182,8 +182,12 @@ def _build_schema_on_200(cls): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -195,6 +199,17 @@ def _build_schema_on_200(cls): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = cls._schema_on_200.value.Element.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.value.Element.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = cls._schema_on_200.value.Element.sku sku.capacity = AAZIntType() @@ -227,7 +242,7 @@ def _build_schema_on_200(cls): return cls._schema_on_200 - class ClustersListBySubscription(AAZHttpOperation): + class ClustersListByResourceGroup(AAZHttpOperation): CLIENT_TYPE = "MgmtClient" def __call__(self, *args, **kwargs): @@ -241,7 +256,7 @@ def __call__(self, *args, **kwargs): @property def url(self): return self.client.format_url( - "/subscriptions/{subscriptionId}/providers/Microsoft.EventHub/clusters", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/clusters", **self.url_parameters ) @@ -256,6 +271,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, @@ -267,7 +286,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -303,7 +322,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() @@ -338,8 +359,12 @@ def _build_schema_on_200(cls): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -351,6 +376,17 @@ def _build_schema_on_200(cls): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = cls._schema_on_200.value.Element.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.value.Element.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = cls._schema_on_200.value.Element.sku sku.capacity = AAZIntType() @@ -388,4 +424,4 @@ class _ListHelper: """Helper class for List""" -__all__ = ["List"] \ No newline at end of file +__all__ = ["List"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_show.py index 6474d938ba2..ae93d99b78a 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2026-01-01"], ] } @@ -121,7 +121,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -183,8 +183,12 @@ def _build_schema_on_200(cls): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -196,6 +200,17 @@ def _build_schema_on_200(cls): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = cls._schema_on_200.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = cls._schema_on_200.sku sku.capacity = AAZIntType() @@ -233,4 +248,4 @@ class _ShowHelper: """Helper class for Show""" -__all__ = ["Show"] \ No newline at end of file +__all__ = ["Show"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_update.py index aac112b7c42..6f329fa7e7e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2026-01-01"], ] } @@ -76,10 +76,9 @@ def _build_arguments_schema(cls, *args, **kwargs): # define Arg Group "Properties" _args_schema = cls._args_schema - _args_schema.provisioning_state = AAZStrArg( - options=["--provisioning-state"], + _args_schema.platform_capabilities = AAZObjectArg( + options=["--platform-capabilities"], arg_group="Properties", - help="Provisioning state of the Cluster.", nullable=True, ) _args_schema.supports_scaling = AAZBoolArg( @@ -88,6 +87,26 @@ def _build_arguments_schema(cls, *args, **kwargs): help="A value that indicates whether Scaling is Supported.", nullable=True, ) + _args_schema.zone_redundant = AAZBoolArg( + options=["--zone-redundant"], + arg_group="Properties", + help="A value that indicates whether the cluster is zone redundant.", + nullable=True, + ) + + platform_capabilities = cls._args_schema.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectArg( + options=["confidential-compute"], + nullable=True, + ) + + confidential_compute = cls._args_schema.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrArg( + options=["mode"], + help="Setting to Enable or Disable Confidential Compute", + nullable=True, + enum={"Disabled": "Disabled", "Enabled": "Enabled"}, + ) # define Arg Group "Sku" @@ -187,7 +206,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -234,7 +253,7 @@ def __call__(self, *args, **kwargs): session, self.on_200_201, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) if session.http_response.status_code in [200, 201]: @@ -243,7 +262,7 @@ def __call__(self, *args, **kwargs): session, self.on_200_201, self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, + lro_options={"final-state-via": "location"}, path_format_arguments=self.url_parameters, ) @@ -286,7 +305,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -350,8 +369,17 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: - properties.set_prop("provisioningState", AAZStrType, ".provisioning_state") + properties.set_prop("platformCapabilities", AAZObjectType, ".platform_capabilities") properties.set_prop("supportsScaling", AAZBoolType, ".supports_scaling") + properties.set_prop("zoneRedundant", AAZBoolType, ".zone_redundant") + + platform_capabilities = _builder.get(".properties.platformCapabilities") + if platform_capabilities is not None: + platform_capabilities.set_prop("confidentialCompute", AAZObjectType, ".confidential_compute") + + confidential_compute = _builder.get(".properties.platformCapabilities.confidentialCompute") + if confidential_compute is not None: + confidential_compute.set_prop("mode", AAZStrType, ".mode") sku = _builder.get(".sku") if sku is not None: @@ -423,8 +451,12 @@ def _build_schema_cluster_read(cls, _schema): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -436,6 +468,17 @@ def _build_schema_cluster_read(cls, _schema): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = _schema_cluster_read.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = _schema_cluster_read.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = _schema_cluster_read.sku sku.capacity = AAZIntType() @@ -476,4 +519,4 @@ def _build_schema_cluster_read(cls, _schema): _schema.type = cls._schema_cluster_read.type -__all__ = ["Update"] \ No newline at end of file +__all__ = ["Update"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_wait.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_wait.py index f2f8ca55799..bd33124adca 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_wait.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/_wait.py @@ -20,7 +20,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}", "2026-01-01"], ] } @@ -120,7 +120,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -182,8 +182,12 @@ def _build_schema_on_200(cls): serialized_name="metricId", flags={"read_only": True}, ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", + flags={"read_only": True}, ) properties.status = AAZStrType( flags={"read_only": True}, @@ -195,6 +199,17 @@ def _build_schema_on_200(cls): serialized_name="updatedAt", flags={"read_only": True}, ) + properties.zone_redundant = AAZBoolType( + serialized_name="zoneRedundant", + ) + + platform_capabilities = cls._schema_on_200.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() sku = cls._schema_on_200.sku sku.capacity = AAZIntType() @@ -232,4 +247,4 @@ class _WaitHelper: """Helper class for Wait""" -__all__ = ["Wait"] \ No newline at end of file +__all__ = ["Wait"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/namespace/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/namespace/_list.py index f23d7ef8ce7..5829813ca37 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/namespace/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/cluster/namespace/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}/namespaces", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/clusters/{}/namespaces", "2026-01-01"], ] } @@ -120,7 +120,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__cmd_group.py index 4c5e7ac0305..11a39f0a634 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/__cmd_group.py @@ -20,4 +20,4 @@ class __CMDGroup(AAZCommandGroup): pass -__all__ = ["__CMDGroup"] \ No newline at end of file +__all__ = ["__CMDGroup"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_create.py index dc0d7351a66..f225b82938e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2026-01-01"], ] } @@ -55,7 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -134,16 +134,6 @@ def _build_arguments_schema(cls, *args, **kwargs): help="ARM ID of Managed User Identity. This property is required is the type is UserAssignedIdentity. If type is SystemAssigned, then the System Assigned Identity Associated with the namespace will be used.", ) - # define Arg Group "MessageTimestampDescription" - - _args_schema = cls._args_schema - _args_schema.timestamp_type = AAZStrArg( - options=["--timestamp-type"], - arg_group="MessageTimestampDescription", - help="Denotes the type of timestamp the message will hold.Two types of timestamp types - \"AppendTime\" and \"CreateTime\". AppendTime refers the time in which message got appended inside broker log. CreateTime refers to the time in which the message was generated on source side and producers can set this timestamp while sending the message. Default value is AppendTime. If you are using AMQP protocol, CreateTime equals AppendTime and its behavior remains the same.", - enum={"Create": "Create", "LogAppend": "LogAppend"}, - ) - # define Arg Group "Properties" _args_schema = cls._args_schema @@ -155,6 +145,11 @@ def _build_arguments_schema(cls, *args, **kwargs): minimum=1, ), ) + _args_schema.message_timestamp_description = AAZObjectArg( + options=["--message-timestamp-description"], + arg_group="Properties", + help="Properties of MessageTimestamp Description", + ) _args_schema.partition_count = AAZIntArg( options=["--partition-count"], arg_group="Properties", @@ -175,6 +170,13 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Gets and Sets Metadata of User.", ) + message_timestamp_description = cls._args_schema.message_timestamp_description + message_timestamp_description.timestamp_type = AAZStrArg( + options=["timestamp-type"], + help="Denotes the type of timestamp the message will hold.Two types of timestamp types - \"AppendTime\" and \"CreateTime\". AppendTime refers the time in which message got appended inside broker log. CreateTime refers to the time in which the message was generated on source side and producers can set this timestamp while sending the message. Default value is AppendTime. If you are using AMQP protocol, CreateTime equals AppendTime and its behavior remains the same.", + enum={"Create": "Create", "LogAppend": "LogAppend"}, + ) + # define Arg Group "RetentionDescription" _args_schema = cls._args_schema @@ -185,7 +187,7 @@ def _build_arguments_schema(cls, *args, **kwargs): enum={"Compact": "Compact", "Delete": "Delete", "DeleteOrCompact": "DeleteOrCompact"}, ) _args_schema.min_compaction_lag_time_in_minutes = AAZIntArg( - options=["--min-lag", "--min-compaction-lag-in-mins"], + options=["--min-compaction-lag-time-in-minutes"], arg_group="RetentionDescription", help="The minimum time a message will remain ineligible for compaction in the log. This value is used when cleanupPolicy is Compact or DeleteOrCompact.", ) @@ -270,7 +272,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -301,7 +303,7 @@ def content(self): if properties is not None: properties.set_prop("captureDescription", AAZObjectType) properties.set_prop("messageRetentionInDays", AAZIntType, ".message_retention_in_days") - properties.set_prop("messageTimestampDescription", AAZObjectType) + properties.set_prop("messageTimestampDescription", AAZObjectType, ".message_timestamp_description") properties.set_prop("partitionCount", AAZIntType, ".partition_count") properties.set_prop("retentionDescription", AAZObjectType) properties.set_prop("status", AAZStrType, ".status") diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_delete.py index 6621d658f3d..5b049439be2 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_delete.py @@ -12,16 +12,16 @@ @register_command( - "eventhubs eventhub delete", + "eventhubs eventhub delete" ) class Delete(AAZCommand): """Delete an Event Hub from the specified Namespace and resource group. """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2026-01-01"], ] } @@ -57,7 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -134,7 +134,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_list.py index a445f9ac26c..1fe1c9a6df0 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs", "2026-01-01"], ] } @@ -47,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -145,7 +145,7 @@ def query_parameters(self): "$top", self.ctx.args.top, ), **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -181,7 +181,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() @@ -302,8 +304,8 @@ def _build_schema_on_200(cls): retention_description.cleanup_policy = AAZStrType( serialized_name="cleanupPolicy", ) - retention_description.min_compaction_lag_in_mins = AAZIntType( - serialized_name="minCompactionLagInMins", + retention_description.min_compaction_lag_time_in_minutes = AAZIntType( + serialized_name="minCompactionLagTimeInMinutes", ) retention_description.retention_time_in_hours = AAZIntType( serialized_name="retentionTimeInHours", diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_show.py index 942ae818577..06a5085cd6d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2026-01-01"], ] } @@ -57,7 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -136,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -284,8 +284,8 @@ def _build_schema_on_200(cls): retention_description.cleanup_policy = AAZStrType( serialized_name="cleanupPolicy", ) - retention_description.min_compaction_lag_in_mins = AAZIntType( - serialized_name="minCompactionLagInMins", + retention_description.min_compaction_lag_time_in_minutes = AAZIntType( + serialized_name="minCompactionLagTimeInMinutes", ) retention_description.retention_time_in_hours = AAZIntType( serialized_name="retentionTimeInHours", diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_update.py index cd905b22a12..7e15ea14a1d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}", "2026-01-01"], ] } @@ -59,7 +59,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -150,20 +150,15 @@ def _build_arguments_schema(cls, *args, **kwargs): nullable=True, ) - # define Arg Group "MessageTimestampDescription" + # define Arg Group "Properties" _args_schema = cls._args_schema - _args_schema.timestamp_type = AAZStrArg( - options=["--timestamp-type"], - arg_group="MessageTimestampDescription", - help="Denotes the type of timestamp the message will hold.Two types of timestamp types - \"AppendTime\" and \"CreateTime\". AppendTime refers the time in which message got appended inside broker log. CreateTime refers to the time in which the message was generated on source side and producers can set this timestamp while sending the message. Default value is AppendTime. If you are using AMQP protocol, CreateTime equals AppendTime and its behavior remains the same.", + _args_schema.message_timestamp_description = AAZObjectArg( + options=["--message-timestamp-description"], + arg_group="Properties", + help="Properties of MessageTimestamp Description", nullable=True, - enum={"Create": "Create", "LogAppend": "LogAppend"}, ) - - # define Arg Group "Properties" - - _args_schema = cls._args_schema _args_schema.partition_count = AAZIntArg( options=["--partition-count"], arg_group="Properties", @@ -187,6 +182,14 @@ def _build_arguments_schema(cls, *args, **kwargs): nullable=True, ) + message_timestamp_description = cls._args_schema.message_timestamp_description + message_timestamp_description.timestamp_type = AAZStrArg( + options=["timestamp-type"], + help="Denotes the type of timestamp the message will hold.Two types of timestamp types - \"AppendTime\" and \"CreateTime\". AppendTime refers the time in which message got appended inside broker log. CreateTime refers to the time in which the message was generated on source side and producers can set this timestamp while sending the message. Default value is AppendTime. If you are using AMQP protocol, CreateTime equals AppendTime and its behavior remains the same.", + nullable=True, + enum={"Create": "Create", "LogAppend": "LogAppend"}, + ) + # define Arg Group "RetentionDescription" _args_schema = cls._args_schema @@ -198,7 +201,7 @@ def _build_arguments_schema(cls, *args, **kwargs): enum={"Compact": "Compact", "Delete": "Delete", "DeleteOrCompact": "DeleteOrCompact"}, ) _args_schema.min_compaction_lag_time_in_minutes = AAZIntArg( - options=["--min-lag", "--min-compaction-lag-in-mins"], + options=["--min-compaction-lag-time-in-minutes"], arg_group="RetentionDescription", help="The minimum time a message will remain ineligible for compaction in the log. This value is used when cleanupPolicy is Compact or DeleteOrCompact.", nullable=True, @@ -299,7 +302,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -386,7 +389,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -449,7 +452,7 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: properties.set_prop("captureDescription", AAZObjectType) - properties.set_prop("messageTimestampDescription", AAZObjectType) + properties.set_prop("messageTimestampDescription", AAZObjectType, ".message_timestamp_description") properties.set_prop("partitionCount", AAZIntType, ".partition_count") properties.set_prop("retentionDescription", AAZObjectType) properties.set_prop("status", AAZStrType, ".status") diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_create.py index 4b639076aa4..00a9ef43311 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_create.py @@ -16,15 +16,12 @@ ) class Create(AAZCommand): """Create an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect. - - :example: Creates Authorizationrule for the given Eventhub - az eventhub authorization-rule create --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule --rights Listen """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -66,6 +63,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -162,7 +160,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_delete.py index 3c78729a7a3..6a6a2dc73cd 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_delete.py @@ -16,15 +16,12 @@ ) class Delete(AAZCommand): """Delete an Event Hub AuthorizationRule. - - :example: Deletes the Authorizationrule of Eventhub. - az eventhubs eventhub authorization-rule delete --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -69,6 +66,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -149,7 +147,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_list.py index 83168b2b914..15a1b1b7a47 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_list.py @@ -16,15 +16,12 @@ ) class List(AAZCommand): """List the authorization rules for an Event Hub. - - :example: shows the list of Authorization-rules by Eventhub - az eventhubs eventhub authorization-rule list --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules", "2026-01-01"], ] } @@ -59,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -138,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -174,7 +172,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_show.py index 8968424365d..02e789289d5 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_show.py @@ -16,15 +16,12 @@ ) class Show(AAZCommand): """Get an AuthorizationRule for an Event Hub by rule name. - - :example: shows the details of Authorizationrule - az eventhubs eventhub authorization-rule show --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -69,6 +66,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -151,7 +149,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_update.py index 202432b48d9..e5f6b6ca91a 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/_update.py @@ -16,15 +16,12 @@ ) class Update(AAZCommand): """Update an AuthorizationRule for the specified Event Hub. Creation/update of the AuthorizationRule will take a few seconds to take effect. - - :example: Update Eventhubs Authorization-Rule - az eventhubs eventhub authorization-rule update --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule --rights Send """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -71,6 +68,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -181,7 +179,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -272,7 +270,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_list.py index b04ab7408a5..e5967b5292a 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_list.py @@ -16,15 +16,12 @@ ) class List(AAZCommand): """Gets the ACS and SAS connection strings for the Event Hub. - - :example: Shows the connection strings of Authorizationrule for the eventhub. - az eventhubs eventhub authorization-rule keys list --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}/listkeys", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}/listkeys", "2026-01-01"], ] } @@ -66,6 +63,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -148,7 +146,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_renew.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_renew.py index 34c800e86bb..f289de99b4c 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_renew.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/authorization_rule/keys/_renew.py @@ -16,15 +16,12 @@ ) class Renew(AAZCommand): """Regenerates the ACS and SAS connection strings for the Event Hub. - - :example: Regenerate the connection strings of Authorizationrule for the namespace - az eventhubs eventhub authorization-rule keys renew --resource-group myresourcegroup --namespace-name mynamespace --eventhub-name myeventhub --name myauthorule --key PrimaryKey """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}/regeneratekeys", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/authorizationrules/{}/regeneratekeys", "2026-01-01"], ] } @@ -69,6 +66,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -167,7 +165,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_create.py index 3b1baac20f8..0adab594b90 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2026-01-01"], ] } @@ -64,6 +64,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -155,7 +156,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_delete.py index b2bd403660a..f09cf491c3d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_delete.py @@ -19,9 +19,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2026-01-01"], ] } @@ -67,6 +67,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -147,7 +148,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_list.py index 669b18d55fd..4623cbe9c77 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups", "2026-01-01"], ] } @@ -56,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -157,7 +158,7 @@ def query_parameters(self): "$top", self.ctx.args.top, ), **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -193,7 +194,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_show.py index 44450dc8bcf..a0709c8b770 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2026-01-01"], ] } @@ -67,6 +67,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -149,7 +150,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_update.py index 0bd29e85de0..a058cbf9ef5 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/eventhub/consumer_group/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/eventhubs/{}/consumergroups/{}", "2026-01-01"], ] } @@ -69,6 +69,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -174,7 +175,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -265,7 +266,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_break_pair.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_break_pair.py index f69925d0214..1dffd144f7b 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_break_pair.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_break_pair.py @@ -19,9 +19,9 @@ class BreakPair(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/breakpairing", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/breakpairing", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -131,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_create.py index 6f7684c2ec4..b85becc37c4 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2026-01-01"], ] } @@ -55,6 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -147,7 +148,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_delete.py index d02de0d5694..0677d3be67e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_delete.py @@ -19,9 +19,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -133,7 +134,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_exists.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_exists.py index 7c3d6208645..cd9c09dc422 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_exists.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_exists.py @@ -19,9 +19,9 @@ class Exists(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/checknameavailability", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/checknameavailability", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -131,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_fail_over.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_fail_over.py index 43b11bb1b00..428ca5c8974 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_fail_over.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_fail_over.py @@ -19,9 +19,9 @@ class FailOver(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/failover", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/failover", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -131,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_list.py index 4f74a09ce1c..936d186fc7f 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -122,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -157,9 +158,10 @@ def _build_schema_on_200(cls): _schema_on_200 = cls._schema_on_200 _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", - flags={"read_only": True}, ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_show.py index cff702756cf..1e92a675e4d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_list.py index 7b67a8e7bfb..b158ec9b9fc 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules", "2026-01-01"], ] } @@ -56,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -171,7 +172,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_show.py index f96e5a56777..73356ebf045 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -66,6 +66,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -148,7 +149,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/keys/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/keys/_list.py index 2030c533570..eb0cdcf44b9 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/keys/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/georecovery_alias/authorization_rule/keys/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules/{}/listkeys", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/disasterrecoveryconfigs/{}/authorizationrules/{}/listkeys", "2026-01-01"], ] } @@ -63,6 +63,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -145,7 +146,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/__cmd_group.py index ddd39045714..5c3b81a8cc4 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace", ) class __CMDGroup(AAZCommandGroup): - """Eventhub namespace. + """Manage Namespace """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_create.py index 4c38ecc2819..8d92a196595 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_create.py @@ -16,18 +16,12 @@ ) class Create(AAZCommand): """Create a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent. - - :example: Creates a new namespace. - az eventhubs namespace create --resource-group myresourcegroup --name mynamespace --location westus --tags tag1=value1 tag2=value2 --sku Standard --enable-auto-inflate - - :example: Creates a new namespace with Identity & Encryption Enabled - az eventhubs namespace create --resource-group myresourcegroup --name mynamespace --location westus --sku Premium --mi-user-assigned /subscriptions/{subscriptionId}/resourceGroups/{resourcegroup}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MSIName --encryption-config key-name=key1 key-vault-uri=https://mykeyvault.vault.azure.net/ user-assigned-identity=/subscriptions/{subscriptionId}}/resourceGroups/{resourcegroup}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MSIName --encryption-config key-name=key1 key-vault-uri=https://mykeyvault.vault.azure.net/ user-assigned-identity=/subscriptions/{subscriptionId}}/resourceGroups/{resourcegroup}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MSIName """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2026-01-01"], ] } @@ -53,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -73,7 +67,6 @@ def _build_arguments_schema(cls, *args, **kwargs): _args_schema.location = AAZResourceLocationArg( arg_group="Parameters", help="Resource location.", - required=True, fmt=AAZResourceLocationArgFormat( resource_group_arg="resource_group", ), @@ -90,16 +83,29 @@ def _build_arguments_schema(cls, *args, **kwargs): ) identity = cls._args_schema.identity + identity.mi_system_assigned = AAZStrArg( + options=["system-assigned", "mi-system-assigned"], + help="Set the system managed identity.", + blank="True", + ) identity.type = AAZStrArg( options=["type"], help="Type of managed service identity.", enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned, UserAssigned": "SystemAssigned, UserAssigned", "UserAssigned": "UserAssigned"}, ) + identity.mi_user_assigned = AAZListArg( + options=["user-assigned", "mi-user-assigned"], + help="Set the user managed identities.", + blank=[], + ) identity.user_assigned_identities = AAZDictArg( options=["user-assigned-identities"], help="Properties for User Assigned Identities", ) + mi_user_assigned = cls._args_schema.identity.mi_user_assigned + mi_user_assigned.Element = AAZStrArg() + user_assigned_identities = cls._args_schema.identity.user_assigned_identities user_assigned_identities.Element = AAZObjectArg( blank={}, @@ -156,6 +162,12 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="Geo Data Replication settings for the namespace", ) + _args_schema.ip_address_type = AAZStrArg( + options=["--ip-address-type"], + arg_group="Properties", + help="The IP address type for the namespace. Determines whether the namespace supports IPv4 only or both IPv4 and IPv6 (dual stack).", + enum={"DualStack": "DualStack", "IPv4": "IPv4"}, + ) _args_schema.enable_auto_inflate = AAZBoolArg( options=["--enable-auto-inflate"], arg_group="Properties", @@ -178,7 +190,11 @@ def _build_arguments_schema(cls, *args, **kwargs): options=["--minimum-tls-version"], arg_group="Properties", help="The minimum TLS version for the cluster to support, e.g. '1.2'", - enum={"1.0": "1.0", "1.1": "1.1", "1.2": "1.2"}, + enum={"1.0": "1.0", "1.1": "1.1", "1.2": "1.2", "1.3": "1.3"}, + ) + _args_schema.platform_capabilities = AAZObjectArg( + options=["--platform-capabilities"], + arg_group="Properties", ) _args_schema.private_endpoint_connections = AAZListArg( options=["--endpoint-connections", "--private-endpoint-connections"], @@ -263,6 +279,18 @@ def _build_arguments_schema(cls, *args, **kwargs): enum={"Primary": "Primary", "Secondary": "Secondary"}, ) + platform_capabilities = cls._args_schema.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectArg( + options=["confidential-compute"], + ) + + confidential_compute = cls._args_schema.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrArg( + options=["mode"], + help="Setting to Enable or Disable Confidential Compute", + enum={"Disabled": "Disabled", "Enabled": "Enabled"}, + ) + private_endpoint_connections = cls._args_schema.private_endpoint_connections private_endpoint_connections.Element = AAZObjectArg() @@ -380,7 +408,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -405,8 +433,8 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("identity", AAZObjectType, ".identity") - _builder.set_prop("location", AAZStrType, ".location", typ_kwargs={"flags": {"required": True}}) + _builder.set_prop("identity", AAZIdentityObjectType, ".identity") + _builder.set_prop("location", AAZStrType, ".location") _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) _builder.set_prop("sku", AAZObjectType, ".sku") _builder.set_prop("tags", AAZDictType, ".tags") @@ -415,11 +443,17 @@ def content(self): if identity is not None: identity.set_prop("type", AAZStrType, ".type") identity.set_prop("userAssignedIdentities", AAZDictType, ".user_assigned_identities") + identity.set_prop("userAssigned", AAZListType, ".mi_user_assigned", typ_kwargs={"flags": {"action": "create"}}) + identity.set_prop("systemAssigned", AAZStrType, ".mi_system_assigned", typ_kwargs={"flags": {"action": "create"}}) user_assigned_identities = _builder.get(".identity.userAssignedIdentities") if user_assigned_identities is not None: user_assigned_identities.set_elements(AAZObjectType, ".") + user_assigned = _builder.get(".identity.userAssigned") + if user_assigned is not None: + user_assigned.set_elements(AAZStrType, ".") + properties = _builder.get(".properties") if properties is not None: properties.set_prop("alternateName", AAZStrType, ".alternate_name") @@ -427,10 +461,12 @@ def content(self): properties.set_prop("disableLocalAuth", AAZBoolType, ".disable_local_auth") properties.set_prop("encryption", AAZObjectType, ".encryption") properties.set_prop("geoDataReplication", AAZObjectType, ".geo_data_replication") + properties.set_prop("ipAddressType", AAZStrType, ".ip_address_type") properties.set_prop("isAutoInflateEnabled", AAZBoolType, ".enable_auto_inflate") properties.set_prop("kafkaEnabled", AAZBoolType, ".kafka_enabled") properties.set_prop("maximumThroughputUnits", AAZIntType, ".maximum_throughput_units") properties.set_prop("minimumTlsVersion", AAZStrType, ".minimum_tls_version") + properties.set_prop("platformCapabilities", AAZObjectType, ".platform_capabilities") properties.set_prop("privateEndpointConnections", AAZListType, ".private_endpoint_connections") properties.set_prop("publicNetworkAccess", AAZStrType, ".public_network_access") properties.set_prop("zoneRedundant", AAZBoolType, ".zone_redundant") @@ -471,6 +507,14 @@ def content(self): _elements.set_prop("locationName", AAZStrType, ".location_name") _elements.set_prop("roleType", AAZStrType, ".role_type") + platform_capabilities = _builder.get(".properties.platformCapabilities") + if platform_capabilities is not None: + platform_capabilities.set_prop("confidentialCompute", AAZObjectType, ".confidential_compute") + + confidential_compute = _builder.get(".properties.platformCapabilities.confidentialCompute") + if confidential_compute is not None: + confidential_compute.set_prop("mode", AAZStrType, ".mode") + private_endpoint_connections = _builder.get(".properties.privateEndpointConnections") if private_endpoint_connections is not None: private_endpoint_connections.set_elements(AAZObjectType, ".") @@ -527,7 +571,7 @@ def _build_schema_on_200_201(cls): _schema_on_200_201.id = AAZStrType( flags={"read_only": True}, ) - _schema_on_200_201.identity = AAZObjectType() + _schema_on_200_201.identity = AAZIdentityObjectType() _schema_on_200_201.location = AAZStrType() _schema_on_200_201.name = AAZStrType( flags={"read_only": True}, @@ -591,6 +635,9 @@ def _build_schema_on_200_201(cls): properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -607,6 +654,9 @@ def _build_schema_on_200_201(cls): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -687,6 +737,14 @@ def _build_schema_on_200_201(cls): serialized_name="roleType", ) + platform_capabilities = cls._schema_on_200_201.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200_201.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = cls._schema_on_200_201.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_delete.py index a1e43714c2b..ee8b0cc8c3a 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_delete.py @@ -16,15 +16,12 @@ ) class Delete(AAZCommand): """Delete an existing namespace. This operation also removes all associated resources under the namespace. - - :example: Delete the Namespace - az eventhubs namespace delete --resource-group myresourcegroup --name mynamespace """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2026-01-01"], ] } @@ -51,7 +48,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -147,7 +144,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_exists.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_exists.py index 909d4611aa3..0128dcd4f91 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_exists.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_exists.py @@ -19,9 +19,9 @@ class Exists(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/checknameavailability", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/checknameavailability", "2026-01-01"], ] } @@ -108,7 +108,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_failover.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_failover.py index 887fecaac6d..6149537eb0e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_failover.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_failover.py @@ -19,17 +19,16 @@ class Failover(AAZCommand): """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/failover", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/failover", "2026-01-01"], ] } - AZ_SUPPORT_NO_WAIT = True - def _handler(self, command_args): super()._handler(command_args) - return self.build_lro_poller(self._execute_operations, self._output) + self._execute_operations() + return None _args_schema = None @@ -48,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -74,7 +73,7 @@ def _build_arguments_schema(cls, *args, **kwargs): def _execute_operations(self): self.pre_operations() - yield self.NamespacesFailover(ctx=self.ctx)() + self.NamespacesFailover(ctx=self.ctx)() self.post_operations() @register_callback @@ -85,34 +84,14 @@ def pre_operations(self): def post_operations(self): pass - def _output(self, *args, **kwargs): - result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True) - return result - class NamespacesFailover(AAZHttpOperation): CLIENT_TYPE = "MgmtClient" def __call__(self, *args, **kwargs): request = self.make_request() session = self.client.send_request(request=request, stream=False, **kwargs) - if session.http_response.status_code in [202]: - return self.client.build_lro_polling( - self.ctx.args.no_wait, - session, - self.on_200_201, - self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=self.url_parameters, - ) if session.http_response.status_code in [200, 201]: - return self.client.build_lro_polling( - self.ctx.args.no_wait, - session, - self.on_200_201, - self.on_error, - lro_options={"final-state-via": "azure-async-operation"}, - path_format_arguments=self.url_parameters, - ) + return self.on_200_201(session) return self.on_error(session.http_response) @@ -153,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -165,9 +144,6 @@ def header_parameters(self): **self.serialize_header_param( "Content-Type", "application/json", ), - **self.serialize_header_param( - "Accept", "application/json", - ), } return parameters @@ -188,34 +164,7 @@ def content(self): return self.serialize_content(_content_value) def on_200_201(self, session): - data = self.deserialize_http_content(session) - self.ctx.set_var( - "instance", - data, - schema_builder=self._build_schema_on_200_201 - ) - - _schema_on_200_201 = None - - @classmethod - def _build_schema_on_200_201(cls): - if cls._schema_on_200_201 is not None: - return cls._schema_on_200_201 - - cls._schema_on_200_201 = AAZObjectType() - - _schema_on_200_201 = cls._schema_on_200_201 - _schema_on_200_201.properties = AAZObjectType( - flags={"client_flatten": True}, - ) - - properties = cls._schema_on_200_201.properties - properties.force = AAZBoolType() - properties.primary_location = AAZStrType( - serialized_name="primaryLocation", - ) - - return cls._schema_on_200_201 + pass class _FailoverHelper: diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_list.py index ef7d29ac2f5..4ceb633e197 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_list.py @@ -16,19 +16,13 @@ ) class List(AAZCommand): """List all the available Namespaces within a subscription, irrespective of the resource groups. - - :example: List the Event Hubs Namespaces by resource group. - az eventhubs namespace list --resource-group myresourcegroup - - :example: Get the Namespaces by Subscription. - az eventhubs namespace list """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/namespaces", "2023-01-01-preview"], - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.eventhub/namespaces", "2026-01-01"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces", "2026-01-01"], ] } @@ -54,12 +48,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.NamespacesListByResourceGroup(ctx=self.ctx)() - if condition_1: self.NamespacesList(ctx=self.ctx)() + if condition_1: + self.NamespacesListByResourceGroup(ctx=self.ctx)() self.post_operations() @register_callback @@ -75,7 +69,7 @@ def _output(self, *args, **kwargs): next_link = self.deserialize_output(self.ctx.vars.instance.next_link) return result, next_link - class NamespacesListByResourceGroup(AAZHttpOperation): + class NamespacesList(AAZHttpOperation): CLIENT_TYPE = "MgmtClient" def __call__(self, *args, **kwargs): @@ -89,7 +83,7 @@ def __call__(self, *args, **kwargs): @property def url(self): return self.client.format_url( - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces", + "/subscriptions/{subscriptionId}/providers/Microsoft.EventHub/namespaces", **self.url_parameters ) @@ -104,10 +98,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 +109,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -155,7 +145,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() @@ -164,7 +156,7 @@ def _build_schema_on_200(cls): _element.id = AAZStrType( flags={"read_only": True}, ) - _element.identity = AAZObjectType() + _element.identity = AAZIdentityObjectType() _element.location = AAZStrType() _element.name = AAZStrType( flags={"read_only": True}, @@ -228,6 +220,9 @@ def _build_schema_on_200(cls): properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -244,6 +239,9 @@ def _build_schema_on_200(cls): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -316,10 +314,22 @@ def _build_schema_on_200(cls): _element.location_name = AAZStrType( serialized_name="locationName", ) + _element.replica_state = AAZStrType( + serialized_name="replicaState", + flags={"read_only": True}, + ) _element.role_type = AAZStrType( serialized_name="roleType", ) + platform_capabilities = cls._schema_on_200.value.Element.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.value.Element.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = cls._schema_on_200.value.Element.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() @@ -375,7 +385,7 @@ def _build_schema_on_200(cls): return cls._schema_on_200 - class NamespacesList(AAZHttpOperation): + class NamespacesListByResourceGroup(AAZHttpOperation): CLIENT_TYPE = "MgmtClient" def __call__(self, *args, **kwargs): @@ -389,7 +399,7 @@ def __call__(self, *args, **kwargs): @property def url(self): return self.client.format_url( - "/subscriptions/{subscriptionId}/providers/Microsoft.EventHub/namespaces", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces", **self.url_parameters ) @@ -404,6 +414,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, @@ -415,7 +429,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -451,7 +465,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() @@ -460,7 +476,7 @@ def _build_schema_on_200(cls): _element.id = AAZStrType( flags={"read_only": True}, ) - _element.identity = AAZObjectType() + _element.identity = AAZIdentityObjectType() _element.location = AAZStrType() _element.name = AAZStrType( flags={"read_only": True}, @@ -524,6 +540,9 @@ def _build_schema_on_200(cls): properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -540,6 +559,9 @@ def _build_schema_on_200(cls): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -612,10 +634,22 @@ def _build_schema_on_200(cls): _element.location_name = AAZStrType( serialized_name="locationName", ) + _element.replica_state = AAZStrType( + serialized_name="replicaState", + flags={"read_only": True}, + ) _element.role_type = AAZStrType( serialized_name="roleType", ) + platform_capabilities = cls._schema_on_200.value.Element.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.value.Element.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = cls._schema_on_200.value.Element.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() @@ -720,4 +754,4 @@ def _build_schema_system_data_read(cls, _schema): _schema.last_modified_by_type = cls._schema_system_data_read.last_modified_by_type -__all__ = ["List"] \ No newline at end of file +__all__ = ["List"] diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_show.py index c973d23172b..48b647c9348 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_show.py @@ -16,15 +16,12 @@ ) class Show(AAZCommand): """Get the description of the specified namespace. - - :example: shows the Namespace details. - az eventhubs namespace show --resource-group myresourcegroup --name mynamespace """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2026-01-01"], ] } @@ -50,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -125,7 +122,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -161,7 +158,7 @@ def _build_schema_on_200(cls): _schema_on_200.id = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.identity = AAZObjectType() + _schema_on_200.identity = AAZIdentityObjectType() _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType( flags={"read_only": True}, @@ -225,6 +222,9 @@ def _build_schema_on_200(cls): properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -241,6 +241,9 @@ def _build_schema_on_200(cls): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -321,6 +324,14 @@ def _build_schema_on_200(cls): serialized_name="roleType", ) + platform_capabilities = cls._schema_on_200.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = cls._schema_on_200.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_update.py index d23a90ad425..0b387b4a9ed 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_update.py @@ -16,15 +16,12 @@ ) class Update(AAZCommand): """Update a namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent. - - :example: Update a new namespace. - az eventhubs namespace update --resource-group myresourcegroup --name mynamespace --tags tag=value --enable-auto-inflate True """ _aaz_info = { - "version": "2024-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2026-01-01"], ] } @@ -53,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -168,6 +165,13 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Properties of BYOK Encryption description", nullable=True, ) + _args_schema.ip_address_type = AAZStrArg( + options=["--ip-address-type"], + arg_group="Properties", + help="The IP address type for the namespace. Determines whether the namespace supports IPv4 only or both IPv4 and IPv6 (dual stack).", + nullable=True, + enum={"DualStack": "DualStack", "IPv4": "IPv4"}, + ) _args_schema.enable_auto_inflate = AAZBoolArg( options=["--enable-auto-inflate"], arg_group="Properties", @@ -194,7 +198,12 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="The minimum TLS version for the cluster to support, e.g. '1.2'", nullable=True, - enum={"1.0": "1.0", "1.1": "1.1", "1.2": "1.2"}, + enum={"1.0": "1.0", "1.1": "1.1", "1.2": "1.2", "1.3": "1.3"}, + ) + _args_schema.platform_capabilities = AAZObjectArg( + options=["--platform-capabilities"], + arg_group="Properties", + nullable=True, ) _args_schema.private_endpoint_connections = AAZListArg( options=["--endpoint-connections", "--private-endpoint-connections"], @@ -261,6 +270,20 @@ def _build_arguments_schema(cls, *args, **kwargs): nullable=True, ) + platform_capabilities = cls._args_schema.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectArg( + options=["confidential-compute"], + nullable=True, + ) + + confidential_compute = cls._args_schema.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrArg( + options=["mode"], + help="Setting to Enable or Disable Confidential Compute", + nullable=True, + enum={"Disabled": "Disabled", "Enabled": "Enabled"}, + ) + private_endpoint_connections = cls._args_schema.private_endpoint_connections private_endpoint_connections.Element = AAZObjectArg( nullable=True, @@ -409,7 +432,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -508,7 +531,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -566,7 +589,7 @@ def _update_instance(self, instance): value=instance, typ=AAZObjectType ) - _builder.set_prop("identity", AAZObjectType, ".identity") + _builder.set_prop("identity", AAZIdentityObjectType, ".identity") _builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}}) _builder.set_prop("sku", AAZObjectType) _builder.set_prop("tags", AAZDictType, ".tags") @@ -587,10 +610,12 @@ def _update_instance(self, instance): properties.set_prop("disableLocalAuth", AAZBoolType, ".disable_local_auth") properties.set_prop("encryption", AAZObjectType, ".encryption") properties.set_prop("geoDataReplication", AAZObjectType) + properties.set_prop("ipAddressType", AAZStrType, ".ip_address_type") properties.set_prop("isAutoInflateEnabled", AAZBoolType, ".enable_auto_inflate") properties.set_prop("kafkaEnabled", AAZBoolType, ".kafka_enabled") properties.set_prop("maximumThroughputUnits", AAZIntType, ".maximum_throughput_units") properties.set_prop("minimumTlsVersion", AAZStrType, ".minimum_tls_version") + properties.set_prop("platformCapabilities", AAZObjectType, ".platform_capabilities") properties.set_prop("privateEndpointConnections", AAZListType, ".private_endpoint_connections") properties.set_prop("publicNetworkAccess", AAZStrType, ".public_network_access") properties.set_prop("zoneRedundant", AAZBoolType, ".zone_redundant") @@ -631,6 +656,14 @@ def _update_instance(self, instance): _elements.set_prop("locationName", AAZStrType, ".location_name") _elements.set_prop("roleType", AAZStrType, ".role_type") + platform_capabilities = _builder.get(".properties.platformCapabilities") + if platform_capabilities is not None: + platform_capabilities.set_prop("confidentialCompute", AAZObjectType, ".confidential_compute") + + confidential_compute = _builder.get(".properties.platformCapabilities.confidentialCompute") + if confidential_compute is not None: + confidential_compute.set_prop("mode", AAZStrType, ".mode") + private_endpoint_connections = _builder.get(".properties.privateEndpointConnections") if private_endpoint_connections is not None: private_endpoint_connections.set_elements(AAZObjectType, ".") @@ -700,7 +733,7 @@ def _build_schema_eh_namespace_read(cls, _schema): eh_namespace_read.id = AAZStrType( flags={"read_only": True}, ) - eh_namespace_read.identity = AAZObjectType() + eh_namespace_read.identity = AAZIdentityObjectType() eh_namespace_read.location = AAZStrType() eh_namespace_read.name = AAZStrType( flags={"read_only": True}, @@ -764,6 +797,9 @@ def _build_schema_eh_namespace_read(cls, _schema): properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -780,6 +816,9 @@ def _build_schema_eh_namespace_read(cls, _schema): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -860,6 +899,14 @@ def _build_schema_eh_namespace_read(cls, _schema): serialized_name="roleType", ) + platform_capabilities = _schema_eh_namespace_read.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = _schema_eh_namespace_read.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = _schema_eh_namespace_read.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_wait.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_wait.py index ba0ff761236..b5c1a1898f3 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_wait.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/_wait.py @@ -20,7 +20,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2024-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}", "2026-01-01"], ] } @@ -46,7 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -121,7 +121,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2024-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -157,9 +157,7 @@ def _build_schema_on_200(cls): _schema_on_200.id = AAZStrType( flags={"read_only": True}, ) - _schema_on_200.identity = AAZObjectType( - flags={"client_flatten": True}, - ) + _schema_on_200.identity = AAZIdentityObjectType() _schema_on_200.location = AAZStrType() _schema_on_200.name = AAZStrType( flags={"read_only": True}, @@ -219,12 +217,13 @@ def _build_schema_on_200(cls): properties.disable_local_auth = AAZBoolType( serialized_name="disableLocalAuth", ) - properties.encryption = AAZObjectType( - flags={"client_flatten": True}, - ) + properties.encryption = AAZObjectType() properties.geo_data_replication = AAZObjectType( serialized_name="geoDataReplication", ) + properties.ip_address_type = AAZStrType( + serialized_name="ipAddressType", + ) properties.is_auto_inflate_enabled = AAZBoolType( serialized_name="isAutoInflateEnabled", ) @@ -241,6 +240,9 @@ def _build_schema_on_200(cls): properties.minimum_tls_version = AAZStrType( serialized_name="minimumTlsVersion", ) + properties.platform_capabilities = AAZObjectType( + serialized_name="platformCapabilities", + ) properties.private_endpoint_connections = AAZListType( serialized_name="privateEndpointConnections", ) @@ -281,9 +283,7 @@ def _build_schema_on_200(cls): key_vault_properties.Element = AAZObjectType() _element = cls._schema_on_200.properties.encryption.key_vault_properties.Element - _element.identity = AAZObjectType( - flags={"client_flatten": True}, - ) + _element.identity = AAZObjectType() _element.key_name = AAZStrType( serialized_name="keyName", ) @@ -323,6 +323,14 @@ def _build_schema_on_200(cls): serialized_name="roleType", ) + platform_capabilities = cls._schema_on_200.properties.platform_capabilities + platform_capabilities.confidential_compute = AAZObjectType( + serialized_name="confidentialCompute", + ) + + confidential_compute = cls._schema_on_200.properties.platform_capabilities.confidential_compute + confidential_compute.mode = AAZStrType() + private_endpoint_connections = cls._schema_on_200.properties.private_endpoint_connections private_endpoint_connections.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_create.py index d7931ec241c..3403232a48d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2026-01-01"], ] } @@ -55,6 +55,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -178,7 +179,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_delete.py index 8e4dff51cd5..8cbd7d194bb 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_delete.py @@ -19,9 +19,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -133,7 +134,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_list.py index 018c089774c..c06f3cd870d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -122,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -157,9 +158,10 @@ def _build_schema_on_200(cls): _schema_on_200 = cls._schema_on_200 _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", - flags={"read_only": True}, ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_show.py index 2fda8130b10..6f392c18bfd 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2026-01-01"], ] } @@ -57,6 +57,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_update.py index 72e8f0851ec..bc18ef28ffb 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/application_group/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/applicationgroups/{}", "2026-01-01"], ] } @@ -59,6 +59,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -191,7 +192,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -278,7 +279,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/__cmd_group.py index a983370796a..0bac0a0a3de 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace authorization-rule", ) class __CMDGroup(AAZCommandGroup): - """eventhub namespace authorization-rule + """Eventhub namespace authorization-rule. """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_create.py index 41491488080..00c30823117 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_create.py @@ -16,15 +16,12 @@ ) class Create(AAZCommand): """Create an AuthorizationRule for a Namespace. - - :example: Creates Authorizationrule - az eventhubs namespace authorization-rule create --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule --rights Send Listen """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -57,6 +54,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -149,7 +147,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_delete.py index bf233860de1..6e0e700cc68 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_delete.py @@ -16,15 +16,12 @@ ) class Delete(AAZCommand): """Delete an AuthorizationRule for a Namespace. - - :example: Deletes the Authorizationrule of the namespace - az eventhubs namespace authorization-rule delete --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -59,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +133,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_list.py index 1fc681eefa9..5b949e66915 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_list.py @@ -16,15 +16,12 @@ ) class List(AAZCommand): """List a list of authorization rules for a Namespace. - - :example: Shows the list of Authorizationrule by Namespace - az eventhubs namespace authorization-rule list --resource-group myresourcegroup --namespace-name mynamespace """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules", "2026-01-01"], ] } @@ -50,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -125,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -161,7 +159,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_show.py index cb9242b8d27..f462fcfb79c 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_show.py @@ -16,15 +16,12 @@ ) class Show(AAZCommand): """Get an AuthorizationRule for a Namespace by rule name. - - :example: Shows the details of Authorizationrule - az eventhubs namespace authorization-rule update --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule --rights Send """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -59,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -137,7 +135,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_update.py index 200186fd097..d8ad202693c 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/_update.py @@ -16,15 +16,12 @@ ) class Update(AAZCommand): """Update an AuthorizationRule for a Namespace. - - :example: Updates Authorizationrule - az eventhubs namespace authorization-rule update --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule --rights Send """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}", "2026-01-01"], ] } @@ -61,6 +58,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -167,7 +165,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -254,7 +252,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_list.py index 21aba782a68..644702f9e9e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_list.py @@ -16,15 +16,12 @@ ) class List(AAZCommand): """Gets the primary and secondary connection strings for the Namespace. - - :example: Shows the connection strings of Authorizationrule for the namespace. - az eventhubs namespace authorization-rule keys list --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}/listkeys", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}/listkeys", "2026-01-01"], ] } @@ -57,6 +54,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +133,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_renew.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_renew.py index 43638093c4c..f151b3280c3 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_renew.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/authorization_rule/keys/_renew.py @@ -16,15 +16,12 @@ ) class Renew(AAZCommand): """Regenerates the primary or secondary connection strings for the specified Namespace. - - :example: Regenerate the connection strings of Authorizationrule for the namespace. - az eventhubs namespace authorization-rule keys renew --resource-group myresourcegroup --namespace-name mynamespace --name myauthorule --key PrimaryKey """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}/regeneratekeys", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/authorizationrules/{}/regeneratekeys", "2026-01-01"], ] } @@ -59,6 +56,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -153,7 +151,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_create.py index 8626047be0a..5257a0df0ae 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2026-01-01"], ] } @@ -46,6 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -179,7 +180,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_list.py index 881fa8b2559..d6a33d2d0d6 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -122,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -158,7 +159,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_show.py index 4fddf108794..6d574acde9c 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -121,7 +122,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_update.py index 7d91ba60b95..45ca8abb972 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/network_rule_set/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networkrulesets/default", "2026-01-01"], ] } @@ -49,6 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -207,7 +208,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -290,7 +291,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/__cmd_group.py index 81cac63acbd..3364244e83f 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace nsp-configuration", ) class __CMDGroup(AAZCommandGroup): - """Manage Network Security Perimeter Configuration + """Manage Nsp Configurations """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_list.py index 2ae27dad7de..9283681f6ce 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_list.py @@ -15,13 +15,13 @@ "eventhubs namespace nsp-configuration list", ) class List(AAZCommand): - """List of current NetworkSecurityPerimeterConfiguration for Namespace + """List list of current NetworkSecurityPerimeterConfiguration for Namespace """ _aaz_info = { - "version": "2025-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networksecurityperimeterconfigurations", "2025-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networksecurityperimeterconfigurations", "2026-01-01"], ] } @@ -46,7 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -121,7 +121,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -159,9 +159,7 @@ def _build_schema_on_200(cls): ) value = cls._schema_on_200.value - value.Element = AAZObjectType( - flags={"read_only": True}, - ) + value.Element = AAZObjectType() _element = cls._schema_on_200.value.Element _element.id = AAZStrType( @@ -174,7 +172,11 @@ def _build_schema_on_200(cls): flags={"read_only": True}, ) _element.properties = AAZObjectType( - flags={"client_flatten": True, "read_only": True}, + flags={"client_flatten": True}, + ) + _element.system_data = AAZObjectType( + serialized_name="systemData", + flags={"read_only": True}, ) _element.type = AAZStrType( flags={"read_only": True}, @@ -203,6 +205,7 @@ def _build_schema_on_200(cls): ) properties.provisioning_issues = AAZListType( serialized_name="provisioningIssues", + flags={"read_only": True}, ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", @@ -229,9 +232,7 @@ def _build_schema_on_200(cls): profile.name = AAZStrType() access_rules = cls._schema_on_200.value.Element.properties.profile.access_rules - access_rules.Element = AAZObjectType( - flags={"read_only": True}, - ) + access_rules.Element = AAZObjectType() _element = cls._schema_on_200.value.Element.properties.profile.access_rules.Element _element.id = AAZStrType() @@ -263,23 +264,17 @@ def _build_schema_on_200(cls): fully_qualified_domain_names.Element = AAZStrType() network_security_perimeters = cls._schema_on_200.value.Element.properties.profile.access_rules.Element.properties.network_security_perimeters - network_security_perimeters.Element = AAZObjectType( - flags={"read_only": True}, - ) + network_security_perimeters.Element = AAZObjectType() _ListHelper._build_schema_network_security_perimeter_read(network_security_perimeters.Element) subscriptions = cls._schema_on_200.value.Element.properties.profile.access_rules.Element.properties.subscriptions - subscriptions.Element = AAZObjectType( - flags={"read_only": True}, - ) + subscriptions.Element = AAZObjectType() _element = cls._schema_on_200.value.Element.properties.profile.access_rules.Element.properties.subscriptions.Element _element.id = AAZStrType() provisioning_issues = cls._schema_on_200.value.Element.properties.provisioning_issues - provisioning_issues.Element = AAZObjectType( - flags={"read_only": True}, - ) + provisioning_issues.Element = AAZObjectType() _element = cls._schema_on_200.value.Element.properties.provisioning_issues.Element _element.name = AAZStrType() @@ -299,6 +294,26 @@ def _build_schema_on_200(cls): ) resource_association.name = AAZStrType() + system_data = cls._schema_on_200.value.Element.system_data + system_data.created_at = AAZStrType( + serialized_name="createdAt", + ) + system_data.created_by = AAZStrType( + serialized_name="createdBy", + ) + system_data.created_by_type = AAZStrType( + serialized_name="createdByType", + ) + system_data.last_modified_at = AAZStrType( + serialized_name="lastModifiedAt", + ) + system_data.last_modified_by = AAZStrType( + serialized_name="lastModifiedBy", + ) + system_data.last_modified_by_type = AAZStrType( + serialized_name="lastModifiedByType", + ) + return cls._schema_on_200 diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_show.py index ea5b90ca0d0..3473eae72c4 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/nsp_configuration/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2025-05-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networksecurityperimeterconfigurations/{}", "2025-05-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/networksecurityperimeterconfigurations/{}", "2026-01-01"], ] } @@ -47,7 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( - pattern="^[a-zA-Z][a-zA-Z0-9-]{4,48}[a-zA-Z0-9]$", + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -132,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-05-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -162,9 +162,7 @@ def _build_schema_on_200(cls): if cls._schema_on_200 is not None: return cls._schema_on_200 - cls._schema_on_200 = AAZObjectType( - flags={"read_only": True}, - ) + cls._schema_on_200 = AAZObjectType() _schema_on_200 = cls._schema_on_200 _schema_on_200.id = AAZStrType( @@ -177,7 +175,11 @@ def _build_schema_on_200(cls): flags={"read_only": True}, ) _schema_on_200.properties = AAZObjectType( - flags={"client_flatten": True, "read_only": True}, + flags={"client_flatten": True}, + ) + _schema_on_200.system_data = AAZObjectType( + serialized_name="systemData", + flags={"read_only": True}, ) _schema_on_200.type = AAZStrType( flags={"read_only": True}, @@ -206,6 +208,7 @@ def _build_schema_on_200(cls): ) properties.provisioning_issues = AAZListType( serialized_name="provisioningIssues", + flags={"read_only": True}, ) properties.provisioning_state = AAZStrType( serialized_name="provisioningState", @@ -232,9 +235,7 @@ def _build_schema_on_200(cls): profile.name = AAZStrType() access_rules = cls._schema_on_200.properties.profile.access_rules - access_rules.Element = AAZObjectType( - flags={"read_only": True}, - ) + access_rules.Element = AAZObjectType() _element = cls._schema_on_200.properties.profile.access_rules.Element _element.id = AAZStrType() @@ -266,23 +267,17 @@ def _build_schema_on_200(cls): fully_qualified_domain_names.Element = AAZStrType() network_security_perimeters = cls._schema_on_200.properties.profile.access_rules.Element.properties.network_security_perimeters - network_security_perimeters.Element = AAZObjectType( - flags={"read_only": True}, - ) + network_security_perimeters.Element = AAZObjectType() _ShowHelper._build_schema_network_security_perimeter_read(network_security_perimeters.Element) subscriptions = cls._schema_on_200.properties.profile.access_rules.Element.properties.subscriptions - subscriptions.Element = AAZObjectType( - flags={"read_only": True}, - ) + subscriptions.Element = AAZObjectType() _element = cls._schema_on_200.properties.profile.access_rules.Element.properties.subscriptions.Element _element.id = AAZStrType() provisioning_issues = cls._schema_on_200.properties.provisioning_issues - provisioning_issues.Element = AAZObjectType( - flags={"read_only": True}, - ) + provisioning_issues.Element = AAZObjectType() _element = cls._schema_on_200.properties.provisioning_issues.Element _element.name = AAZStrType() @@ -302,6 +297,26 @@ def _build_schema_on_200(cls): ) resource_association.name = AAZStrType() + system_data = cls._schema_on_200.system_data + system_data.created_at = AAZStrType( + serialized_name="createdAt", + ) + system_data.created_by = AAZStrType( + serialized_name="createdBy", + ) + system_data.created_by_type = AAZStrType( + serialized_name="createdByType", + ) + system_data.last_modified_at = AAZStrType( + serialized_name="lastModifiedAt", + ) + system_data.last_modified_by = AAZStrType( + serialized_name="lastModifiedBy", + ) + system_data.last_modified_by_type = AAZStrType( + serialized_name="lastModifiedByType", + ) + return cls._schema_on_200 diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_create.py index 4d005c9bf3c..766b1806aeb 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2026-01-01"], ] } @@ -46,6 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -156,7 +157,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_delete.py index 382031a07d2..ede676a6aed 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_delete.py @@ -20,9 +20,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2026-01-01"], ] } @@ -49,6 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -154,7 +155,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_list.py index 0cb802e1307..05d7054b623 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -122,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -158,7 +159,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_show.py index cb4b161eb24..3b19288ea25 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -131,7 +132,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_update.py index ff070f2a2ad..cdbcafd0b88 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2026-01-01"], ] } @@ -49,6 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -174,7 +175,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -263,7 +264,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_wait.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_wait.py index 3728c445124..e9a83c8d14d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_wait.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_endpoint_connection/_wait.py @@ -20,7 +20,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privateendpointconnections/{}", "2026-01-01"], ] } @@ -46,6 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -130,7 +131,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_link_resource/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_link_resource/_show.py index 20b550c1849..39cc5ea5545 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_link_resource/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/private_link_resource/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privatelinkresources", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/privatelinkresources", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -122,7 +123,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -158,7 +159,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_create.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_create.py index ab404f34723..c0aadc90397 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_create.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_create.py @@ -19,9 +19,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2026-01-01"], ] } @@ -46,6 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -74,14 +75,12 @@ def _build_arguments_schema(cls, *args, **kwargs): _args_schema.schema_compatibility = AAZStrArg( options=["--schema-compatibility"], arg_group="Properties", - help="Compatibility of Schema.", enum={"Backward": "Backward", "Forward": "Forward", "None": "None"}, ) _args_schema.schema_type = AAZStrArg( options=["--schema-type"], arg_group="Properties", - help="Type of Schema.", - enum={"Avro": "Avro", "Unknown": "Unknown"}, + enum={"Avro": "Avro", "Json": "Json", "ProtoBuf": "ProtoBuf", "Unknown": "Unknown"}, ) group_properties = cls._args_schema.group_properties @@ -157,7 +156,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_delete.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_delete.py index 34a6c109bf6..ca0ee591746 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_delete.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_delete.py @@ -19,9 +19,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -133,7 +134,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_list.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_list.py index 29238ce9ea5..65ccf14f60d 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_list.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_list.py @@ -19,9 +19,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The Namespace name", required=True, fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -144,7 +145,7 @@ def query_parameters(self): "$top", self.ctx.args.top, ), **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -180,7 +181,9 @@ def _build_schema_on_200(cls): _schema_on_200.next_link = AAZStrType( serialized_name="nextLink", ) - _schema_on_200.value = AAZListType() + _schema_on_200.value = AAZListType( + flags={"required": True}, + ) value = cls._schema_on_200.value value.Element = AAZObjectType() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_show.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_show.py index 0f23edc6fa6..4cc95dde07f 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_show.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_show.py @@ -19,9 +19,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2026-01-01"], ] } @@ -47,6 +47,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -135,7 +136,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_update.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_update.py index 96367714c3b..7a982dc1bee 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_update.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/latest/eventhubs/namespace/schema_registry/_update.py @@ -19,9 +19,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2023-01-01-preview", + "version": "2026-01-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2023-01-01-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.eventhub/namespaces/{}/schemagroups/{}", "2026-01-01"], ] } @@ -49,6 +49,7 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, id_part="name", fmt=AAZStrArgFormat( + pattern="^[a-zA-Z][a-zA-Z0-9-]{6,50}[a-zA-Z0-9]$", max_length=50, min_length=6, ), @@ -79,16 +80,14 @@ def _build_arguments_schema(cls, *args, **kwargs): _args_schema.schema_compatibility = AAZStrArg( options=["--schema-compatibility"], arg_group="Properties", - help="Compatibility of Schema.", nullable=True, enum={"Backward": "Backward", "Forward": "Forward", "None": "None"}, ) _args_schema.schema_type = AAZStrArg( options=["--schema-type"], arg_group="Properties", - help="Type of Schema.", nullable=True, - enum={"Avro": "Avro", "Unknown": "Unknown"}, + enum={"Avro": "Avro", "Json": "Json", "ProtoBuf": "ProtoBuf", "Unknown": "Unknown"}, ) group_properties = cls._args_schema.group_properties @@ -179,7 +178,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } @@ -266,7 +265,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2023-01-01-preview", + "api-version", "2026-01-01", required=True, ), } diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/__cmd_group.py index 8c076d339c2..68949c75910 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs", ) class __CMDGroup(AAZCommandGroup): - """eventhub + """Manage Event Hub """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/__cmd_group.py index eae340b41c4..9a1b8d70468 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs eventhub authorization-rule", ) class __CMDGroup(AAZCommandGroup): - """Manage Azure Service Bus Authorizationrule for Eventhub. + """Eventhub authorization rule. """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/keys/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/keys/__cmd_group.py index bfe403d61fa..2810e97e655 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/keys/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/eventhub/authorization_rule/keys/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs eventhub authorization-rule keys", ) class __CMDGroup(AAZCommandGroup): - """Manage Azure EventHubs Authorizationrule connection strings for Namespace. + """authorization-rule keys """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/__cmd_group.py index ed40beeeca0..5c3b81a8cc4 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace", ) class __CMDGroup(AAZCommandGroup): - """eventhub namespace + """Manage Namespace """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/__cmd_group.py index b5abdbe59a1..0bac0a0a3de 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace authorization-rule", ) class __CMDGroup(AAZCommandGroup): - """Manage Azure EventHubs Authorizationrule for Namespace. + """Eventhub namespace authorization-rule. """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/keys/__cmd_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/keys/__cmd_group.py index bfa0bc75b22..799013f401f 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/keys/__cmd_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/aaz/profile_2019_03_01_hybrid/eventhubs/namespace/authorization_rule/keys/__cmd_group.py @@ -15,7 +15,7 @@ "eventhubs namespace authorization-rule keys", ) class __CMDGroup(AAZCommandGroup): - """Manage Azure EventHubs Authorizationrule connection strings for Namespace. + """authorization-rule keys """ pass diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/action.py b/src/azure-cli/azure/cli/command_modules/eventhubs/action.py index 6cf679b0796..0539754d469 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/action.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/action.py @@ -201,6 +201,6 @@ def get_action(self, values, option_string): # pylint: disable=no-self-use raise CLIError('location-name and role-type are mandatory properties') if "cluster_arm_id" not in LocationObject: - LocationObject["cluster_arm_id"] = '' + LocationObject["cluster_arm_id"] = None return LocationObject diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/operations/namespace_custom.py b/src/azure-cli/azure/cli/command_modules/eventhubs/operations/namespace_custom.py index d6b695f72a7..3aad9a87ec0 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/operations/namespace_custom.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/operations/namespace_custom.py @@ -13,7 +13,11 @@ def create_keyvault_object(col): vault_object = {} - if 'userAssignedIdentity' in col: + # Handle nested identity structure in API 2026-01-01 + if 'identity' in col and col['identity'] and 'userAssignedIdentity' in col['identity']: + vault_object['user_assigned_identity'] = col['identity']['userAssignedIdentity'] + # Fallback for direct userAssignedIdentity (older API versions or command input) + elif 'userAssignedIdentity' in col: vault_object['user_assigned_identity'] = col['userAssignedIdentity'] vault_object.update({ @@ -43,7 +47,8 @@ def create_eventhub_namespace(cmd, resource_group_name, namespace_name, location maximum_throughput_units=None, require_infrastructure_encryption=None, is_kafka_enabled=None, is_auto_inflate_enabled=None, alternate_name=None, public_network_access=None, cluster_arm_id=None, max_replication_lag_duration_in_seconds=None, - geo_data_replication_config=None): + geo_data_replication_config=None, + ip_address_type=None): from azure.cli.command_modules.eventhubs.aaz.latest.eventhubs.namespace import Create user_assigned_identity = {} @@ -68,7 +73,8 @@ def create_eventhub_namespace(cmd, resource_group_name, namespace_name, location "disable_local_auth": disable_local_auth, "alternate_name": alternate_name, "public_network_access": public_network_access, - "cluster_arm_id": cluster_arm_id + "cluster_arm_id": cluster_arm_id, + "ip_address_type": ip_address_type } if mi_system_assigned: diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_cluster_commands.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_cluster_commands.py index c790a460b57..67169474f44 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_cluster_commands.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_cluster_commands.py @@ -35,7 +35,7 @@ def test_eh_cluster(self): # Create Cluster # Created test-migration resource group for cluster cmdlets to monitor the cluster to save the cost. # Same resource group can be used to rerun the test or you can change the resource-group by replacing test-migration. - self.cmd('eventhubs cluster create --resource-group test-migration --name {clustername} --location eastus --tags {tags}', + self.cmd('eventhubs cluster create --resource-group test-migration --name {clustername} --location westus --tags {tags}', checks=[self.check('name', self.kwargs['clustername'])]) # Get Cluster @@ -45,7 +45,7 @@ def test_eh_cluster(self): self.kwargs.update({'clusterid': getresponse['id']}) # Create Namespace in cluster - self.cmd('eventhubs namespace create --resource-group test-migration --name {namespacename} --location eastus --tags {tags} --sku {sku} --cluster-arm-id {clusterid}') + self.cmd('eventhubs namespace create --resource-group test-migration --name {namespacename} --location westus --tags {tags} --sku {sku} --cluster-arm-id {clusterid}') # Get namespaces created in the cluster listnsclusterresult = self.cmd('eventhubs cluster namespace list --resource-group test-migration --name {clustername}').output @@ -66,7 +66,7 @@ def test_eh_cluster(self): @AllowLargeResponse() def test_eh_self_serve_cluster(self): self.kwargs.update({ - 'loc': 'eastus', + 'loc': 'westus', 'rg': self.create_random_name(prefix='rg-cluster-', length=20), 'clustername': self.create_random_name(prefix='eventhubs-selfserve-', length=24), 'namespacename': self.create_random_name(prefix='eventhubs-ns1-', length=20), @@ -115,4 +115,4 @@ def test_eh_self_serve_cluster(self): # Delete cluster # commented as the cluster can be deleted only after 4 hours - self.cmd('eventhubs cluster delete --resource-group test-migration --name {clustername} --yes') + # self.cmd('eventhubs cluster delete --resource-group test-migration --name {clustername} --yes') diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_alias_test.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_alias_test.py index 883efb4ce97..edaaaa48a5e 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_alias_test.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_alias_test.py @@ -20,8 +20,8 @@ class EHgeorecoveryCURDScenarioTest(ScenarioTest): def test_eh_alias(self, resource_group): from azure.mgmt.eventhub.models import ProvisioningStateDR self.kwargs.update({ - 'loc_south': 'SouthCentralUS', - 'loc_north': 'NorthCentralUS', + 'loc_south': 'eastus', + 'loc_north': 'eastus', 'rg': resource_group, 'namespacenameprimary': self.create_random_name(prefix='eh-nscli', length=20), 'namespacenamesecondary': self.create_random_name(prefix='eh-nscli', length=20), @@ -112,6 +112,8 @@ def test_eh_alias(self, resource_group): time.sleep(30) getaliasafterbreak = self.cmd('eventhubs georecovery-alias show --resource-group {rg} --namespace-name {namespacenameprimary} --alias {aliasname}').get_output_in_json() + time.sleep(600) + # Create alias secondary_alias = self.cmd('eventhubs georecovery-alias set --resource-group {rg} --namespace-name {namespacenameprimary} --alias {aliasname} --partner-namespace {id}').get_output_in_json() self.assertEqual(secondary_alias["role"], "Primary") @@ -144,7 +146,7 @@ def test_eh_alias(self, resource_group): # Delete Alias self.cmd('eventhubs georecovery-alias delete --resource-group {rg} --namespace-name {namespacenamesecondary} --alias {aliasname}') - time.sleep(30) + time.sleep(300) # create alias using georecovery-alias create command diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_auth_rule_test.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_auth_rule_test.py index e23067d1d43..009b561de63 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_auth_rule_test.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_auth_rule_test.py @@ -21,7 +21,7 @@ class EHNamespaceAUTHRULECURDScenarioTest(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eh_authorization_rule(self, resource_group): self.kwargs.update({ - 'loc': 'southcentralus', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'eventhub1': self.create_random_name(prefix='eventhubnm', length=18), diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_encryption_test.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_encryption_test.py index 84711342b07..65bfb1460c1 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_encryption_test.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_encryption_test.py @@ -21,7 +21,7 @@ class EHNamespaceMSITesting(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eh_namespace_encryption(self, resource_group): self.kwargs.update({ - 'loc': 'northeurope', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'namespacename1': self.create_random_name(prefix='eventhubs-nscli', length=20), @@ -97,6 +97,12 @@ def test_eh_namespace_encryption(self, resource_group): assert len(n) == 3 self.assertEqual(False, namespace['encryption']['requireInfrastructureEncryption']) + # Grant KeyVault permissions to the system-assigned identity + system_assigned_principal_id = namespace['identity']['principalId'] + self.kwargs.update({'system_principal_id': system_assigned_principal_id}) + self.cmd( + 'keyvault set-policy -n {kv_name} -g {rg} --object-id {system_principal_id} --key-permissions all --secret-permission all') + namespace = self.cmd('eventhubs namespace encryption remove --resource-group {rg} --namespace-name {namespacename}' + ' --encryption-config key-name={key1} key-vault-uri={key_uri} user-assigned-identity={id1}').get_output_in_json() @@ -155,6 +161,12 @@ def test_eh_namespace_encryption(self, resource_group): assert len(n) == 3 self.assertEqual(True, namespace['encryption']['requireInfrastructureEncryption']) + # Grant KeyVault permissions to the system-assigned identity for namespacename2 + system_assigned_principal_id2 = namespace['identity']['principalId'] + self.kwargs.update({'system_principal_id2': system_assigned_principal_id2}) + self.cmd( + 'keyvault set-policy -n {kv_name} -g {rg} --object-id {system_principal_id2} --key-permissions all --secret-permission all') + namespace = self.cmd( 'eventhubs namespace encryption remove --resource-group {rg} --namespace-name {namespacename2}' + ' --encryption-config key-name={key1} key-vault-uri={key_uri} user-assigned-identity={id1}').get_output_in_json() @@ -185,6 +197,12 @@ def test_eh_namespace_encryption(self, resource_group): n = [i for i in namespace['identity']['userAssignedIdentities']] assert len(n) == 2 + # Grant KeyVault permissions to the system-assigned identity for namespacename3 + system_assigned_principal_id3 = namespace['identity']['principalId'] + self.kwargs.update({'system_principal_id3': system_assigned_principal_id3}) + self.cmd( + 'keyvault set-policy -n {kv_name} -g {rg} --object-id {system_principal_id3} --key-permissions all --secret-permission all') + namespace = self.cmd( 'eventhubs namespace encryption add --resource-group {rg} --namespace-name {namespacename3}' + ' --encryption-config key-name={key1} key-vault-uri={key_uri} user-assigned-identity={id1} --infra-encryption').get_output_in_json() diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_msi_test.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_msi_test.py index 3e363be8f94..050fa6c56f2 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_msi_test.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_msi_test.py @@ -21,7 +21,7 @@ class EHNamespaceMSITesting(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eh_namespace_msi(self, resource_group): self.kwargs.update({ - 'loc': 'northeurope', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'namespacename1': self.create_random_name(prefix='eventhubs-nscli', length=20), diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_namespace_premium_test.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_namespace_premium_test.py index 2371b7357ec..49343912861 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_namespace_premium_test.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_commands_namespace_premium_test.py @@ -28,10 +28,8 @@ def test_eh_namespace_premium_standard(self, resource_group): 'namespacename2': self.create_random_name(prefix='eventhubs-nscli', length=20), 'namespacename3': self.create_random_name(prefix='eventhubs-nscli', length=20), 'loc1': 'East US', - 'loc2': 'AustraliaEast', - 'loc3': 'TaiwanNorth', - 'clusterid': '/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/test-migration21/providers/Microsoft.EventHub/clusters/cluster91', - 'clusterid2': '/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/AutomatedPowershellTesting/providers/Microsoft.EventHub/clusters/TestClusterAutomatic' + 'loc2': 'westus', + 'loc3': 'eastus' }) # Check for the NameSpace name Availability @@ -41,12 +39,12 @@ def test_eh_namespace_premium_standard(self, resource_group): namespace = self.cmd('eventhubs namespace create --name {namespacename} --resource-group {rg} ' '--capacity 10 --maximum-throughput-units 18 --sku Standard --location {loc} ' '--zone-redundant --tags k1=v1 k2=v2 --enable-auto-inflate --disable-local-auth ' - '--enable-kafka --minimum-tls-version 1.1').get_output_in_json() + '--enable-kafka --minimum-tls-version 1.2').get_output_in_json() self.assertEqual(10, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(18, namespace['maximumThroughputUnits']) - self.assertEqual('1.1', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertTrue(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -61,7 +59,7 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertEqual(10, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(0, namespace['maximumThroughputUnits']) - self.assertEqual('1.1', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertFalse(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -75,7 +73,7 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertEqual(10, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(18, namespace['maximumThroughputUnits']) - self.assertEqual('1.1', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertTrue(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -90,7 +88,7 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertEqual(12, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(18, namespace['maximumThroughputUnits']) - self.assertEqual('1.1', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertTrue(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -105,7 +103,7 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertEqual(12, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(25, namespace['maximumThroughputUnits']) - self.assertEqual('1.1', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertTrue(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -115,12 +113,12 @@ def test_eh_namespace_premium_standard(self, resource_group): # Update Minimum tls version namespace = self.cmd('eventhubs namespace update --name {namespacename} --resource-group {rg} ' - '--minimum-tls-version 1.0').get_output_in_json() + '--minimum-tls-version 1.2').get_output_in_json() self.assertEqual(12, namespace['sku']['capacity']) self.assertEqual('Standard', namespace['sku']['name']) self.assertEqual(25, namespace['maximumThroughputUnits']) - self.assertEqual('1.0', namespace['minimumTlsVersion']) + self.assertEqual('1.2', namespace['minimumTlsVersion']) self.assertEqual(self.kwargs['loc1'].strip().replace(' ', '').lower(), namespace['location'].strip().replace(' ', '').lower()) self.assertTrue(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) @@ -183,7 +181,7 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertFalse(namespace['isAutoInflateEnabled']) self.assertTrue(namespace['kafkaEnabled']) self.assertFalse(namespace['disableLocalAuth']) - self.assertFalse(namespace['zoneRedundant']) + self.assertTrue(namespace['zoneRedundant']) self.assertEqual(0, len(namespace['tags'])) # Create premium namespace @@ -201,13 +199,13 @@ def test_eh_namespace_premium_standard(self, resource_group): self.assertTrue(namespace['zoneRedundant']) self.assertEqual(0, len(namespace['tags'])) + # create a namespace with geo-replication enable namespace = self.cmd('eventhubs namespace create --resource-group {rg} --name {namespacename3} ' - '--location {loc3} --sku Standard --geo-data-replication-config cluster-arm-id={clusterid} role-type=Primary location-name={loc3} ' - '--cluster-arm-id {clusterid}').get_output_in_json() + '--location {loc3} --sku Premium --geo-data-replication-config role-type=Primary location-name={loc3} ').get_output_in_json() namespace = self.cmd('eventhubs namespace replica add --resource-group {rg} --name {namespacename3} ' - '--geo-data-replication-config cluster-arm-id={clusterid2} role-type=Secondary location-name={loc2} ').get_output_in_json() + '--geo-data-replication-config role-type=Secondary location-name={loc2} ').get_output_in_json() self.assertEqual(2, len(namespace['geoDataReplication']['locations'])) @@ -221,10 +219,10 @@ def test_eh_namespace_premium_standard(self, resource_group): namespace = self.cmd('eventhubs namespace failover --name {namespacename3} --resource-group {rg} ' '--primary-location {loc2} ').get_output_in_json() - #az eventhubs namespace failover --name namespace51 -g test-migration21 --primary-location australiaeast --debug + #az eventhubs namespace failover --name namespace51 -g test-migration21 --primary-location westus --debug '''namespace = self.cmd('eventhubs namespace replica remove --resource-group {rg} --name {namespacename3} ' - '--geo-data-replication-config cluster-arm-id={clusterid2} role-type=Secondary location-name={loc2} ').get_output_in_json()''' + '--geo-data-replication-config role-type=Secondary location-name={loc2} ').get_output_in_json()''' # List Namespace within ResourceGroup self.cmd('eventhubs namespace list --resource-group {rg}') @@ -235,4 +233,4 @@ def test_eh_namespace_premium_standard(self, resource_group): # Delete Namespace list by ResourceGroup self.cmd('eventhubs namespace delete --resource-group {rg} --name {namespacename}') self.cmd('eventhubs namespace delete --resource-group {rg} --name {namespacename1}') - self.cmd('eventhubs namespace delete --resource-group {rg} --name {namespacename1}') + self.cmd('eventhubs namespace delete --resource-group {rg} --name {namespacename3}') diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_entity_crud.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_entity_crud.py index c72f33d1b85..e0e4efcfd3f 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_entity_crud.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_entity_crud.py @@ -21,7 +21,7 @@ class EHNamespaceEntityCURDScenarioTest(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eh_create_update(self, resource_group): self.kwargs.update({ - 'loc': 'westus2', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'namespacename1': self.create_random_name(prefix='eventhubs-nscli', length=20), @@ -152,6 +152,9 @@ def test_eh_create_update(self, resource_group): self.kwargs.update({'id2': identity2['id']}) self.kwargs.update({'id3': identity2['principalId']}) + # Wait for identity to propagate to Microsoft Graph + time.sleep(120) + storage_account2 = self.cmd( 'storage account create -n {storageaccount2} -g {rg} -l westus --sku Standard_RAGRS ').get_output_in_json() @@ -160,8 +163,12 @@ def test_eh_create_update(self, resource_group): container = self.cmd( 'storage container create -n {containername2} -g {rg} --account-name {storageaccount2}').get_output_in_json() - '''self.cmd( - 'az role assignment create --assignee {id3} --role "Storage Blob Data Contributor" --scope {storageid2}')''' + # Grant Storage Blob Data Contributor role to the managed identity + self.cmd( + 'role assignment create --assignee {id3} --role "Storage Blob Data Contributor" --scope {storageid2}') + + # Wait for role assignment to propagate + time.sleep(60) self.cmd( 'eventhubs namespace create --resource-group {rg} --name {namespacename2} --location {loc} --tags {tags} --sku Premium ' diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_application_group.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_application_group.py index 11de7778549..75407a33803 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_application_group.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_application_group.py @@ -21,7 +21,7 @@ class EHNamespaceAppl(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eventhub_app_group(self, resource_group): self.kwargs.update({ - 'loc': 'westus2', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'appgroup1': self.create_random_name(prefix='app-group-nscli1', length=20), diff --git a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_schema_registry.py b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_schema_registry.py index 763652ce82b..c853413a7dc 100644 --- a/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_schema_registry.py +++ b/src/azure-cli/azure/cli/command_modules/eventhubs/tests/latest/test_eventhub_namespace_schema_registry.py @@ -21,7 +21,7 @@ class EHNamespaceSchemaRegistry(ScenarioTest): @ResourceGroupPreparer(name_prefix='cli_test_eh_namespace') def test_eventhub_schema_registry(self, resource_group): self.kwargs.update({ - 'loc': 'westus2', + 'loc': 'eastus', 'rg': resource_group, 'namespacename': self.create_random_name(prefix='eventhubs-nscli', length=20), 'schemagroup1': self.create_random_name(prefix='schema-nscli1', length=20),