update allow_roleassignment_on_rg to be boolean

sdk/ml/azure-ai-ml/azure/ai/ml/_arm_deployments/arm_templates/workspace_base.json

@@ -425,10 +425,10 @@
         },
         "allowRoleAssignmentOnRG": {
             "type": "string",
-            "defaultValue": "Enabled",
+            "defaultValue": "true",
             "allowedValues": [
-                "Disabled",
-                "Enabled"
+                "true",
+                "false"
             ],
             "metadata": {
                 "description": "A flag to determine if workspace should be created/update with allow role assignment on resource group level."

sdk/ml/azure-ai-ml/azure/ai/ml/_arm_deployments/arm_templates/workspace_param.json

@@ -192,7 +192,7 @@
         "value": "false"
     },
     "allowRoleAssignmentOnRG": {
-        "value": "Enabled"
+        "value": "true"
     },
     "serverless_compute_settings": {
         "value": {}

sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2023_08_01_preview/models/_models.py

@@ -31621,6 +31621,8 @@ class Workspace(Resource):
     :vartype discovery_url: str
     :ivar enable_data_isolation:
     :vartype enable_data_isolation: bool
+    :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.  
+    :vartype allow_roleassignment_on_rg: bool
     :ivar encryption:
     :vartype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionProperty
     :ivar existing_workspaces:
@@ -31737,6 +31739,7 @@ class Workspace(Resource):
         'description': {'key': 'properties.description', 'type': 'str'},
         'discovery_url': {'key': 'properties.discoveryUrl', 'type': 'str'},
         'enable_data_isolation': {'key': 'properties.enableDataIsolation', 'type': 'bool'},
+        'allow_roleassignment_on_rg': {'key': 'properties.allowRoleAssignmentOnRG', 'type': 'bool'},
         'encryption': {'key': 'properties.encryption', 'type': 'EncryptionProperty'},
         'existing_workspaces': {'key': 'properties.existingWorkspaces', 'type': '[str]'},
         'feature_store_settings': {'key': 'properties.featureStoreSettings', 'type': 'FeatureStoreSettings'},
@@ -31804,6 +31807,8 @@ def __init__(
         :paramtype discovery_url: str
         :keyword enable_data_isolation:
         :paramtype enable_data_isolation: bool
+        :keyword allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.  
+        :paramtype allow_roleassignment_on_rg: bool
         :keyword encryption:
         :paramtype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionProperty
         :keyword existing_workspaces:
@@ -31875,6 +31880,7 @@ def __init__(
         self.description = kwargs.get('description', None)
         self.discovery_url = kwargs.get('discovery_url', None)
         self.enable_data_isolation = kwargs.get('enable_data_isolation', None)
+        self.allow_roleassignment_on_rg = kwargs.get('allow_roleassignment_on_rg', None)
         self.encryption = kwargs.get('encryption', None)
         self.existing_workspaces = kwargs.get('existing_workspaces', None)
         self.feature_store_settings = kwargs.get('feature_store_settings', None)
@@ -32319,9 +32325,8 @@ class WorkspaceUpdateParameters(msrest.serialization.Model):
     :vartype description: str
     :ivar enable_data_isolation:
     :vartype enable_data_isolation: bool
-    :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
-     include: "Enabled", "Disabled".    
-    :vartype allow_roleassignment_on_rg: str
+    :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.  
+    :vartype allow_roleassignment_on_rg: bool
     :ivar encryption:
     :vartype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionUpdateProperties
     :ivar feature_store_settings: Settings for feature store type workspace.
@@ -32376,7 +32381,7 @@ class WorkspaceUpdateParameters(msrest.serialization.Model):
         'soft_delete_retention_in_days': {'key': 'properties.softDeleteRetentionInDays', 'type': 'int'},
         'v1_legacy_mode': {'key': 'properties.v1LegacyMode', 'type': 'bool'},
         'system_datastores_auth_mode': {'key': 'properties.systemDatastoresAuthMode', 'type': 'str'},
-        'allow_roleassignment_on_rg' : {'Key': 'properties.allowRoleAssignmentOnRG', 'type': 'str'}
+        'allow_roleassignment_on_rg' : {'Key': 'properties.allowRoleAssignmentOnRG', 'type': 'bool'}
     }
 
     def __init__(
@@ -32400,9 +32405,8 @@ def __init__(
         :paramtype description: str
         :keyword enable_data_isolation:
         :paramtype enable_data_isolation: bool
-        :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
-         include: "Enabled", "Disabled".
-        :vartype allow_roleassignment_on_rg: str
+        :keyword allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
+        :paramtype allow_roleassignment_on_rg: bool
         :keyword encryption:
         :paramtype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionUpdateProperties
         :keyword feature_store_settings: Settings for feature store type workspace.

sdk/ml/azure-ai-ml/azure/ai/ml/_restclient/v2023_08_01_preview/models/_models_py3.py

@@ -34323,6 +34323,8 @@ class Workspace(Resource):
     :vartype discovery_url: str
     :ivar enable_data_isolation:
     :vartype enable_data_isolation: bool
+    :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
+    :vartype allow_roleassignment_on_rg: bool
     :ivar encryption:
     :vartype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionProperty
     :ivar existing_workspaces:
@@ -34439,6 +34441,7 @@ class Workspace(Resource):
         'description': {'key': 'properties.description', 'type': 'str'},
         'discovery_url': {'key': 'properties.discoveryUrl', 'type': 'str'},
         'enable_data_isolation': {'key': 'properties.enableDataIsolation', 'type': 'bool'},
+        'allow_roleassignment_on_rg': {'key': 'properties.allowRoleAssignmentOnRG', 'type': 'bool'},
         'encryption': {'key': 'properties.encryption', 'type': 'EncryptionProperty'},
         'existing_workspaces': {'key': 'properties.existingWorkspaces', 'type': '[str]'},
         'feature_store_settings': {'key': 'properties.featureStoreSettings', 'type': 'FeatureStoreSettings'},
@@ -34487,6 +34490,7 @@ def __init__(
         description: Optional[str] = None,
         discovery_url: Optional[str] = None,
         enable_data_isolation: Optional[bool] = None,
+        allow_roleassignment_on_rg: Optional[bool] = None,
         encryption: Optional["EncryptionProperty"] = None,
         existing_workspaces: Optional[List[str]] = None,
         feature_store_settings: Optional["FeatureStoreSettings"] = None,
@@ -34541,6 +34545,8 @@ def __init__(
         :paramtype discovery_url: str
         :keyword enable_data_isolation:
         :paramtype enable_data_isolation: bool
+        :keyword allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
+        :paramtype allow_roleassignment_on_rg: bool
         :keyword encryption:
         :paramtype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionProperty
         :keyword existing_workspaces:
@@ -34612,6 +34618,7 @@ def __init__(
         self.description = description
         self.discovery_url = discovery_url
         self.enable_data_isolation = enable_data_isolation
+        self.allow_roleassignment_on_rg = allow_roleassignment_on_rg
         self.encryption = encryption
         self.existing_workspaces = existing_workspaces
         self.feature_store_settings = feature_store_settings
@@ -35089,8 +35096,7 @@ class WorkspaceUpdateParameters(msrest.serialization.Model):
     :ivar enable_data_isolation:
     :vartype enable_data_isolation: bool
     :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
-     include: "Enabled", "Disabled".
-    :vartype allow_roleassignment_on_rg: str
+    :vartype allow_roleassignment_on_rg: bool
     :ivar encryption:
     :vartype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionUpdateProperties
     :ivar feature_store_settings: Settings for feature store type workspace.
@@ -35145,7 +35151,7 @@ class WorkspaceUpdateParameters(msrest.serialization.Model):
         'soft_delete_retention_in_days': {'key': 'properties.softDeleteRetentionInDays', 'type': 'int'},
         'v1_legacy_mode': {'key': 'properties.v1LegacyMode', 'type': 'bool'},
         'system_datastores_auth_mode': {'key': 'properties.systemDatastoresAuthMode', 'type': 'str'},
-        'allow_roleassignment_on_rg' : {'Key': 'properties.allowRoleAssignmentOnRG', 'type': 'str'}
+        'allow_roleassignment_on_rg' : {'Key': 'properties.allowRoleAssignmentOnRG', 'type': 'bool'}
     }
 
     def __init__(
@@ -35158,7 +35164,7 @@ def __init__(
         container_registry: Optional[str] = None,
         description: Optional[str] = None,
         enable_data_isolation: Optional[bool] = None,
-        allow_roleassignment_on_rg: Optional[str] = None,
+        allow_roleassignment_on_rg: Optional[bool] = None,
         encryption: Optional["EncryptionUpdateProperties"] = None,
         feature_store_settings: Optional["FeatureStoreSettings"] = None,
         friendly_name: Optional[str] = None,
@@ -35190,9 +35196,8 @@ def __init__(
         :paramtype description: str
         :keyword enable_data_isolation:
         :paramtype enable_data_isolation: bool
-        :ivar allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
-         include: "Enabled", "Disabled".
-        :vartype allow_roleassignment_on_rg: str
+        :keyword allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
+        :paramtype allow_roleassignment_on_rg: bool
         :keyword encryption:
         :paramtype encryption: ~azure.mgmt.machinelearningservices.models.EncryptionUpdateProperties
         :keyword feature_store_settings: Settings for feature store type workspace.

sdk/ml/azure-ai-ml/azure/ai/ml/_schema/workspace/workspace.py

@@ -43,5 +43,5 @@ class WorkspaceSchema(PathAwareSchema):
     workspace_hub = fields.Str(validate=validate_arm_str)
     managed_network = ExperimentalField(NestedField(ManagedNetworkSchema, unknown=EXCLUDE))
     enable_data_isolation = fields.Bool()
-    allow_roleassignment_on_rg = fields.Str()
+    allow_roleassignment_on_rg = fields.Bool()
     serverless_compute = NestedField(ServerlessComputeSettingsSchema)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_workspace/workspace.py

@@ -87,7 +87,7 @@ class Workspace(Resource):
         The flag can only be set at the creation phase, it can't be updated.
     :type enable_data_isolation: bool
     :param allow_roleassignment_on_rg: Determine whether we will allow workspace role assignment on resource group level.
-    :type allow_roleassignment_on_rg: str
+    :type allow_roleassignment_on_rg: bool
     :param serverless_compute: The serverless compute settings for the workspace.
     :type: ~azure.ai.ml.entities.ServerlessComputeSettings
     :param workspace_hub: Deprecated resource ID of an existing workspace hub to help create project workspace.
@@ -126,7 +126,7 @@ def __init__(
         managed_network: Optional[ManagedNetwork] = None,
         system_datastores_auth_mode: Optional[str] = None,
         enable_data_isolation: bool = False,
-        allow_roleassignment_on_rg: Optional[str] = None,
+        allow_roleassignment_on_rg: bool = True,
         hub_id: Optional[str] = None,  # Hidden input, surfaced by Project
         workspace_hub: Optional[str] = None,  # Deprecated input maintained for backwards compat.
         serverless_compute: Optional[ServerlessComputeSettings] = None,

sdk/ml/azure-ai-ml/azure/ai/ml/operations/_workspace_operations_base.py

@@ -643,8 +643,8 @@ def _populate_arm_parameters(self, workspace: Workspace, **kwargs: Any) -> Tuple
         if workspace.system_datastores_auth_mode:
             _set_val(param["systemDatastoresAuthMode"], workspace.system_datastores_auth_mode)
 
-        if workspace.allow_roleassignment_on_rg:
-            _set_val(param["allowRoleAssignmentOnRG"], workspace.allow_roleassignment_on_rg)
+        if not workspace.allow_roleassignment_on_rg:
+            _set_val(param["allowRoleAssignmentOnRG"], "false")
 
         if workspace.image_build_compute:
             _set_val(param["imageBuildCompute"], workspace.image_build_compute)

sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/workspaceRP.json

@@ -3394,7 +3394,7 @@
         },
         "allowRoleAssignmentOnRG": {
           "description": "Determine whether we will allow workspace role assignment on resource group level.",
-          "type": "string"
+          "type": "boolean"
         },
         "encryption": {
           "$ref": "#/definitions/EncryptionProperty"
@@ -3596,7 +3596,7 @@
         },
         "allowRoleAssignmentOnRG": {
           "description": "Determine whether we will allow workspace role assignment on resource group level.",
-          "type": "string"
+          "type": "boolean"
         },
         "encryption": {
           "$ref": "#/definitions/EncryptionUpdateProperties"

sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-01-01-preview/workspaceRP.json

@@ -4832,7 +4832,7 @@
         },
         "allowRoleAssignmentOnRG": {
           "description": "Determine whether we will allow workspace role assignment on resource group level.",
-          "type": "string"
+          "type": "boolean"
         },
         "enableSoftwareBillOfMaterials": {
           "description": "Flag to tell if SoftwareBillOfMaterial should be enabled for this workspace",
@@ -5045,7 +5045,7 @@
         },
         "allowRoleAssignmentOnRG": {
           "description": "Determine whether we will allow workspace role assignment on resource group level.",
-          "type": "string"
+          "type": "boolean"
         },
         "enableSoftwareBillOfMaterials": {
           "description": "Flag to tell if SoftwareBillOfMaterial should be enabled for this workspace",

sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json

@@ -6400,7 +6400,7 @@
           },
           "allowRoleAssignmentOnRG": {
             "description": "Determine whether we will allow workspace role assignment on resource group level.",
-            "type": "string"
+            "type": "boolean"
           },
           "enableSoftwareBillOfMaterials": {
             "description": "Flag to tell if SoftwareBillOfMaterials should be enabled for this workspace",
@@ -6613,7 +6613,7 @@
           },
           "allowRoleAssignmentOnRG": {
             "description": "Determine whether we will allow workspace role assignment on resource group level.",
-            "type": "string"
+            "type": "boolean"
           },
           "enableSoftwareBillOfMaterials": {
             "description": "Flag to tell if SoftwareBillOfMaterials should be enabled for this workspace",

sdk/ml/azure-ai-ml/swagger/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json

@@ -2606,7 +2606,7 @@
         },
         "allowRoleAssignmentOnRG": {
           "description": "Determine whether we will allow workspace role assignment on resource group level.",
-          "type": "string"
+          "type": "boolean"
         },
         "serverlessComputeSettings": {
           "description": "Settings for serverless compute created in the workspace",

sdk/ml/azure-ai-ml/tests/workspace/unittests/test_workspace_operations_base.py

@@ -153,15 +153,15 @@ def outgoing_get_call(rg, name):
                 ],
             )
             ws.system_datastores_auth_mode = "identity"
-            ws.allow_roleassignment_on_rg = "Enabled"
+            ws.allow_roleassignment_on_rg = True
             return ws._to_rest_object()
 
         mock_workspace_operation_base._operation.get.side_effect = outgoing_get_call
         ws = mock_workspace_operation_base.get(name="random_name", resource_group="rg")
         mock_workspace_operation_base._operation.get.assert_called_once()
 
         assert ws.system_datastores_auth_mode == "identity"
-        assert ws.allow_roleassignment_on_rg == "Enabled"
+        assert ws.allow_roleassignment_on_rg == True
 
         assert ws.managed_network is not None
         assert ws.managed_network.isolation_mode == IsolationMode.ALLOW_ONLY_APPROVED_OUTBOUND
@@ -223,7 +223,7 @@ def test_update(self, mock_workspace_operation_base: WorkspaceOperationsBase) ->
             ),
             managed_network=ManagedNetwork(),
             system_datastores_auth_mode="identity",
-            allow_roleassignment_on_rg="Enabled",
+            allow_roleassignment_on_rg=True,
             primary_user_assigned_identity="resource2",
             customer_managed_key=CustomerManagedKey(key_uri="new_cmk_uri"),
         )
@@ -248,7 +248,7 @@ def outgoing_call(rg, name, params, polling, cls):
             )
             assert params.managed_network.isolation_mode == "Disabled"
             assert params.system_datastores_auth_mode == "identity"
-            assert params.allow_roleassignment_on_rg == "Enabled"
+            assert params.allow_roleassignment_on_rg == True
             assert params.managed_network.outbound_rules == {}
             assert polling is True
             assert callable(cls)