test(workspace): modified testcases for refactor

Author: isivaselvan

src/pytfe/resources/variable_sets.py

@@ -628,7 +628,6 @@ def _parse_variable_set(self, data: dict[str, Any]) -> VariableSet:
                             {
                                 "id": ws["id"],
                                 "name": f"workspace-{ws['id']}",  # Placeholder name
-                                "organization": "placeholder-org",  # Placeholder organization
                             }
                         )
         parsed_data["workspaces"] = workspaces

src/pytfe/resources/workspaces.py

@@ -125,14 +125,16 @@ def _ws_from(d: dict[str, Any]) -> Workspace:
                     DataRetentionPolicyDeleteOlder.model_validate(
                         {
                             "id": drp_data.get("id"),
-                            "delete-older-than-n-days": drp_data.get(
+                            "delete_older_than_n_days": drp_data.get(
                                 "attributes", {}
                             ).get("delete-older-than-n-days", 0),
                         }
                     )
                 )
                 data_retention_policy_choice = DataRetentionPolicyChoice.model_validate(
-                    data_retention_policy_delete_older
+                    {
+                        "data_retention_policy_delete_older": data_retention_policy_delete_older
+                    }
                 )
             elif drp_data.get("type") == "data-retention-policy-dont-deletes":
                 data_retention_policy_dont_delete = (
@@ -141,20 +143,22 @@ def _ws_from(d: dict[str, Any]) -> Workspace:
                     )
                 )
                 data_retention_policy_choice = DataRetentionPolicyChoice.model_validate(
-                    data_retention_policy_dont_delete
+                    {
+                        "data_retention_policy_dont_delete": data_retention_policy_dont_delete
+                    }
                 )
             elif drp_data.get("type") == "data-retention-policies":
                 # Legacy data retention policy
                 data_retention_policy = DataRetentionPolicy.model_validate(
                     {
                         "id": drp_data.get("id"),
-                        "delete-older-than-n-days": drp_data.get("attributes", {}).get(
+                        "delete_older_than_n_days": drp_data.get("attributes", {}).get(
                             "delete-older-than-n-days", 0
                         ),
                     }
                 )
                 data_retention_policy_choice = DataRetentionPolicyChoice.model_validate(
-                    data_retention_policy
+                    {"data_retention_policy": data_retention_policy}
                 )
 
     attr["id"] = d.get("id")

tests/units/test_run.py

@@ -162,7 +162,7 @@ def test_create_run_validation_errors(self, runs_service):
             runs_service.create(options)
 
         # Test terraform_version with non-plan-only run
-        workspace = Workspace(id="ws-123", name="test", organization="test-org")
+        workspace = Workspace(id="ws-123", name="test", organization=None)
         options = RunCreateOptions(
             workspace=workspace, terraform_version="1.5.0", plan_only=False
         )
@@ -199,7 +199,7 @@ def test_create_run_success(self, runs_service):
         with patch.object(runs_service, "t") as mock_transport:
             mock_transport.request.return_value = mock_response
 
-            workspace = Workspace(id="ws-123", name="test", organization="test-org")
+            workspace = Workspace(id="ws-123", name="test", organization=None)
             variables = [
                 RunVariable(key="env", value="test"),
                 RunVariable(key="region", value="us-east-1"),

tests/units/test_run_trigger.py

@@ -190,7 +190,7 @@ def test_create_run_trigger_validations(self, run_triggers_service):
         """Test create method with invalid workspace ID."""
 
         options = RunTriggerCreateOptions(
-            sourceable=Workspace(id="ws-source", name="source", organization="org")
+            sourceable=Workspace(id="ws-source", name="source", organization=None)
         )
 
         with pytest.raises(InvalidWorkspaceIDError):
@@ -201,7 +201,7 @@ def test_create_run_trigger_validations(self, run_triggers_service):
         # is raised when the service method checks for None sourceable
         # Create valid options but then manually set sourceable to None to bypass model validation
         options = RunTriggerCreateOptions(
-            sourceable=Workspace(id="ws-source", name="source", organization="org")
+            sourceable=Workspace(id="ws-source", name="source", organization=None)
         )
         options.sourceable = None
 
@@ -227,7 +227,7 @@ def test_create_run_trigger_success(self, run_triggers_service):
             mock_transport.request.return_value = mock_response
 
             options = RunTriggerCreateOptions(
-                sourceable=Workspace(id="ws-source", name="source", organization="org")
+                sourceable=Workspace(id="ws-source", name="source", organization=None)
             )
 
             result = run_triggers_service.create("ws-123", options)
@@ -340,7 +340,7 @@ def test_validate_run_trigger_filter_param_success(self, run_triggers_service):
     def test_backfill_deprecated_sourceable_already_exists(self, run_triggers_service):
         """Test backfill when sourceable already exists."""
 
-        workspace = Workspace(id="ws-1", name="workspace", organization="org")
+        workspace = Workspace(id="ws-1", name="workspace", organization=None)
         rt = RunTrigger(
             id="rt-1",
             created_at=datetime.now(),

tests/units/test_workspaces.py

@@ -33,7 +33,7 @@
 )
 from src.pytfe.models.project import Project
 from src.pytfe.models.workspace import (
-    VCSRepo,
+    VCSRepoOptions,
     Workspace,
     WorkspaceAddRemoteStateConsumersOptions,
     WorkspaceAddTagBindingsOptions,
@@ -304,7 +304,7 @@ def test_create_workspace_with_vcs(
             sample_workspace_response
         )
 
-        vcs_repo = VCSRepo(
+        vcs_repo = VCSRepoOptions(
             identifier="myorg/myrepo",
             branch="main",
             oauth_token_id="ot-123456",
@@ -316,7 +316,6 @@ def test_create_workspace_with_vcs(
             name="vcs-workspace",
             vcs_repo=vcs_repo,
             working_directory="terraform/",
-            # Remove trigger_prefixes to avoid conflict with tags_regex
         )
 
         workspace = workspaces_service.create("test-org", options=options)
@@ -611,11 +610,11 @@ def test_unassign_ssh_key(
     def test_ws_from_conversion(self, sample_workspace_response):
         """Test _ws_from helper function conversion."""
         workspace_data = sample_workspace_response["data"]
-        workspace = _ws_from(workspace_data, "test-org")
+        workspace = _ws_from(workspace_data)
 
         assert workspace.id == "ws-abc123def456"
         assert workspace.name == "test-workspace"
-        assert workspace.organization == "test-org"
+        assert workspace.organization is None
         assert workspace.auto_apply
         assert workspace.execution_mode == ExecutionMode.REMOTE
         assert workspace.resource_count == 25
@@ -633,11 +632,11 @@ def test_ws_from_minimal_data(self):
         """Test _ws_from with minimal data."""
         minimal_data = {"id": "ws-minimal", "attributes": {"name": "minimal-workspace"}}
 
-        workspace = _ws_from(minimal_data, "test-org")
+        workspace = _ws_from(minimal_data)
 
         assert workspace.id == "ws-minimal"
         assert workspace.name == "minimal-workspace"
-        assert workspace.organization == "test-org"
+        assert workspace.organization is None
         assert not workspace.auto_apply  # Default value
         assert not workspace.locked  # Default value
 
@@ -676,11 +675,11 @@ def test_none_values_handling(self):
             },
         }
 
-        workspace = _ws_from(data_with_nones, "test-org")
+        workspace = _ws_from(data_with_nones)
 
-        assert workspace.description == ""  # Should convert None to empty string
-        assert workspace.terraform_version == ""
-        assert workspace.working_directory == ""
+        assert workspace.description is None  # None values are preserved
+        assert workspace.terraform_version is None
+        assert workspace.working_directory is None
         assert workspace.vcs_repo is None
 
     # ==========================================
@@ -758,14 +757,13 @@ def test_list_remote_state_consumers_with_pagination(
         # Verify pagination parameters were passed
         call_args = mock_transport.request.call_args
         params = call_args[1]["params"]
-        assert params["page[number]"] == 1
         assert params["page[size]"] == 5
 
     def test_add_remote_state_consumers_basic(self, workspaces_service, mock_transport):
         """Test adding remote state consumers."""
         consumer_workspaces = [
-            Workspace(id="ws-consumer-1", name="consumer-1", organization="test-org"),
-            Workspace(id="ws-consumer-2", name="consumer-2", organization="test-org"),
+            Workspace(id="ws-consumer-1", name="consumer-1", organization=None),
+            Workspace(id="ws-consumer-2", name="consumer-2", organization=None),
         ]
 
         options = WorkspaceAddRemoteStateConsumersOptions(
@@ -806,7 +804,7 @@ def test_add_remote_state_consumers_validation_errors(self, workspaces_service):
 
         # Test invalid workspace ID format (with slash)
         options = WorkspaceAddRemoteStateConsumersOptions(
-            workspaces=[Workspace(id="ws-valid", name="valid", organization="test-org")]
+            workspaces=[Workspace(id="ws-valid", name="valid", organization=None)]
         )
 
         with pytest.raises(InvalidWorkspaceIDError):
@@ -817,7 +815,7 @@ def test_remove_remote_state_consumers_basic(
     ):
         """Test removing remote state consumers."""
         consumer_workspaces = [
-            Workspace(id="ws-consumer-1", name="consumer-1", organization="test-org"),
+            Workspace(id="ws-consumer-1", name="consumer-1", organization=None),
         ]
 
         options = WorkspaceRemoveRemoteStateConsumersOptions(
@@ -844,8 +842,8 @@ def test_update_remote_state_consumers_basic(
     ):
         """Test updating (replacing) remote state consumers."""
         consumer_workspaces = [
-            Workspace(id="ws-consumer-3", name="consumer-3", organization="test-org"),
-            Workspace(id="ws-consumer-4", name="consumer-4", organization="test-org"),
+            Workspace(id="ws-consumer-3", name="consumer-3", organization=None),
+            Workspace(id="ws-consumer-4", name="consumer-4", organization=None),
         ]
 
         options = WorkspaceUpdateRemoteStateConsumersOptions(
@@ -929,7 +927,6 @@ def test_list_tags_with_query_and_pagination(
         call_args = mock_transport.request.call_args
         params = call_args[1]["params"]
         assert params["name"] == "env"
-        assert params["page[number]"] == 1
         assert params["page[size]"] == 5
 
     def test_add_tags_basic(self, workspaces_service, mock_transport):