From 077fc3712c2b0e1f43422c48cac3c53d890d1cec Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Wed, 18 Mar 2026 12:54:45 +0530 Subject: [PATCH 01/11] Update API version to 2026-03-31-preview --- .../collaboration/_add_collaborator.py | 84 +++++++++++----- .../managedcleanroom/collaboration/_create.py | 81 ++++++--------- .../managedcleanroom/collaboration/_delete.py | 6 +- .../collaboration/_enable_workload.py | 50 ++++++---- .../managedcleanroom/collaboration/_list.py | 98 +++++++++++-------- .../managedcleanroom/collaboration/_pause.py | 50 ++++++---- .../collaboration/_recover.py | 50 ++++++---- .../managedcleanroom/collaboration/_resume.py | 50 ++++++---- .../managedcleanroom/collaboration/_show.py | 50 ++++++---- .../managedcleanroom/collaboration/_update.py | 79 ++++++--------- .../managedcleanroom/collaboration/_wait.py | 48 +++++---- .../managedcleanroom/consortium/_create.py | 22 ++++- .../managedcleanroom/consortium/_delete.py | 6 +- .../managedcleanroom/consortium/_list.py | 32 +++++- .../managedcleanroom/consortium/_pause.py | 17 +++- .../managedcleanroom/consortium/_recover.py | 17 +++- .../managedcleanroom/consortium/_resume.py | 17 +++- .../managedcleanroom/consortium/_show.py | 17 +++- .../managedcleanroom/consortium/_update.py | 25 ++++- .../managedcleanroom/consortium/_wait.py | 15 ++- .../consortium_view/_create.py | 6 +- .../consortium_view/_delete.py | 6 +- .../managedcleanroom/consortium_view/_list.py | 10 +- .../managedcleanroom/consortium_view/_show.py | 6 +- .../consortium_view/_update.py | 8 +- .../managedcleanroom/consortium_view/_wait.py | 4 +- .../consortium_view/contract/_list.py | 6 +- .../contract/_propose_template.py | 6 +- .../consortium_view/contract/_show.py | 6 +- 29 files changed, 519 insertions(+), 353 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index eb5e443b262..40f2ceb6e00 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -23,9 +23,9 @@ class AddCollaborator(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/addcollaborator", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/addcollaborator", "2026-03-31-preview"], ] } @@ -62,12 +62,31 @@ def _build_arguments_schema(cls, *args, **kwargs): # define Arg Group "Body" _args_schema = cls._args_schema - _args_schema.email = AAZStrArg( - options=["--email"], + _args_schema.collaborator = AAZObjectArg( + options=["--collaborator"], arg_group="Body", - help="Email of the collaborator to be added.", + help="Collaborator to be added.", required=True, ) + + collaborator = cls._args_schema.collaborator + collaborator.email = AAZStrArg( + options=["email"], + help="Email of the collaborator.", + ) + collaborator.identity_type = AAZStrArg( + options=["identity-type"], + help="Identity type of the collaborator.", + enum={"ServicePrincipal": "ServicePrincipal", "User": "User"}, + ) + collaborator.object_id = AAZStrArg( + options=["object-id"], + help="Object ID of the collaborator.", + ) + collaborator.tenant_id = AAZStrArg( + options=["tenant-id"], + help="Tenant ID of the collaborator.", + ) return cls._args_schema def _execute_operations(self): @@ -151,7 +170,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -176,7 +195,14 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("email", AAZStrType, ".email", typ_kwargs={"flags": {"required": True}}) + _builder.set_prop("collaborator", AAZObjectType, ".collaborator", typ_kwargs={"flags": {"required": True}}) + + collaborator = _builder.get(".collaborator") + if collaborator is not None: + collaborator.set_prop("email", AAZStrType, ".email") + collaborator.set_prop("identityType", AAZStrType, ".identity_type") + collaborator.set_prop("objectId", AAZStrType, ".object_id") + collaborator.set_prop("tenantId", AAZStrType, ".tenant_id") return self.serialize_content(_content_value) @@ -225,6 +251,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -244,14 +277,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -283,20 +331,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py index 220417b0633..3b3e4efbaed 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py @@ -23,9 +23,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2026-03-31-preview"], ] } @@ -68,30 +68,6 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, enum={"ConfidentialACI": "ConfidentialACI"}, ) - _args_schema.user_identity = AAZObjectArg( - options=["--user-identity"], - arg_group="Properties", - help="Gets or sets the user identity.", - required=True, - ) - - user_identity = cls._args_schema.user_identity - user_identity.account_type = AAZStrArg( - options=["account-type"], - help="Account type of the user identity.", - required=True, - enum={"microsoft": "microsoft"}, - ) - user_identity.object_id = AAZStrArg( - options=["object-id"], - help="Object ID of the user identity.", - required=True, - ) - user_identity.tenant_id = AAZStrArg( - options=["tenant-id"], - help="Tenant ID of the user identity.", - required=True, - ) # define Arg Group "Resource" @@ -203,7 +179,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -236,13 +212,6 @@ def content(self): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumType", AAZStrType, ".consortium_type", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("userIdentity", AAZObjectType, ".user_identity", typ_kwargs={"flags": {"required": True}}) - - user_identity = _builder.get(".properties.userIdentity") - if user_identity is not None: - user_identity.set_prop("accountType", AAZStrType, ".account_type", typ_kwargs={"flags": {"required": True}}) - user_identity.set_prop("objectId", AAZStrType, ".object_id", typ_kwargs={"flags": {"required": True}}) - user_identity.set_prop("tenantId", AAZStrType, ".tenant_id", typ_kwargs={"flags": {"required": True}}) tags = _builder.get(".tags") if tags is not None: @@ -295,6 +264,13 @@ def _build_schema_on_200_201(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -314,14 +290,29 @@ def _build_schema_on_200_201(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200_201.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200_201.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200_201.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -353,20 +344,6 @@ def _build_schema_on_200_201(cls): _element = cls._schema_on_200_201.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200_201.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200_201.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_delete.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_delete.py index 8c7e9f103d4..03cfd936dc5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_delete.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_delete.py @@ -24,9 +24,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2026-03-31-preview"], ] } @@ -147,7 +147,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py index 5a3940dced6..115e87309bf 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py @@ -23,9 +23,9 @@ class EnableWorkload(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/enableworkload", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/enableworkload", "2026-03-31-preview"], ] } @@ -152,7 +152,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -226,6 +226,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -245,14 +252,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -284,20 +306,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py index a22d342ffae..b27c159bc0d 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py @@ -23,10 +23,10 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/collaborations", "2025-10-31-preview"], - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/collaborations", "2026-03-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations", "2026-03-31-preview"], ] } @@ -113,7 +113,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -184,6 +184,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -203,14 +210,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.value.Element.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.value.Element.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.value.Element.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -242,20 +264,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.value.Element.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.value.Element.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.value.Element.properties.workloads workloads.Element = AAZObjectType() @@ -340,7 +348,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -411,6 +419,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -430,14 +445,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.value.Element.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.value.Element.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.value.Element.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -469,20 +499,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.value.Element.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.value.Element.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.value.Element.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py index 0e6a8c8fc64..05fa1485509 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py @@ -23,9 +23,9 @@ class Pause(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/pause", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/pause", "2026-03-31-preview"], ] } @@ -141,7 +141,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -201,6 +201,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -220,14 +227,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -259,20 +281,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py index 3e6bd3d878e..f1a4ce436f9 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py @@ -23,9 +23,9 @@ class Recover(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/recover", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/recover", "2026-03-31-preview"], ] } @@ -151,7 +151,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -225,6 +225,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -244,14 +251,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -283,20 +305,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py index bffbe2602a2..563b6fc082f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py @@ -23,9 +23,9 @@ class Resume(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/resume", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}/resume", "2026-03-31-preview"], ] } @@ -141,7 +141,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -201,6 +201,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -220,14 +227,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -259,20 +281,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py index 8c2706a6afa..5c727cf18d5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py @@ -23,9 +23,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2026-03-31-preview"], ] } @@ -124,7 +124,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -184,6 +184,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -203,14 +210,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -242,20 +264,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index c50bfffb5c4..f92f83d6a3f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -23,9 +23,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2026-03-31-preview"], ] } @@ -70,26 +70,6 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Gets or sets the consortium type.", enum={"ConfidentialACI": "ConfidentialACI"}, ) - _args_schema.user_identity = AAZObjectArg( - options=["--user-identity"], - arg_group="Properties", - help="Gets or sets the user identity.", - ) - - user_identity = cls._args_schema.user_identity - user_identity.account_type = AAZStrArg( - options=["account-type"], - help="Account type of the user identity.", - enum={"microsoft": "microsoft"}, - ) - user_identity.object_id = AAZStrArg( - options=["object-id"], - help="Object ID of the user identity.", - ) - user_identity.tenant_id = AAZStrArg( - options=["tenant-id"], - help="Tenant ID of the user identity.", - ) # define Arg Group "Resource" @@ -185,7 +165,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -284,7 +264,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -348,13 +328,6 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumType", AAZStrType, ".consortium_type", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("userIdentity", AAZObjectType, ".user_identity", typ_kwargs={"flags": {"required": True}}) - - user_identity = _builder.get(".properties.userIdentity") - if user_identity is not None: - user_identity.set_prop("accountType", AAZStrType, ".account_type", typ_kwargs={"flags": {"required": True}}) - user_identity.set_prop("objectId", AAZStrType, ".object_id", typ_kwargs={"flags": {"required": True}}) - user_identity.set_prop("tenantId", AAZStrType, ".tenant_id", typ_kwargs={"flags": {"required": True}}) tags = _builder.get(".tags") if tags is not None: @@ -419,6 +392,13 @@ def _build_schema_collaboration_read(cls, _schema): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -438,14 +418,29 @@ def _build_schema_collaboration_read(cls, _schema): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = _schema_collaboration_read.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = _schema_collaboration_read.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = _schema_collaboration_read.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -477,20 +472,6 @@ def _build_schema_collaboration_read(cls, _schema): _element = _schema_collaboration_read.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = _schema_collaboration_read.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = _schema_collaboration_read.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py index 3530dc74426..fd359131297 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py @@ -21,7 +21,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/collaborations/{}", "2026-03-31-preview"], ] } @@ -120,7 +120,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -180,6 +180,13 @@ def _build_schema_on_200(cls): serialized_name="clusterEndpoint", flags={"read_only": True}, ) + properties.collaboration_state = AAZStrType( + serialized_name="collaborationState", + flags={"read_only": True}, + ) + properties.collaborators = AAZListType( + flags={"read_only": True}, + ) properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -199,14 +206,29 @@ def _build_schema_on_200(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - properties.user_identity = AAZObjectType( - serialized_name="userIdentity", - flags={"required": True}, - ) properties.workloads = AAZListType( flags={"read_only": True}, ) + collaborators = cls._schema_on_200.properties.collaborators + collaborators.Element = AAZObjectType() + + _element = cls._schema_on_200.properties.collaborators.Element + _element.email = AAZStrType() + _element.identity_type = AAZStrType( + serialized_name="identityType", + ) + _element.is_collaboration_owner = AAZBoolType( + serialized_name="isCollaborationOwner", + flags={"read_only": True}, + ) + _element.object_id = AAZStrType( + serialized_name="objectId", + ) + _element.tenant_id = AAZStrType( + serialized_name="tenantId", + ) + health = cls._schema_on_200.properties.health health.health_issues = AAZListType( serialized_name="healthIssues", @@ -238,20 +260,6 @@ def _build_schema_on_200(cls): _element = cls._schema_on_200.properties.managed_on_behalf_of_configuration.mobo_broker_resources.Element _element.id = AAZStrType() - user_identity = cls._schema_on_200.properties.user_identity - user_identity.account_type = AAZStrType( - serialized_name="accountType", - flags={"required": True}, - ) - user_identity.object_id = AAZStrType( - serialized_name="objectId", - flags={"required": True}, - ) - user_identity.tenant_id = AAZStrType( - serialized_name="tenantId", - flags={"required": True}, - ) - workloads = cls._schema_on_200.properties.workloads workloads.Element = AAZObjectType() diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py index f832bc7f7e7..d9d7dc1fae5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py @@ -23,9 +23,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2026-03-31-preview"], ] } @@ -97,6 +97,10 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Indicates if the member is an operator.", required=True, ) + _element.recovery_role = AAZStrArg( + options=["recovery-role"], + help="Gets or sets the recovery role for non-operator members.", + ) # define Arg Group "Resource" @@ -208,7 +212,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -253,6 +257,7 @@ def content(self): _elements.set_prop("encryptionKeyPem", AAZStrType, ".encryption_key_pem", typ_kwargs={"flags": {"required": True}}) _elements.set_prop("identifier", AAZStrType, ".identifier", typ_kwargs={"flags": {"required": True}}) _elements.set_prop("isOperator", AAZBoolType, ".is_operator", typ_kwargs={"flags": {"required": True}}) + _elements.set_prop("recoveryRole", AAZStrType, ".recovery_role") tags = _builder.get(".tags") if tags is not None: @@ -301,12 +306,20 @@ def _build_schema_on_200_201(cls): ) properties = cls._schema_on_200_201.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -374,6 +387,9 @@ def _build_schema_on_200_201(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200_201.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_delete.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_delete.py index ec7da8d5881..2eff71c4fa8 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_delete.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_delete.py @@ -24,9 +24,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2026-03-31-preview"], ] } @@ -147,7 +147,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py index e006c39f31a..92c5ddb3451 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py @@ -23,10 +23,10 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/consortiums", "2025-10-31-preview"], - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/consortiums", "2026-03-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums", "2026-03-31-preview"], ] } @@ -113,7 +113,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -180,12 +180,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.value.Element.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -253,6 +261,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.value.Element.system_data system_data.created_at = AAZStrType( @@ -323,7 +334,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -390,12 +401,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.value.Element.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -463,6 +482,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.value.Element.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py index 3ad3baf7538..fbd0f7b64fc 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py @@ -23,9 +23,9 @@ class Pause(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/pause", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/pause", "2026-03-31-preview"], ] } @@ -141,7 +141,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -197,12 +197,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -270,6 +278,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py index 5b516f9d10f..4eee33a454c 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py @@ -23,9 +23,9 @@ class Recover(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/recover", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/recover", "2026-03-31-preview"], ] } @@ -151,7 +151,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -221,12 +221,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -294,6 +302,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py index ed819da4f5d..80612505447 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py @@ -23,9 +23,9 @@ class Resume(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/resume", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}/resume", "2026-03-31-preview"], ] } @@ -141,7 +141,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -197,12 +197,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -270,6 +278,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py index af87f5f090d..9ca569fca58 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py @@ -23,9 +23,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2026-03-31-preview"], ] } @@ -124,7 +124,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -180,12 +180,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -253,6 +261,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py index 8ed426c9569..183a52ce222 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py @@ -23,9 +23,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2026-03-31-preview"], ] } @@ -100,6 +100,11 @@ def _build_arguments_schema(cls, *args, **kwargs): options=["is-operator"], help="Indicates if the member is an operator.", ) + _element.recovery_role = AAZStrArg( + options=["recovery-role"], + help="Gets or sets the recovery role for non-operator members.", + nullable=True, + ) # define Arg Group "Resource" @@ -195,7 +200,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -294,7 +299,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -370,6 +375,7 @@ def _update_instance(self, instance): _elements.set_prop("encryptionKeyPem", AAZStrType, ".encryption_key_pem", typ_kwargs={"flags": {"required": True}}) _elements.set_prop("identifier", AAZStrType, ".identifier", typ_kwargs={"flags": {"required": True}}) _elements.set_prop("isOperator", AAZBoolType, ".is_operator", typ_kwargs={"flags": {"required": True}}) + _elements.set_prop("recoveryRole", AAZStrType, ".recovery_role") tags = _builder.get(".tags") if tags is not None: @@ -430,12 +436,20 @@ def _build_schema_consortium_read(cls, _schema): ) properties = _schema_consortium_read.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -503,6 +517,9 @@ def _build_schema_consortium_read(cls, _schema): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = _schema_consortium_read.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py index 9e6bde94be6..01b2b463f98 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py @@ -21,7 +21,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiums/{}", "2026-03-31-preview"], ] } @@ -120,7 +120,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -176,12 +176,20 @@ def _build_schema_on_200(cls): ) properties = cls._schema_on_200.properties + properties.consortium_state = AAZStrType( + serialized_name="consortiumState", + flags={"read_only": True}, + ) properties.consortium_type = AAZStrType( serialized_name="consortiumType", ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) + properties.governance_type = AAZStrType( + serialized_name="governanceType", + flags={"read_only": True}, + ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -249,6 +257,9 @@ def _build_schema_on_200(cls): serialized_name="isOperator", flags={"required": True}, ) + _element.recovery_role = AAZStrType( + serialized_name="recoveryRole", + ) system_data = cls._schema_on_200.system_data system_data.created_at = AAZStrType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py index 3015a2c9768..022fd60b632 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py @@ -23,9 +23,9 @@ class Create(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2026-03-31-preview"], ] } @@ -205,7 +205,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_delete.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_delete.py index 316068b2a82..eb4c4d8e25f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_delete.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_delete.py @@ -24,9 +24,9 @@ class Delete(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2026-03-31-preview"], ] } @@ -147,7 +147,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py index 6d3a8092d6b..3e9a36e0026 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py @@ -23,10 +23,10 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/consortiumviews", "2025-10-31-preview"], - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.cleanroom/consortiumviews", "2026-03-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews", "2026-03-31-preview"], ] } @@ -113,7 +113,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -278,7 +278,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_show.py index 1713a4a25e5..3659f2dd460 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_show.py @@ -23,9 +23,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2026-03-31-preview"], ] } @@ -124,7 +124,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py index b9ac42bfd09..3ac54eaf1e0 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py @@ -23,9 +23,9 @@ class Update(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2026-03-31-preview"], ] } @@ -187,7 +187,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } @@ -286,7 +286,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_wait.py index b15cd3e667b..984048035e5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_wait.py @@ -21,7 +21,7 @@ class Wait(AAZWaitCommand): _aaz_info = { "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}", "2026-03-31-preview"], ] } @@ -120,7 +120,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_list.py index 701ad24fed6..e4211cacdf4 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_list.py @@ -23,9 +23,9 @@ class List(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts", "2026-03-31-preview"], ] } @@ -125,7 +125,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_propose_template.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_propose_template.py index f8212502d79..494f7b7fffe 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_propose_template.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_propose_template.py @@ -23,9 +23,9 @@ class ProposeTemplate(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts/{}/proposetemplate", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts/{}/proposetemplate", "2026-03-31-preview"], ] } @@ -154,7 +154,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_show.py index e03bab4f673..016af6ffc2f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/contract/_show.py @@ -23,9 +23,9 @@ class Show(AAZCommand): """ _aaz_info = { - "version": "2025-10-31-preview", + "version": "2026-03-31-preview", "resources": [ - ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts/{}", "2025-10-31-preview"], + ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.cleanroom/consortiumviews/{}/contracts/{}", "2026-03-31-preview"], ] } @@ -137,7 +137,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2025-10-31-preview", + "api-version", "2026-03-31-preview", required=True, ), } From 979cfa55d0223b492d574f005030de865c4972eb Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Thu, 19 Mar 2026 12:07:58 +0530 Subject: [PATCH 02/11] Help update --- .../aaz/latest/managedcleanroom/__cmd_group.py | 2 +- .../latest/managedcleanroom/collaboration/_add_collaborator.py | 2 +- .../aaz/latest/managedcleanroom/collaboration/_create.py | 2 +- .../aaz/latest/managedcleanroom/collaboration/_update.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/__cmd_group.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/__cmd_group.py index bf0505d07d3..d455b8d803e 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/__cmd_group.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/__cmd_group.py @@ -15,7 +15,7 @@ "managedcleanroom", ) class __CMDGroup(AAZCommandGroup): - """Manage Clean Room + """Manage Azure Confidential Clean Room """ pass diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index 40f2ceb6e00..e64fd7ead80 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -19,7 +19,7 @@ class AddCollaborator(AAZCommand): """Adds a collaborator to a collaboration. :example: Add Collaborator - az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --email alice@example.com + az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --collaborator "{email:alice@contoso.com,tenant-id:72f988bf-86f1-41af-91ab-2d7cd011db47,object-id:0f8fad5b-d9cb-469f-a165-70867728950e,identity-type:User}" """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py index 3b3e4efbaed..13f4256ba11 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py @@ -19,7 +19,7 @@ class Create(AAZCommand): """Create a collaboration. :example: Create Collaboration - az managedcleanroom collaboration create --resource-group testrg --collaboration-name ContosoCollaboration --location northeurope --consortium-type ConfidentialACI --user-identity "{tenant-id:fd3c3665-1729-4b7b-9a38-238e83b0f98b,object-id:fd3c3665-1729-4b7b-9a38-238e83b0f98b,account-type:microsoft}" + az managedcleanroom collaboration create --resource-group testrg --collaboration-name ContosoCollaboration --location northeurope --consortium-type ConfidentialACI """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index f92f83d6a3f..e2e068afdf7 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -19,7 +19,7 @@ class Update(AAZCommand): """Update a collaboration. :example: Create Collaboration - az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration --consortium-type ConfidentialACI --user-identity "{tenant-id:fd3c3665-1729-4b7b-9a38-238e83b0f98b,object-id:fd3c3665-1729-4b7b-9a38-238e83b0f98b,account-type:microsoft}" + az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration --consortium-type ConfidentialACI """ _aaz_info = { From 5fb6527c8e043c033f58ad0d3e152c029f6c8ec2 Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Fri, 20 Mar 2026 18:43:52 +0530 Subject: [PATCH 03/11] Integrate updates with the schema changes --- .../collaboration/_add_collaborator.py | 29 ++++++------------- .../managedcleanroom/collaboration/_create.py | 26 ++--------------- .../collaboration/_enable_workload.py | 11 ++----- .../managedcleanroom/collaboration/_list.py | 22 ++++---------- .../managedcleanroom/collaboration/_pause.py | 11 ++----- .../collaboration/_recover.py | 11 ++----- .../managedcleanroom/collaboration/_resume.py | 11 ++----- .../managedcleanroom/collaboration/_show.py | 11 ++----- .../managedcleanroom/collaboration/_update.py | 26 ++--------------- .../managedcleanroom/collaboration/_wait.py | 11 ++----- .../consortium_view/_create.py | 6 ++-- .../consortium_view/_update.py | 6 ++-- 12 files changed, 45 insertions(+), 136 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index e64fd7ead80..a6e8b12e6aa 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -19,7 +19,7 @@ class AddCollaborator(AAZCommand): """Adds a collaborator to a collaboration. :example: Add Collaborator - az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --collaborator "{email:alice@contoso.com,tenant-id:72f988bf-86f1-41af-91ab-2d7cd011db47,object-id:0f8fad5b-d9cb-469f-a165-70867728950e,identity-type:User}" + az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --collaborator "{user-identifier:alice@contoso.com,tenant-id:72f988bf-86f1-41af-91ab-2d7cd011db47,object-id:0f8fad5b-d9cb-469f-a165-70867728950e}" """ _aaz_info = { @@ -70,15 +70,6 @@ def _build_arguments_schema(cls, *args, **kwargs): ) collaborator = cls._args_schema.collaborator - collaborator.email = AAZStrArg( - options=["email"], - help="Email of the collaborator.", - ) - collaborator.identity_type = AAZStrArg( - options=["identity-type"], - help="Identity type of the collaborator.", - enum={"ServicePrincipal": "ServicePrincipal", "User": "User"}, - ) collaborator.object_id = AAZStrArg( options=["object-id"], help="Object ID of the collaborator.", @@ -87,6 +78,10 @@ def _build_arguments_schema(cls, *args, **kwargs): options=["tenant-id"], help="Tenant ID of the collaborator.", ) + collaborator.user_identifier = AAZStrArg( + options=["user-identifier"], + help="User identifier of the collaborator. This can be specified as an email (no OID/TID should be specified) or an SPN (OID/TID required).", + ) return cls._args_schema def _execute_operations(self): @@ -199,10 +194,9 @@ def content(self): collaborator = _builder.get(".collaborator") if collaborator is not None: - collaborator.set_prop("email", AAZStrType, ".email") - collaborator.set_prop("identityType", AAZStrType, ".identity_type") collaborator.set_prop("objectId", AAZStrType, ".object_id") collaborator.set_prop("tenantId", AAZStrType, ".tenant_id") + collaborator.set_prop("userIdentifier", AAZStrType, ".user_identifier") return self.serialize_content(_content_value) @@ -262,10 +256,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -285,10 +275,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -299,6 +285,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py index 13f4256ba11..541ad866cec 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py @@ -58,17 +58,6 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) - # define Arg Group "Properties" - - _args_schema = cls._args_schema - _args_schema.consortium_type = AAZStrArg( - options=["--consortium-type"], - arg_group="Properties", - help="Gets or sets the consortium type.", - required=True, - enum={"ConfidentialACI": "ConfidentialACI"}, - ) - # define Arg Group "Resource" _args_schema = cls._args_schema @@ -209,10 +198,6 @@ def content(self): _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) _builder.set_prop("tags", AAZDictType, ".tags") - properties = _builder.get(".properties") - if properties is not None: - properties.set_prop("consortiumType", AAZStrType, ".consortium_type", typ_kwargs={"flags": {"required": True}}) - tags = _builder.get(".tags") if tags is not None: tags.set_elements(AAZStrType, ".") @@ -275,10 +260,6 @@ def _build_schema_on_200_201(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -298,10 +279,6 @@ def _build_schema_on_200_201(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200_201.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -312,6 +289,9 @@ def _build_schema_on_200_201(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200_201.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py index 115e87309bf..aed9806b11c 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py @@ -237,10 +237,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -260,10 +256,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -274,6 +266,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py index b27c159bc0d..8faf0d0f9e4 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py @@ -195,10 +195,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -218,10 +214,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.value.Element.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -232,6 +224,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.value.Element.properties.health health.health_issues = AAZListType( @@ -430,10 +425,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -453,10 +444,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.value.Element.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -467,6 +454,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.value.Element.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py index 05fa1485509..db283b009cb 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py @@ -212,10 +212,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -235,10 +231,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -249,6 +241,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py index f1a4ce436f9..a22d56e858b 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py @@ -236,10 +236,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -259,10 +255,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -273,6 +265,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py index 563b6fc082f..b0854f91bf4 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py @@ -212,10 +212,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -235,10 +231,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -249,6 +241,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py index 5c727cf18d5..a25ab01c67f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py @@ -195,10 +195,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -218,10 +214,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -232,6 +224,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index e2e068afdf7..92f44455eec 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -61,16 +61,6 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) - # define Arg Group "Properties" - - _args_schema = cls._args_schema - _args_schema.consortium_type = AAZStrArg( - options=["--consortium-type"], - arg_group="Properties", - help="Gets or sets the consortium type.", - enum={"ConfidentialACI": "ConfidentialACI"}, - ) - # define Arg Group "Resource" _args_schema = cls._args_schema @@ -322,13 +312,8 @@ def _update_instance(self, instance): value=instance, typ=AAZObjectType ) - _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) _builder.set_prop("tags", AAZDictType, ".tags") - properties = _builder.get(".properties") - if properties is not None: - properties.set_prop("consortiumType", AAZStrType, ".consortium_type", typ_kwargs={"flags": {"required": True}}) - tags = _builder.get(".tags") if tags is not None: tags.set_elements(AAZStrType, ".") @@ -403,10 +388,6 @@ def _build_schema_collaboration_read(cls, _schema): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -426,10 +407,6 @@ def _build_schema_collaboration_read(cls, _schema): collaborators.Element = AAZObjectType() _element = _schema_collaboration_read.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -440,6 +417,9 @@ def _build_schema_collaboration_read(cls, _schema): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = _schema_collaboration_read.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py index fd359131297..3b5009fd043 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py @@ -191,10 +191,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumArmId", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - flags={"required": True}, - ) properties.health = AAZObjectType( flags={"read_only": True}, ) @@ -214,10 +210,6 @@ def _build_schema_on_200(cls): collaborators.Element = AAZObjectType() _element = cls._schema_on_200.properties.collaborators.Element - _element.email = AAZStrType() - _element.identity_type = AAZStrType( - serialized_name="identityType", - ) _element.is_collaboration_owner = AAZBoolType( serialized_name="isCollaborationOwner", flags={"read_only": True}, @@ -228,6 +220,9 @@ def _build_schema_on_200(cls): _element.tenant_id = AAZStrType( serialized_name="tenantId", ) + _element.user_identifier = AAZStrType( + serialized_name="userIdentifier", + ) health = cls._schema_on_200.properties.health health.health_issues = AAZListType( diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py index 022fd60b632..dfd0a73e2c5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py @@ -67,8 +67,8 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Gets or sets the CCF endpoint.", required=True, ) - _args_schema.certificate_pem = AAZStrArg( - options=["--certificate-pem"], + _args_schema.consortium_service_certificate_pem = AAZStrArg( + options=["--consortium-service-certificate-pem"], arg_group="Properties", help="Gets or sets the CCF public service certificate in PEM format.", required=True, @@ -238,7 +238,7 @@ def content(self): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumEndpoint", AAZStrType, ".consortium_endpoint", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".certificate_pem", typ_kwargs={"flags": {"required": True}}) + properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".consortium_service_certificate_pem", typ_kwargs={"flags": {"required": True}}) properties.set_prop("member", AAZObjectType, ".member", typ_kwargs={"flags": {"required": True}}) member = _builder.get(".properties.member") diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py index 3ac54eaf1e0..0fdeb27e068 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py @@ -69,8 +69,8 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="Gets or sets the CCF endpoint.", ) - _args_schema.certificate_pem = AAZStrArg( - options=["--certificate-pem"], + _args_schema.consortium_service_certificate_pem = AAZStrArg( + options=["--consortium-service-certificate-pem"], arg_group="Properties", help="Gets or sets the CCF public service certificate in PEM format.", ) @@ -350,7 +350,7 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumEndpoint", AAZStrType, ".consortium_endpoint", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".certificate_pem", typ_kwargs={"flags": {"required": True}}) + properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".consortium_service_certificate_pem", typ_kwargs={"flags": {"required": True}}) properties.set_prop("member", AAZObjectType, ".member", typ_kwargs={"flags": {"required": True}}) member = _builder.get(".properties.member") From 6de51e376a43b99a6609e4ea8f1fbd20183ec48d Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Mon, 23 Mar 2026 11:50:03 +0530 Subject: [PATCH 04/11] Command changes --- .../collaboration/_add_collaborator.py | 11 ++-- .../managedcleanroom/collaboration/_create.py | 46 +++++++++++++++-- .../collaboration/_enable_workload.py | 4 +- .../managedcleanroom/collaboration/_list.py | 8 +-- .../managedcleanroom/collaboration/_pause.py | 4 +- .../collaboration/_recover.py | 4 +- .../managedcleanroom/collaboration/_resume.py | 4 +- .../managedcleanroom/collaboration/_show.py | 4 +- .../managedcleanroom/collaboration/_update.py | 51 +++++++++++++++++-- .../managedcleanroom/collaboration/_wait.py | 4 +- .../managedcleanroom/consortium/_create.py | 10 ---- .../managedcleanroom/consortium/_list.py | 6 --- .../managedcleanroom/consortium/_pause.py | 3 -- .../managedcleanroom/consortium/_recover.py | 3 -- .../managedcleanroom/consortium/_resume.py | 3 -- .../managedcleanroom/consortium/_show.py | 3 -- .../managedcleanroom/consortium/_update.py | 11 ---- .../managedcleanroom/consortium/_wait.py | 3 -- 18 files changed, 104 insertions(+), 78 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index a6e8b12e6aa..e9ea18e5417 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -19,7 +19,10 @@ class AddCollaborator(AAZCommand): """Adds a collaborator to a collaboration. :example: Add Collaborator - az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --collaborator "{user-identifier:alice@contoso.com,tenant-id:72f988bf-86f1-41af-91ab-2d7cd011db47,object-id:0f8fad5b-d9cb-469f-a165-70867728950e}" + az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "alice@contoso.com" + + :example: Add Collaborator + az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "contoso-spn" --tenant-id "72f988bf-86f1-41af-91ab-2d7cd011db47" --object-id "0f8fad5b-d9cb-469f-a165-70867728950e" """ _aaz_info = { @@ -190,7 +193,7 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("collaborator", AAZObjectType, ".collaborator", typ_kwargs={"flags": {"required": True}}) + _builder.set_prop("collaborator", AAZObjectType, ".collaborator", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) collaborator = _builder.get(".collaborator") if collaborator is not None: @@ -249,9 +252,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py index 541ad866cec..123fb2f8844 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_create.py @@ -19,7 +19,7 @@ class Create(AAZCommand): """Create a collaboration. :example: Create Collaboration - az managedcleanroom collaboration create --resource-group testrg --collaboration-name ContosoCollaboration --location northeurope --consortium-type ConfidentialACI + az managedcleanroom collaboration create --resource-group testrg --collaboration-name ContosoCollaboration --location northeurope """ _aaz_info = { @@ -58,6 +58,32 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) + # define Arg Group "Properties" + + _args_schema = cls._args_schema + _args_schema.collaborators = AAZListArg( + options=["--collaborators"], + arg_group="Properties", + help="Gets or sets the collaborators.", + ) + + collaborators = cls._args_schema.collaborators + collaborators.Element = AAZObjectArg() + + _element = cls._args_schema.collaborators.Element + _element.object_id = AAZStrArg( + options=["object-id"], + help="Object ID of the collaborator.", + ) + _element.tenant_id = AAZStrArg( + options=["tenant-id"], + help="Tenant ID of the collaborator.", + ) + _element.user_identifier = AAZStrArg( + options=["user-identifier"], + help="User identifier of the collaborator. This can be specified as an email (no OID/TID should be specified) or an SPN (OID/TID required).", + ) + # define Arg Group "Resource" _args_schema = cls._args_schema @@ -198,6 +224,20 @@ def content(self): _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) _builder.set_prop("tags", AAZDictType, ".tags") + properties = _builder.get(".properties") + if properties is not None: + properties.set_prop("collaborators", AAZListType, ".collaborators") + + collaborators = _builder.get(".properties.collaborators") + if collaborators is not None: + collaborators.set_elements(AAZObjectType, ".") + + _elements = _builder.get(".properties.collaborators[]") + if _elements is not None: + _elements.set_prop("objectId", AAZStrType, ".object_id") + _elements.set_prop("tenantId", AAZStrType, ".tenant_id") + _elements.set_prop("userIdentifier", AAZStrType, ".user_identifier") + tags = _builder.get(".tags") if tags is not None: tags.set_elements(AAZStrType, ".") @@ -253,9 +293,7 @@ def _build_schema_on_200_201(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py index aed9806b11c..1b46f3cc219 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_enable_workload.py @@ -230,9 +230,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py index 8faf0d0f9e4..55f85e7e36c 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py @@ -188,9 +188,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, @@ -418,9 +416,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py index db283b009cb..34f01f29ccb 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_pause.py @@ -205,9 +205,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py index a22d56e858b..296a6a8c149 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_recover.py @@ -229,9 +229,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py index b0854f91bf4..993826f6cd3 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_resume.py @@ -205,9 +205,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py index a25ab01c67f..31a327f398c 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_show.py @@ -188,9 +188,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index 92f44455eec..83221ed2bab 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -61,6 +61,38 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) + # define Arg Group "Properties" + + _args_schema = cls._args_schema + _args_schema.collaborators = AAZListArg( + options=["--collaborators"], + arg_group="Properties", + help="Gets or sets the collaborators.", + nullable=True, + ) + + collaborators = cls._args_schema.collaborators + collaborators.Element = AAZObjectArg( + nullable=True, + ) + + _element = cls._args_schema.collaborators.Element + _element.object_id = AAZStrArg( + options=["object-id"], + help="Object ID of the collaborator.", + nullable=True, + ) + _element.tenant_id = AAZStrArg( + options=["tenant-id"], + help="Tenant ID of the collaborator.", + nullable=True, + ) + _element.user_identifier = AAZStrArg( + options=["user-identifier"], + help="User identifier of the collaborator. This can be specified as an email (no OID/TID should be specified) or an SPN (OID/TID required).", + nullable=True, + ) + # define Arg Group "Resource" _args_schema = cls._args_schema @@ -312,8 +344,23 @@ def _update_instance(self, instance): value=instance, typ=AAZObjectType ) + _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) _builder.set_prop("tags", AAZDictType, ".tags") + properties = _builder.get(".properties") + if properties is not None: + properties.set_prop("collaborators", AAZListType, ".collaborators") + + collaborators = _builder.get(".properties.collaborators") + if collaborators is not None: + collaborators.set_elements(AAZObjectType, ".") + + _elements = _builder.get(".properties.collaborators[]") + if _elements is not None: + _elements.set_prop("objectId", AAZStrType, ".object_id") + _elements.set_prop("tenantId", AAZStrType, ".tenant_id") + _elements.set_prop("userIdentifier", AAZStrType, ".user_identifier") + tags = _builder.get(".tags") if tags is not None: tags.set_elements(AAZStrType, ".") @@ -381,9 +428,7 @@ def _build_schema_collaboration_read(cls, _schema): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py index 3b5009fd043..fe2e982c1a6 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_wait.py @@ -184,9 +184,7 @@ def _build_schema_on_200(cls): serialized_name="collaborationState", flags={"read_only": True}, ) - properties.collaborators = AAZListType( - flags={"read_only": True}, - ) + properties.collaborators = AAZListType() properties.consortium_arm_id = AAZStrType( serialized_name="consortiumArmId", flags={"read_only": True}, diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py index d9d7dc1fae5..eb104dc4855 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_create.py @@ -61,12 +61,6 @@ def _build_arguments_schema(cls, *args, **kwargs): # define Arg Group "Properties" _args_schema = cls._args_schema - _args_schema.consortium_type = AAZStrArg( - options=["--consortium-type"], - arg_group="Properties", - help="Gets or sets the consortium type.", - enum={"ConfidentialACI": "ConfidentialACI"}, - ) _args_schema.members = AAZListArg( options=["--members"], arg_group="Properties", @@ -244,7 +238,6 @@ def content(self): properties = _builder.get(".properties") if properties is not None: - properties.set_prop("consortiumType", AAZStrType, ".consortium_type") properties.set_prop("members", AAZListType, ".members") members = _builder.get(".properties.members") @@ -310,9 +303,6 @@ def _build_schema_on_200_201(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py index 92c5ddb3451..d0955aaaf8b 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py @@ -184,9 +184,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) @@ -405,9 +402,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py index fbd0f7b64fc..4fd305ba186 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_pause.py @@ -201,9 +201,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py index 4eee33a454c..1699db7ff25 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_recover.py @@ -225,9 +225,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py index 80612505447..0cc2ec04cba 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_resume.py @@ -201,9 +201,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py index 9ca569fca58..229866e1eb4 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_show.py @@ -184,9 +184,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py index 183a52ce222..a81a12831d6 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py @@ -64,13 +64,6 @@ def _build_arguments_schema(cls, *args, **kwargs): # define Arg Group "Properties" _args_schema = cls._args_schema - _args_schema.consortium_type = AAZStrArg( - options=["--consortium-type"], - arg_group="Properties", - help="Gets or sets the consortium type.", - nullable=True, - enum={"ConfidentialACI": "ConfidentialACI"}, - ) _args_schema.members = AAZListArg( options=["--members"], arg_group="Properties", @@ -362,7 +355,6 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: - properties.set_prop("consortiumType", AAZStrType, ".consortium_type") properties.set_prop("members", AAZListType, ".members") members = _builder.get(".properties.members") @@ -440,9 +432,6 @@ def _build_schema_consortium_read(cls, _schema): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py index 01b2b463f98..fdae162d6e6 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_wait.py @@ -180,9 +180,6 @@ def _build_schema_on_200(cls): serialized_name="consortiumState", flags={"read_only": True}, ) - properties.consortium_type = AAZStrType( - serialized_name="consortiumType", - ) properties.endpoint = AAZStrType( flags={"read_only": True}, ) From 36c21520212adcdcdbc1c46be66c0a03f2edf78f Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Mon, 23 Mar 2026 12:43:26 +0530 Subject: [PATCH 05/11] Flatten properties --- .../collaboration/_add_collaborator.py | 27 +++++----- .../managedcleanroom/collaboration/_list.py | 3 ++ .../managedcleanroom/collaboration/_update.py | 49 +------------------ .../managedcleanroom/consortium/_list.py | 3 ++ .../managedcleanroom/consortium_view/_list.py | 3 ++ 5 files changed, 21 insertions(+), 64 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index e9ea18e5417..527a08106f9 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -62,27 +62,22 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) - # define Arg Group "Body" + # define Arg Group "Collaborator" _args_schema = cls._args_schema - _args_schema.collaborator = AAZObjectArg( - options=["--collaborator"], - arg_group="Body", - help="Collaborator to be added.", - required=True, - ) - - collaborator = cls._args_schema.collaborator - collaborator.object_id = AAZStrArg( - options=["object-id"], + _args_schema.object_id = AAZStrArg( + options=["--object-id"], + arg_group="Collaborator", help="Object ID of the collaborator.", ) - collaborator.tenant_id = AAZStrArg( - options=["tenant-id"], + _args_schema.tenant_id = AAZStrArg( + options=["--tenant-id"], + arg_group="Collaborator", help="Tenant ID of the collaborator.", ) - collaborator.user_identifier = AAZStrArg( - options=["user-identifier"], + _args_schema.user_identifier = AAZStrArg( + options=["--user-identifier"], + arg_group="Collaborator", help="User identifier of the collaborator. This can be specified as an email (no OID/TID should be specified) or an SPN (OID/TID required).", ) return cls._args_schema @@ -193,7 +188,7 @@ def content(self): typ=AAZObjectType, typ_kwargs={"flags": {"required": True, "client_flatten": True}} ) - _builder.set_prop("collaborator", AAZObjectType, ".collaborator", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) + _builder.set_prop("collaborator", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) collaborator = _builder.get(".collaborator") if collaborator is not None: diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py index 55f85e7e36c..57f2374214b 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py @@ -20,6 +20,9 @@ class List(AAZCommand): :example: List collaborations in subscription az managedcleanroom collaboration list + + :example: List collaborations in subscription + az managedcleanroom collaboration list --resource-group testrg """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index 83221ed2bab..a45b91035ce 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -19,7 +19,7 @@ class Update(AAZCommand): """Update a collaboration. :example: Create Collaboration - az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration --consortium-type ConfidentialACI + az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration """ _aaz_info = { @@ -61,38 +61,6 @@ def _build_arguments_schema(cls, *args, **kwargs): required=True, ) - # define Arg Group "Properties" - - _args_schema = cls._args_schema - _args_schema.collaborators = AAZListArg( - options=["--collaborators"], - arg_group="Properties", - help="Gets or sets the collaborators.", - nullable=True, - ) - - collaborators = cls._args_schema.collaborators - collaborators.Element = AAZObjectArg( - nullable=True, - ) - - _element = cls._args_schema.collaborators.Element - _element.object_id = AAZStrArg( - options=["object-id"], - help="Object ID of the collaborator.", - nullable=True, - ) - _element.tenant_id = AAZStrArg( - options=["tenant-id"], - help="Tenant ID of the collaborator.", - nullable=True, - ) - _element.user_identifier = AAZStrArg( - options=["user-identifier"], - help="User identifier of the collaborator. This can be specified as an email (no OID/TID should be specified) or an SPN (OID/TID required).", - nullable=True, - ) - # define Arg Group "Resource" _args_schema = cls._args_schema @@ -344,23 +312,8 @@ def _update_instance(self, instance): value=instance, typ=AAZObjectType ) - _builder.set_prop("properties", AAZObjectType, ".", typ_kwargs={"flags": {"required": True, "client_flatten": True}}) _builder.set_prop("tags", AAZDictType, ".tags") - properties = _builder.get(".properties") - if properties is not None: - properties.set_prop("collaborators", AAZListType, ".collaborators") - - collaborators = _builder.get(".properties.collaborators") - if collaborators is not None: - collaborators.set_elements(AAZObjectType, ".") - - _elements = _builder.get(".properties.collaborators[]") - if _elements is not None: - _elements.set_prop("objectId", AAZStrType, ".object_id") - _elements.set_prop("tenantId", AAZStrType, ".tenant_id") - _elements.set_prop("userIdentifier", AAZStrType, ".user_identifier") - tags = _builder.get(".tags") if tags is not None: tags.set_elements(AAZStrType, ".") diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py index d0955aaaf8b..0d8644485b5 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py @@ -20,6 +20,9 @@ class List(AAZCommand): :example: List consortiums in subscription az managedcleanroom consortium list + + :example: List consortiums in subscription + az managedcleanroom consortium list --resource-group testrg """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py index 3e9a36e0026..44467fa1e6f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py @@ -20,6 +20,9 @@ class List(AAZCommand): :example: List consortium views in subscription az managedcleanroom consortium-view list + + :example: List consortium views in subscription + az managedcleanroom consortium-view list --resource-group testrg """ _aaz_info = { From 2d43e31dc425b6ed0a72239b098388f36e6f286e Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Mon, 23 Mar 2026 13:58:49 +0530 Subject: [PATCH 06/11] Update the help for update --- .../aaz/latest/managedcleanroom/collaboration/_update.py | 4 ++-- .../aaz/latest/managedcleanroom/consortium/_update.py | 4 ++-- .../aaz/latest/managedcleanroom/consortium_view/_update.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py index a45b91035ce..99d138ab716 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_update.py @@ -18,8 +18,8 @@ class Update(AAZCommand): """Update a collaboration. - :example: Create Collaboration - az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration + :example: Update Collaboration + az managedcleanroom collaboration update --resource-group testrg --collaboration-name ContosoCollaboration --tags "env=testing" """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py index a81a12831d6..388a6cfef48 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_update.py @@ -18,8 +18,8 @@ class Update(AAZCommand): """Update a consortium. - :example: Create Consortium - az managedcleanroom consortium update --resource-group testrg --consortium-name ContosoConsortium + :example: Update Consortium + az managedcleanroom consortium update --resource-group testrg --consortium-name ContosoConsortium --tags "env=testing" """ _aaz_info = { diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py index 0fdeb27e068..7b68d34410a 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py @@ -18,8 +18,8 @@ class Update(AAZCommand): """Update a consortium view. - :example: Create Consortium View - az managedcleanroom consortium-view update --resource-group testrg --consortium-view-name ContosoConsortiumView --consortium-endpoint https://ContosoEndpoint/ --consortium-service-certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" + :example: Update Consortium View + az managedcleanroom consortium-view update --resource-group testrg --consortium-view-name ContosoConsortiumView --consortium-endpoint https://ContosoEndpoint/ --consortium-service-certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" --tags "env=testing" """ _aaz_info = { From dd5811327e0641602167a5ef5e88319a9744f058 Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Mon, 23 Mar 2026 14:05:06 +0530 Subject: [PATCH 07/11] Update help example add collaborator --- .../managedcleanroom/collaboration/_add_collaborator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index 527a08106f9..d67c164291f 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -18,10 +18,10 @@ class AddCollaborator(AAZCommand): """Adds a collaborator to a collaboration. - :example: Add Collaborator + :example: Add Collaborator(User) az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "alice@contoso.com" - :example: Add Collaborator + :example: Add Collaborator(Service Principal) az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "contoso-spn" --tenant-id "72f988bf-86f1-41af-91ab-2d7cd011db47" --object-id "0f8fad5b-d9cb-469f-a165-70867728950e" """ From 744c61f1f83b5f15aded72aaf0d194615e89db40 Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Mon, 23 Mar 2026 15:47:19 +0530 Subject: [PATCH 08/11] Update the example for add collaborator --- .../latest/managedcleanroom/collaboration/_add_collaborator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py index d67c164291f..52d0dc2da6d 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_add_collaborator.py @@ -22,7 +22,7 @@ class AddCollaborator(AAZCommand): az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "alice@contoso.com" :example: Add Collaborator(Service Principal) - az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "contoso-spn" --tenant-id "72f988bf-86f1-41af-91ab-2d7cd011db47" --object-id "0f8fad5b-d9cb-469f-a165-70867728950e" + az managedcleanroom collaboration add-collaborator --resource-group testrg --collaboration-name ContosoCollaboration --user-identifier "0d6b305c-85ee-419f-9c87-d3405c24aab6" --tenant-id "72f988bf-86f1-41af-91ab-2d7cd011db47" --object-id "0f8fad5b-d9cb-469f-a165-70867728950e" """ _aaz_info = { From c4bb816b29a873b799576b13e8adc2091bfe5d6f Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Thu, 26 Mar 2026 13:40:30 +0530 Subject: [PATCH 09/11] Update version --- src/managedcleanroom/HISTORY.rst | 6 +++++- src/managedcleanroom/setup.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/managedcleanroom/HISTORY.rst b/src/managedcleanroom/HISTORY.rst index 6e046ab8d21..6a173bcf875 100644 --- a/src/managedcleanroom/HISTORY.rst +++ b/src/managedcleanroom/HISTORY.rst @@ -10,4 +10,8 @@ Release History 1.0.0b2 ++++++ * Add frontend commandlets -* Add MSAL device code flow authentication \ No newline at end of file +* Add MSAL device code flow authentication + +1.0.0b3 +++++++ +* Update commands to reflect new API verson 2026-03-31-preview \ No newline at end of file diff --git a/src/managedcleanroom/setup.py b/src/managedcleanroom/setup.py index 482f23f5044..b2fce87ebba 100644 --- a/src/managedcleanroom/setup.py +++ b/src/managedcleanroom/setup.py @@ -10,7 +10,7 @@ # HISTORY.rst entry. -VERSION = '1.0.0b2' +VERSION = '1.0.0b3' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 3ed5e219b97a9070f4430956a720b3304b2e22b2 Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Thu, 26 Mar 2026 13:56:49 +0530 Subject: [PATCH 10/11] Update long parameter length --- .../latest/managedcleanroom/consortium_view/_create.py | 8 ++++---- .../latest/managedcleanroom/consortium_view/_update.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py index dfd0a73e2c5..1be8d0f3650 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_create.py @@ -19,7 +19,7 @@ class Create(AAZCommand): """Create a consortium view. :example: Create Consortium View - az managedcleanroom consortium-view create --resource-group testrg --consortium-view-name ContosoConsortiumView --location northeurope --consortium-endpoint https://ContosoEndpoint/ --consortium-service-certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" + az managedcleanroom consortium-view create --resource-group testrg --consortium-view-name ContosoConsortiumView --location northeurope --consortium-endpoint https://ContosoEndpoint/ --certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" """ _aaz_info = { @@ -67,8 +67,8 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Gets or sets the CCF endpoint.", required=True, ) - _args_schema.consortium_service_certificate_pem = AAZStrArg( - options=["--consortium-service-certificate-pem"], + _args_schema.certificate_pem = AAZStrArg( + options=["--certificate-pem"], arg_group="Properties", help="Gets or sets the CCF public service certificate in PEM format.", required=True, @@ -238,7 +238,7 @@ def content(self): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumEndpoint", AAZStrType, ".consortium_endpoint", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".consortium_service_certificate_pem", typ_kwargs={"flags": {"required": True}}) + properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".certificate_pem", typ_kwargs={"flags": {"required": True}}) properties.set_prop("member", AAZObjectType, ".member", typ_kwargs={"flags": {"required": True}}) member = _builder.get(".properties.member") diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py index 7b68d34410a..55026a84ff0 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_update.py @@ -19,7 +19,7 @@ class Update(AAZCommand): """Update a consortium view. :example: Update Consortium View - az managedcleanroom consortium-view update --resource-group testrg --consortium-view-name ContosoConsortiumView --consortium-endpoint https://ContosoEndpoint/ --consortium-service-certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" --tags "env=testing" + az managedcleanroom consortium-view update --resource-group testrg --consortium-view-name ContosoConsortiumView --consortium-endpoint https://ContosoEndpoint/ --certificate-pem Contoso certificate pem --member "{certificate-pem:membercertificate,signed-payload:membersignedpayload}" """ _aaz_info = { @@ -69,8 +69,8 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="Gets or sets the CCF endpoint.", ) - _args_schema.consortium_service_certificate_pem = AAZStrArg( - options=["--consortium-service-certificate-pem"], + _args_schema.certificate_pem = AAZStrArg( + options=["--certificate-pem"], arg_group="Properties", help="Gets or sets the CCF public service certificate in PEM format.", ) @@ -350,7 +350,7 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: properties.set_prop("consortiumEndpoint", AAZStrType, ".consortium_endpoint", typ_kwargs={"flags": {"required": True}}) - properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".consortium_service_certificate_pem", typ_kwargs={"flags": {"required": True}}) + properties.set_prop("consortiumServiceCertificatePem", AAZStrType, ".certificate_pem", typ_kwargs={"flags": {"required": True}}) properties.set_prop("member", AAZObjectType, ".member", typ_kwargs={"flags": {"required": True}}) member = _builder.get(".properties.member") From 68c73dd78c3b9cb5cf1ea6f4c579956875775f37 Mon Sep 17 00:00:00 2001 From: Kunal Karmakar Date: Thu, 26 Mar 2026 14:01:48 +0530 Subject: [PATCH 11/11] Update description --- src/managedcleanroom/HISTORY.rst | 2 +- .../aaz/latest/managedcleanroom/collaboration/_list.py | 2 +- .../aaz/latest/managedcleanroom/consortium/_list.py | 2 +- .../aaz/latest/managedcleanroom/consortium_view/_list.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/managedcleanroom/HISTORY.rst b/src/managedcleanroom/HISTORY.rst index 6a173bcf875..18f9909815c 100644 --- a/src/managedcleanroom/HISTORY.rst +++ b/src/managedcleanroom/HISTORY.rst @@ -14,4 +14,4 @@ Release History 1.0.0b3 ++++++ -* Update commands to reflect new API verson 2026-03-31-preview \ No newline at end of file +* Update commands to reflect new API version 2026-03-31-preview \ No newline at end of file diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py index 57f2374214b..e88a6e21ae7 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/collaboration/_list.py @@ -21,7 +21,7 @@ class List(AAZCommand): :example: List collaborations in subscription az managedcleanroom collaboration list - :example: List collaborations in subscription + :example: List collaborations in a resource group az managedcleanroom collaboration list --resource-group testrg """ diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py index 0d8644485b5..b0be6b3dbde 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium/_list.py @@ -21,7 +21,7 @@ class List(AAZCommand): :example: List consortiums in subscription az managedcleanroom consortium list - :example: List consortiums in subscription + :example: List consortiums in a resource group az managedcleanroom consortium list --resource-group testrg """ diff --git a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py index 44467fa1e6f..253f19b0c0c 100644 --- a/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py +++ b/src/managedcleanroom/azext_managedcleanroom/aaz/latest/managedcleanroom/consortium_view/_list.py @@ -21,7 +21,7 @@ class List(AAZCommand): :example: List consortium views in subscription az managedcleanroom consortium-view list - :example: List consortium views in subscription + :example: List consortium views in a resource group az managedcleanroom consortium-view list --resource-group testrg """