From d36fba1c0445dab4c7097295836ef9fa6ece1656 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Wed, 18 Jun 2025 21:21:29 +0530
Subject: [PATCH 01/38] AAP-46677-updated-terraform.py

---
 plugins/modules/terraform.py | 146 ++++++++++++++++++++++++++++++++---
 1 file changed, 134 insertions(+), 12 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index c528a19a..0ec91677 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -50,6 +50,7 @@
   workspace:
     description:
       - The terraform workspace to work with.
+      - If not provided, the module will attempt to extract the workspace from the Terraform cloud configuration.
     type: str
     default: default
     version_added: 1.0.0
@@ -240,6 +241,12 @@
           unit_number: 3
     force_init: true
 
+- name: Auto-detect workspace from Terraform cloud configuration
+  cloud.terraform.terraform:
+    project_path: '{{ project_dir }}'
+    state: present
+    # workspace parameter omitted - will be auto-detected from .tf files
+
 ### Example directory structure for plugin_paths example
 # $ tree /path/to/plugins_dir_1
 # /path/to/plugins_dir_1/
@@ -289,7 +296,8 @@
 import dataclasses
 import os
 import tempfile
-from typing import List
+from typing import List, Optional, Tuple
+import re
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import integer_types
@@ -311,6 +319,81 @@
     preflight_validation,
 )
 
+def clean_tf_file(tf_content: str) -> str:
+    """
+    Cleans up the Terraform file content by removing comments and empty lines.
+    
+    Args:
+        tf_content: The content of the Terraform file as a string.
+        
+    Returns:
+        Cleaned Terraform file content as a string.
+    """
+    # Remove multiline comments (/* */)
+    content_no_multiline = re.sub(r'/\*.*?\*/', '', tf_content, flags=re.DOTALL)
+
+    # Remove single-line comments (# or //)
+    content_no_singleline = re.sub(r'(?m)^\s*(#|//).*$', '', content_no_multiline)
+
+    # Remove extra blank lines
+    cleaned_lines = [line for line in content_no_singleline.splitlines() if line.strip()]
+    return '\n'.join(cleaned_lines)
+    
+def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional[str], str]:
+    """
+    Extract workspace configuration from Terraform files.
+    
+    Returns:
+        Tuple of (workspace_name, terraform_offering)
+        - workspace_name: The workspace name found in cloud configuration, or None
+        - terraform_offering: "cloud" if cloud block found, "cli" otherwise
+    """
+    cloud_block_pattern = re.compile(r'cloud\s*{([^}]+)}', re.DOTALL | re.IGNORECASE)
+    workspaces_block_pattern = re.compile(r'workspaces\s*{([^}]+)}', re.DOTALL | re.IGNORECASE)
+    name_attr_pattern = re.compile(r'name\s*=\s*"([^"]+)"', re.IGNORECASE)
+    
+    exclude_files = {"vars.tf", "var.tf", "provider.tf", "variables.tf", "outputs.tf"}
+    
+    try:
+        if not os.path.exists(project_path):
+            return None, "cli"
+        
+        for filename in os.listdir(project_path):
+            if filename.endswith(".tf") and filename not in exclude_files:
+                filepath = os.path.join(project_path, filename)
+                try:
+                    with open(filepath, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                    content = clean_tf_file(content)    
+                    # Find the cloud {} block
+                    cloud_match = re.search(cloud_block_pattern,content)
+                    if cloud_match:
+                        cloud_content = cloud_match.group()
+                        
+                        # Find the workspaces {} block within the cloud block
+                        workspaces_match = re.search(workspaces_block_pattern,cloud_content)
+                        if workspaces_match:
+                            workspaces_content = workspaces_match.group()
+                            
+                            # Find the name attribute within the workspaces block
+                            name_match = re.search(name_attr_pattern,workspaces_content)
+                            if name_match:
+                                workspace_name = name_match.group(1)
+                                return workspace_name, "cloud"
+                        
+                        # If cloud block exists but no workspace name found, it's still cloud
+                        return None, "cloud"
+                    return None, "cli"  # No cloud block found, assume CLI mode
+                        
+                except (IOError, UnicodeDecodeError) as e:
+                    # Skip files that can't be read, continue with others
+                    continue
+                    
+    except OSError:
+        pass
+    
+    return None, "cli"
+
 
 def is_attribute_sensitive_in_providers_schema(
     schemas: TerraformProviderSchemaCollection, resource: TerraformModuleResource, attribute: str
@@ -493,6 +576,42 @@ def main() -> None:
     else:
         terraform_binary = module.get_bin_path("terraform", required=True)
 
+    cloud_workspace, terraform_offering = extract_workspace_from_terraform_config(project_path)
+
+    if terraform_offering is "cli" and workspace is not "default":
+        module.fail_json(
+            msg=(f"Workspace configuration conflict: The playbook specifies workspace "
+                 f"'{workspace}', but the Terraform CLI configuration does not support "
+                 f"explicit workspaces. Please remove the workspace parameter from the playbook "
+                 f"to use the CLI configuration.")
+        )
+
+    if terraform_offering == "cloud":
+        if cloud_workspace:
+            if workspace is not "default" and workspace != cloud_workspace:
+                module.fail_json(
+                    msg=(f"Workspace configuration conflict: The playbook specifies workspace "
+                         f"'{workspace}', but the Terraform cloud configuration "
+                         f"specifies '{cloud_workspace}'. Please ensure they match or remove "
+                         f"the workspace parameter from the playbook to use the cloud configuration.")
+                )
+            final_workspace = cloud_workspace
+            module.log(f"Using workspace '{final_workspace}' from Terraform cloud configuration")
+        elif workspace is not "default":
+            final_workspace = workspace
+            module.log(f"Using explicitly provided workspace '{final_workspace}' for Terraform cloud")
+        else:
+            final_workspace = "default"
+            module.log("Using default workspace for Terraform cloud configuration")
+    else:
+        final_workspace = workspace
+        if workspace == "default":
+            module.log("Using default workspace for Terraform CLI")
+        else:
+            module.log(f"Using explicitly provided workspace '{final_workspace}' for Terraform CLI")
+    
+    workspace = final_workspace
+
     terraform = TerraformCommands(module.run_command, project_path, terraform_binary, computed_check_mode)
 
     checked_version = terraform.version()
@@ -525,11 +644,14 @@ def main() -> None:
             module.warn(e.message)
             workspace_ctx = TerraformWorkspaceContext(current="default", all=[])
 
-        if workspace_ctx.current != workspace:
-            if workspace not in workspace_ctx.all:
-                terraform.workspace(WorkspaceCommand.NEW, workspace)
-            else:
-                terraform.workspace(WorkspaceCommand.SELECT, workspace)
+        if terraform_offering == "cloud":
+            module.log("Terraform Cloud detected - workspace management handled by cloud configuration")
+        else:
+            if workspace_ctx.current != workspace:
+                if workspace not in workspace_ctx.all:
+                    terraform.workspace(WorkspaceCommand.NEW, workspace)
+                else:
+                    terraform.workspace(WorkspaceCommand.SELECT, workspace)
 
         variables_args = []
         if complex_vars:
@@ -607,7 +729,7 @@ def main() -> None:
                 needs_application=plan_file_needs_application,
             )
         except TerraformError as e:
-            if not computed_check_mode:
+            if not computed_check_mode and terraform_offering != "cloud":
                 if workspace_ctx.current != workspace:
                     terraform.workspace(WorkspaceCommand.SELECT, workspace_ctx.current)
             raise e
@@ -631,11 +753,11 @@ def main() -> None:
             workspace=workspace,
         )
 
-        # Restore the Terraform workspace found when running the module
-        if workspace_ctx.current != workspace:
-            terraform.workspace(WorkspaceCommand.SELECT, workspace_ctx.current)
-        if computed_state == "absent" and workspace != "default" and purge_workspace is True:
-            terraform.workspace(WorkspaceCommand.DELETE, workspace)
+        if terraform_offering != "cloud":
+            if workspace_ctx.current != workspace:
+                terraform.workspace(WorkspaceCommand.SELECT, workspace_ctx.current)
+            if computed_state == "absent" and workspace != "default" and purge_workspace is True:
+                terraform.workspace(WorkspaceCommand.DELETE, workspace)
 
         diff = dict(
             before=dataclasses.asdict(initial_state) if initial_state is not None else {},

From a21e7509340421f674322d4159b8f34cdbbead08 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 12:01:21 +0530
Subject: [PATCH 02/38] AAP-46677-updated-terraform.py-conditions

---
 plugins/modules/terraform.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 0ec91677..50daa339 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -578,7 +578,7 @@ def main() -> None:
 
     cloud_workspace, terraform_offering = extract_workspace_from_terraform_config(project_path)
 
-    if terraform_offering is "cli" and workspace is not "default":
+    if terraform_offering == "cli" and workspace != "default":
         module.fail_json(
             msg=(f"Workspace configuration conflict: The playbook specifies workspace "
                  f"'{workspace}', but the Terraform CLI configuration does not support "
@@ -588,7 +588,7 @@ def main() -> None:
 
     if terraform_offering == "cloud":
         if cloud_workspace:
-            if workspace is not "default" and workspace != cloud_workspace:
+            if workspace != "default" and workspace != cloud_workspace:
                 module.fail_json(
                     msg=(f"Workspace configuration conflict: The playbook specifies workspace "
                          f"'{workspace}', but the Terraform cloud configuration "
@@ -597,7 +597,7 @@ def main() -> None:
                 )
             final_workspace = cloud_workspace
             module.log(f"Using workspace '{final_workspace}' from Terraform cloud configuration")
-        elif workspace is not "default":
+        elif workspace != "default":
             final_workspace = workspace
             module.log(f"Using explicitly provided workspace '{final_workspace}' for Terraform cloud")
         else:

From f98b0f1bd9aae3f6a1f59d6581c6e374c8ed4722 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 15:59:02 +0530
Subject: [PATCH 03/38] AAP-46677-fixed-black-errors

---
 plugins/modules/terraform.py | 70 +++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 50daa339..9b0fd1d4 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -319,79 +319,81 @@
     preflight_validation,
 )
 
+
 def clean_tf_file(tf_content: str) -> str:
     """
     Cleans up the Terraform file content by removing comments and empty lines.
-    
+
     Args:
         tf_content: The content of the Terraform file as a string.
-        
+
     Returns:
         Cleaned Terraform file content as a string.
     """
     # Remove multiline comments (/* */)
-    content_no_multiline = re.sub(r'/\*.*?\*/', '', tf_content, flags=re.DOTALL)
+    content_no_multiline = re.sub(r"/\*.*?\*/", "", tf_content, flags=re.DOTALL)
 
     # Remove single-line comments (# or //)
-    content_no_singleline = re.sub(r'(?m)^\s*(#|//).*$', '', content_no_multiline)
+    content_no_singleline = re.sub(r"(?m)^\s*(#|//).*$", "", content_no_multiline)
 
     # Remove extra blank lines
     cleaned_lines = [line for line in content_no_singleline.splitlines() if line.strip()]
-    return '\n'.join(cleaned_lines)
-    
+    return "\n".join(cleaned_lines)
+
+
 def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional[str], str]:
     """
     Extract workspace configuration from Terraform files.
-    
+
     Returns:
         Tuple of (workspace_name, terraform_offering)
         - workspace_name: The workspace name found in cloud configuration, or None
         - terraform_offering: "cloud" if cloud block found, "cli" otherwise
     """
-    cloud_block_pattern = re.compile(r'cloud\s*{([^}]+)}', re.DOTALL | re.IGNORECASE)
-    workspaces_block_pattern = re.compile(r'workspaces\s*{([^}]+)}', re.DOTALL | re.IGNORECASE)
+    cloud_block_pattern = re.compile(r"cloud\s*{([^}]+)}", re.DOTALL | re.IGNORECASE)
+    workspaces_block_pattern = re.compile(r"workspaces\s*{([^}]+)}", re.DOTALL | re.IGNORECASE)
     name_attr_pattern = re.compile(r'name\s*=\s*"([^"]+)"', re.IGNORECASE)
-    
+
     exclude_files = {"vars.tf", "var.tf", "provider.tf", "variables.tf", "outputs.tf"}
-    
+
     try:
         if not os.path.exists(project_path):
             return None, "cli"
-        
+
         for filename in os.listdir(project_path):
             if filename.endswith(".tf") and filename not in exclude_files:
                 filepath = os.path.join(project_path, filename)
                 try:
-                    with open(filepath, 'r', encoding='utf-8') as f:
+                    with open(filepath, "r", encoding="utf-8") as f:
                         content = f.read()
-                    content = clean_tf_file(content)    
+                    content = clean_tf_file(content)
                     # Find the cloud {} block
-                    cloud_match = re.search(cloud_block_pattern,content)
+                    cloud_match = re.search(cloud_block_pattern, content)
                     if cloud_match:
                         cloud_content = cloud_match.group()
-                        
+
                         # Find the workspaces {} block within the cloud block
-                        workspaces_match = re.search(workspaces_block_pattern,cloud_content)
+                        workspaces_match = re.search(workspaces_block_pattern, cloud_content)
                         if workspaces_match:
                             workspaces_content = workspaces_match.group()
-                            
+
                             # Find the name attribute within the workspaces block
-                            name_match = re.search(name_attr_pattern,workspaces_content)
+                            name_match = re.search(name_attr_pattern, workspaces_content)
                             if name_match:
                                 workspace_name = name_match.group(1)
                                 return workspace_name, "cloud"
-                        
+
                         # If cloud block exists but no workspace name found, it's still cloud
                         return None, "cloud"
                     return None, "cli"  # No cloud block found, assume CLI mode
-                        
+
                 except (IOError, UnicodeDecodeError) as e:
                     # Skip files that can't be read, continue with others
                     continue
-                    
+
     except OSError:
         pass
-    
+
     return None, "cli"
 
 
@@ -580,20 +582,24 @@ def main() -> None:
 
     if terraform_offering == "cli" and workspace != "default":
         module.fail_json(
-            msg=(f"Workspace configuration conflict: The playbook specifies workspace "
-                 f"'{workspace}', but the Terraform CLI configuration does not support "
-                 f"explicit workspaces. Please remove the workspace parameter from the playbook "
-                 f"to use the CLI configuration.")
+            msg=(
+                f"Workspace configuration conflict: The playbook specifies workspace "
+                f"'{workspace}', but the Terraform CLI configuration does not support "
+                f"explicit workspaces. Please remove the workspace parameter from the playbook "
+                f"to use the CLI configuration."
+            )
         )
 
     if terraform_offering == "cloud":
         if cloud_workspace:
             if workspace != "default" and workspace != cloud_workspace:
                 module.fail_json(
-                    msg=(f"Workspace configuration conflict: The playbook specifies workspace "
-                         f"'{workspace}', but the Terraform cloud configuration "
-                         f"specifies '{cloud_workspace}'. Please ensure they match or remove "
-                         f"the workspace parameter from the playbook to use the cloud configuration.")
+                    msg=(
+                        f"Workspace configuration conflict: The playbook specifies workspace "
+                        f"'{workspace}', but the Terraform cloud configuration "
+                        f"specifies '{cloud_workspace}'. Please ensure they match or remove "
+                        f"the workspace parameter from the playbook to use the cloud configuration."
+                    )
                 )
             final_workspace = cloud_workspace
             module.log(f"Using workspace '{final_workspace}' from Terraform cloud configuration")
@@ -609,7 +615,7 @@ def main() -> None:
             module.log("Using default workspace for Terraform CLI")
         else:
             module.log(f"Using explicitly provided workspace '{final_workspace}' for Terraform CLI")
-    
+
     workspace = final_workspace
 
     terraform = TerraformCommands(module.run_command, project_path, terraform_binary, computed_check_mode)

From 53ea46cf2d512a0ade211f3e7eb850cd60f2e63e Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 16:36:28 +0530
Subject: [PATCH 04/38] AAP-46677-samll fixes

---
 plugins/modules/terraform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 9b0fd1d4..724782ea 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -387,7 +387,7 @@ def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional
                         return None, "cloud"
                     return None, "cli"  # No cloud block found, assume CLI mode
 
-                except (IOError, UnicodeDecodeError) as e:
+                except (IOError, UnicodeDecodeError):
                     # Skip files that can't be read, continue with others
                     continue
 

From 138ad230431cf320057a773aa87775dff050d2b0 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 17:15:49 +0530
Subject: [PATCH 05/38] AAP-46677-isort-fixes

---
 plugins/modules/terraform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 724782ea..2784d649 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -295,9 +295,9 @@
 
 import dataclasses
 import os
+import re
 import tempfile
 from typing import List, Optional, Tuple
-import re
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import integer_types

From 58bd19f9574173a9e7898781941b2a3dbf25336c Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 20:10:23 +0530
Subject: [PATCH 06/38] AAP-46677-updated changelogs

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 384c501e..b610cf73 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,7 +10,7 @@ v3.1.0
 Release Summary
 ---------------
 
-This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin.
+This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin and ``terraform`` module plugin.
 
 Minor Changes
 -------------
@@ -19,6 +19,7 @@ Minor Changes
 - inventory/terraform_provider - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
 - inventory/terraform_state - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
 - inventory/terraform_state - Support for custom Terraform providers (https://github.com/ansible-collections/cloud.terraform/pull/146).
+- modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
 
 Bugfixes
 --------

From 052940e66c8d11424706997dce3309b66478d3b0 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Thu, 19 Jun 2025 20:12:07 +0530
Subject: [PATCH 07/38] AAP-46677-updated-changelog.yaml

---
 changelogs/changelog.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 23f064a5..e54f46c2 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -154,8 +154,9 @@ releases:
       - inventory/terraform_provider - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Support for custom Terraform providers (https://github.com/ansible-collections/cloud.terraform/pull/146).
-      release_summary: This release includes bug fixes and new feature for the ``terraform_state``
-        inventory plugin.
+      - modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
+      release_summary: This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin and ``terraform`` module plugin.
+
     fragments:
     - 161-bump-ansible-lint-version.yml
     - 20240527-roles-add-description.yml

From 1863897086b7a72bb6389f193234cc3a16b5bb23 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Fri, 20 Jun 2025 13:30:24 +0530
Subject: [PATCH 08/38] AAP-46677-updated-docs

---
 plugins/modules/terraform.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 2784d649..ca6d1e3a 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -49,8 +49,11 @@
     version_added: 1.0.0
   workspace:
     description:
-      - The terraform workspace to work with.
-      - If not provided, the module will attempt to extract the workspace from the Terraform cloud configuration.
+    - If specified, this workspace will be used for all operations, provided it matches the workspace defined in the Terraform Cloud configuration.
+    - If the specified workspace does not match the one in the Terraform Cloud configuration, an error will be raised.
+    - If not specified, the module will attempt to determine the workspace from the Terraform Cloud configuration.
+    - If a workspace is set in the playbook but not defined in the Terraform Cloud configuration, an error will be raised.
+    - If no workspace is specified in both the playbook and the Terraform Cloud configuration, the module will default to using the Terraform CLI mode.
     type: str
     default: default
     version_added: 1.0.0
@@ -241,7 +244,13 @@
           unit_number: 3
     force_init: true
 
-- name: Auto-detect workspace from Terraform cloud configuration
+- name:  Using workspace from playbook for Terraform Cloud/Enterprise
+  cloud.terraform.terraform:
+    project_path: '{{ project_dir }}'
+    state: present
+    workspace: 'my_workspace' #workspace must match and exist in Terraform cloud configuration 
+
+- name: Auto-detect workspace from Terraform cloud configuration for Terraform Cloud/Enterprise
   cloud.terraform.terraform:
     project_path: '{{ project_dir }}'
     state: present

From f8e2d4a56c964ac41ffac69f314840ee76566a01 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Fri, 20 Jun 2025 13:36:09 +0530
Subject: [PATCH 09/38] AAP-46677-Fixed-Lint-Errors

---
 plugins/modules/terraform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index ca6d1e3a..6753bdb4 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -244,11 +244,11 @@
           unit_number: 3
     force_init: true
 
-- name:  Using workspace from playbook for Terraform Cloud/Enterprise
+- name: Using workspace from playbook for Terraform Cloud/Enterprise
   cloud.terraform.terraform:
     project_path: '{{ project_dir }}'
     state: present
-    workspace: 'my_workspace' #workspace must match and exist in Terraform cloud configuration 
+    workspace: 'my_workspace' # workspace must match and exist in Terraform cloud configuration.
 
 - name: Auto-detect workspace from Terraform cloud configuration for Terraform Cloud/Enterprise
   cloud.terraform.terraform:

From 271a7f0f3ac0a3979e29d76d8ddd847c9f9a9ed3 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Fri, 20 Jun 2025 13:46:24 +0530
Subject: [PATCH 10/38] AAP-46677-updated-changelogs-fragments

---
 .../20250620-modules-terraform-update-workspace-logic.yml      | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml

diff --git a/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml b/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml
new file mode 100644
index 00000000..5b7196e0
--- /dev/null
+++ b/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194)

From 78845ed8064068188fa1c56c09fed97d96bef85a Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Fri, 20 Jun 2025 18:24:06 +0530
Subject: [PATCH 11/38] AAP-46677-fixed-cli-logic

---
 plugins/modules/terraform.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 6753bdb4..aa3c1c36 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -589,16 +589,6 @@ def main() -> None:
 
     cloud_workspace, terraform_offering = extract_workspace_from_terraform_config(project_path)
 
-    if terraform_offering == "cli" and workspace != "default":
-        module.fail_json(
-            msg=(
-                f"Workspace configuration conflict: The playbook specifies workspace "
-                f"'{workspace}', but the Terraform CLI configuration does not support "
-                f"explicit workspaces. Please remove the workspace parameter from the playbook "
-                f"to use the CLI configuration."
-            )
-        )
-
     if terraform_offering == "cloud":
         if cloud_workspace:
             if workspace != "default" and workspace != cloud_workspace:

From a2a22f2428864833f45703870cd587a5dcafb7b2 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 13:26:09 +0530
Subject: [PATCH 12/38] AAP-46677-added-test-cases

---
 tests/integration/targets/test_tfc/aliases    |   2 +
 .../targets/test_tfc/files/main.tf            |  36 +++++
 .../targets/test_tfc/tasks/main.yml           | 142 ++++++++++++++++++
 3 files changed, 180 insertions(+)
 create mode 100644 tests/integration/targets/test_tfc/aliases
 create mode 100644 tests/integration/targets/test_tfc/files/main.tf
 create mode 100644 tests/integration/targets/test_tfc/tasks/main.yml

diff --git a/tests/integration/targets/test_tfc/aliases b/tests/integration/targets/test_tfc/aliases
new file mode 100644
index 00000000..621116d8
--- /dev/null
+++ b/tests/integration/targets/test_tfc/aliases
@@ -0,0 +1,2 @@
+# reason: missing policy and credentials
+unsupported
diff --git a/tests/integration/targets/test_tfc/files/main.tf b/tests/integration/targets/test_tfc/files/main.tf
new file mode 100644
index 00000000..92ccf9c5
--- /dev/null
+++ b/tests/integration/targets/test_tfc/files/main.tf
@@ -0,0 +1,36 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.16"
+    }
+  }
+  required_version = ">= 1.10.0"
+  cloud {
+    organization = "Ansible-BU-TFC"
+    hostname = "app.terraform.io"
+    workspaces { 
+      name = "my_tf_project_default"
+    }
+  }
+}
+provider "aws" {
+  region     = "us-west-2"
+  # In real scenarios, you would use environment variables or a credentials file for security.
+  # Access key and secret key are necessary only for testing locally. In GH Pipelines, these will be set using CI Keys.
+  access_key = "your_access_key"
+  secret_key = "your_secret_key"
+}
+
+resource "aws_instance" "app_server_tf" {
+  ami           = "ami-830c94e3"
+  instance_type = "t2.micro"
+
+  tags = {
+    Name = "Instance_Cloud_TF"
+  }
+}
+
+output "my_output" {
+  value = resource.aws_instance.app_server_tf
+}
\ No newline at end of file
diff --git a/tests/integration/targets/test_tfc/tasks/main.yml b/tests/integration/targets/test_tfc/tasks/main.yml
new file mode 100644
index 00000000..14058e57
--- /dev/null
+++ b/tests/integration/targets/test_tfc/tasks/main.yml
@@ -0,0 +1,142 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+- environment: 
+    TF_TOKEN_app_terraform_io: "your-token-here"
+    # Replace with your actual AWS secret access key when running the integration tests locally
+    AWS_ACCESS_KEY_ID: "your-access-key-id-here"
+    AWS_SECRET_ACCESS_KEY: "your-secret-access-key-here"
+
+  block:
+    - set_fact:
+        test_basedir: "{{ test_basedir | default(output_dir) }}"
+        resource_id: "vpc"
+
+    - name: Copy terraform files to work space
+      ansible.builtin.copy:
+        src: "{{ item }}"
+        dest: "{{ test_basedir }}/{{ item }}"
+      loop:
+        - main.tf
+
+    - name: Terraform in present check mode
+      cloud.terraform.terraform:
+        project_path: "{{ test_basedir }}"
+        state: present
+        workspace: "my_tf_project_default"
+        force_init: true
+      check_mode: true
+      register: terraform_result
+
+    - name: Verify Instance_Cloud_TF doesnt exist
+      amazon.aws.ec2_instance_info:
+        region: us-west-2
+        filters:
+          "tag:Name": Instance_Cloud_TF
+          "instance-state-name": running
+      register: instance_info
+
+    - assert:
+        that:
+          - instance_info.instances | length == 0
+        fail_msg: "Instance_Cloud_TF should not exist in check mode"
+
+    - name: TF deploy of a service
+      cloud.terraform.terraform:
+        project_path:  "{{ test_basedir }}"
+        state: present
+        force_init: true
+        workspace: "my_tf_project_default"
+      register: terraform_result1
+
+    - name: Verify Instance_Cloud_TF exist
+      amazon.aws.ec2_instance_info:
+        region: us-west-2
+        filters:
+          "tag:Name": Instance_Cloud_TF
+          "instance-state-name": running
+      register: instance_info2
+
+    - assert:
+        that:
+          - instance_info2.instances | length == 1
+        fail_msg: "Instance_Cloud_TF should exist after deployment"
+
+    - name: TF destroy of a service
+      cloud.terraform.terraform:
+        project_path:  "{{ test_basedir }}"
+        state: absent
+        force_init: true
+        workspace: "my_tf_project_default"
+      register: terraform_result3 
+
+    - name: Verify Instance_Cloud_TF doesnt exist
+      amazon.aws.ec2_instance_info:
+        region: us-west-2
+        filters:
+          "tag:Name": Instance_Cloud_TF
+          "instance-state-name": running
+      register: instance_info3
+
+    - assert:
+        that:
+          - instance_info3.instances | length == 0
+        fail_msg: "Instance_Cloud_TF should be destroyed after TF destroy operation"
+
+    - name: TF deploy of a service without giving workspace in the playbook
+      cloud.terraform.terraform:
+        project_path:  "{{ test_basedir }}"
+        state: present
+        force_init: true
+      register: terraform_result4
+
+    - name: Verify Instance_Cloud_TF exist
+      amazon.aws.ec2_instance_info:
+        region: us-west-2
+        filters:
+          "tag:Name": Instance_Cloud_TF
+          "instance-state-name": running
+      register: instance_info4
+
+    - assert:
+        that:
+          - instance_info4.instances | length == 1
+        fail_msg: "Instance_Cloud_TF should exist after deployment"
+
+    - name: TF destroy of a service
+      cloud.terraform.terraform:
+        project_path:  "{{ test_basedir }}"
+        state: absent
+        force_init: true
+      register: terraform_result4
+
+    - name: Verify Instance_Cloud_TF doesnt exist
+      amazon.aws.ec2_instance_info:
+        region: us-west-2
+        filters:
+          "tag:Name": Instance_Cloud_TF
+          "instance-state-name": running
+      register: instance_info4
+
+    - assert:
+        that:
+          - instance_info4.instances | length == 0
+        fail_msg: "Instance_Cloud_TF should be destroyed after TF destroy operation"
+
+    - name: TF deploy of a service with mismatched workspace
+      cloud.terraform.terraform:
+        project_path: "{{ test_basedir }}"
+        state: present
+        workspace: "nonexistent_workspace"
+        force_init: true
+      register: terraform_negative_test
+      failed_when: false
+
+    - name: Assert failure occurred as expected
+      assert:
+        that:
+          - "'Workspace configuration conflict' in terraform_negative_test.msg"
+        success_msg: "Terraform failed as expected for invalid workspace"
+        fail_msg: "Terraform unexpectedly succeeded for invalid workspace"
+

From 168b24137c63e48a861f1dcb9b6ceaf0c621f5a0 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 13:32:40 +0530
Subject: [PATCH 13/38] AAP-46677-fixed lint-errors

---
 tests/integration/targets/test_tfc/tasks/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/integration/targets/test_tfc/tasks/main.yml b/tests/integration/targets/test_tfc/tasks/main.yml
index 14058e57..90ef0bc9 100644
--- a/tests/integration/targets/test_tfc/tasks/main.yml
+++ b/tests/integration/targets/test_tfc/tasks/main.yml
@@ -139,4 +139,3 @@
           - "'Workspace configuration conflict' in terraform_negative_test.msg"
         success_msg: "Terraform failed as expected for invalid workspace"
         fail_msg: "Terraform unexpectedly succeeded for invalid workspace"
-

From e4796c0276e2bbb082e20bf1d8fa040e47a475d9 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 13:42:57 +0530
Subject: [PATCH 14/38] AAP-46677-updated-aliases

---
 tests/integration/targets/test_tfc/aliases | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/targets/test_tfc/aliases b/tests/integration/targets/test_tfc/aliases
index 621116d8..64cd16eb 100644
--- a/tests/integration/targets/test_tfc/aliases
+++ b/tests/integration/targets/test_tfc/aliases
@@ -1,2 +1,2 @@
-# reason: missing policy and credentials
-unsupported
+disabled # Require a HCP configuration account
+cloud/aws

From 0f04838357869c07a7ec940afef9f499292d8b0b Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:08:00 +0530
Subject: [PATCH 15/38] AAP-46677-updated-test_terraform.py

---
 tests/unit/plugins/modules/test_terraform.py | 470 +++++++++++++++++++
 1 file changed, 470 insertions(+)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index d3dc23d0..a797ce7c 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -3,6 +3,8 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from unittest.mock import mock_open
+
 import pytest
 from ansible_collections.cloud.terraform.plugins.module_utils.models import (
     TerraformAttributeSpec,
@@ -19,12 +21,15 @@
     TerraformSimpleAttributeSpec,
 )
 from ansible_collections.cloud.terraform.plugins.modules.terraform import (
+    clean_tf_file,
+    extract_workspace_from_terraform_config,
     filter_outputs,
     filter_resource_attributes,
     is_attribute_in_sensitive_values,
     is_attribute_sensitive_in_providers_schema,
     sanitize_state,
 )
+from requests import patch
 
 
 @pytest.fixture
@@ -593,3 +598,468 @@ def test_from_json_nested(self):
         terraform_attribute_spec = TerraformAttributeSpec.from_json(resource)
 
         assert terraform_attribute_spec == expected_terraform_attribute_spec
+
+
+class TestCleanTfFile:
+    """Test cases for the clean_tf_file function."""
+
+    def test_remove_single_line_comments_hash(self):
+        """Test removal of single-line comments starting with #."""
+        tf_content = """
+resource "aws_instance" "example" {
+  # This is a comment
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+  # Another comment
+}
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_remove_single_line_comments_double_slash(self):
+        """Test removal of single-line comments starting with //."""
+        tf_content = """
+resource "aws_instance" "example" {
+  // This is a comment
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+  // Another comment
+}
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_remove_multiline_comments(self):
+        """Test removal of multiline comments /* */."""
+        tf_content = """
+resource "aws_instance" "example" {
+  /* This is a 
+     multiline comment */
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+  /* Another multiline
+     comment here */
+}
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_remove_mixed_comments(self):
+        """Test removal of mixed comment types."""
+        tf_content = """
+# Top level comment
+resource "aws_instance" "example" {
+  /* Multiline comment
+     spanning multiple lines */
+  ami           = "ami-12345678"  # Inline hash comment
+  instance_type = "t2.micro"     // Inline double slash comment
+  # Another hash comment
+}
+// Bottom comment
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_preserve_strings_with_comment_chars(self):
+        """Test that comment characters inside strings are preserved."""
+        tf_content = """
+resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  user_data     = "#!/bin/bash\\necho 'Hello # World // Test'"
+  instance_type = "t2.micro"
+}
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  user_data     = "#!/bin/bash\\necho 'Hello # World // Test'"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_remove_empty_lines(self):
+        """Test removal of empty lines and lines with only whitespace."""
+        tf_content = """
+
+resource "aws_instance" "example" {
+
+  ami           = "ami-12345678"
+    
+  instance_type = "t2.micro"
+
+}
+
+"""
+        expected = """resource "aws_instance" "example" {
+  ami           = "ami-12345678"
+  instance_type = "t2.micro"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_empty_string(self):
+        """Test handling of empty string input."""
+        tf_content = ""
+        expected = ""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_only_comments(self):
+        """Test file with only comments."""
+        tf_content = """
+# This is a comment
+// Another comment
+/* Multiline
+   comment */
+"""
+        expected = ""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+    def test_nested_multiline_comments(self):
+        """Test handling of nested-like multiline comments."""
+        tf_content = """
+resource "aws_instance" "example" {
+  /* Comment with /* nested-like */ content */
+  ami = "ami-12345678"
+}
+"""
+        expected = """resource "aws_instance" "example" {
+  ami = "ami-12345678"
+}"""
+
+        result = clean_tf_file(tf_content)
+        assert result == expected
+
+
+# class TestExtractWorkspaceFromTerraformConfig:
+#     """Test cases for the extract_workspace_from_terraform_config function."""
+
+#     def test_nonexistent_directory(self):
+#         """Test handling of nonexistent project directory."""
+#         result = extract_workspace_from_terraform_config("/nonexistent/path")
+#         assert result == (None, "cli")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_terraform_files_no_cloud_block(self, mock_file, mock_listdir, mock_exists):
+#         """Test .tf files without cloud block."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# resource "aws_instance" "example" {
+#   ami           = "ami-12345678"
+#   instance_type = "t2.micro"
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/no/cloud/block")
+#         assert result == (None, "cli")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_cloud_block_with_workspace_name(self, mock_file, mock_listdir, mock_exists):
+#         """Test cloud block with workspace name."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "my-workspace"
+#     }
+#   }
+# }
+
+# resource "aws_instance" "example" {
+#   ami           = "ami-12345678"
+#   instance_type = "t2.micro"
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/with/workspace")
+#         assert result == ("my-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_cloud_block_without_workspace_name(self, mock_file, mock_listdir, mock_exists):
+#         """Test cloud block without workspace name."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#   }
+# }
+
+# resource "aws_instance" "example" {
+#   ami           = "ami-12345678"
+#   instance_type = "t2.micro"
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/cloud/no/workspace")
+#         assert result == (None, "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_cloud_block_with_comments(self, mock_file, mock_listdir, mock_exists):
+#         """Test cloud block with comments that should be cleaned."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   # This is a comment
+#   cloud {
+#     organization = "my-org"
+#     /* This is a multiline
+#        comment */
+#     workspaces {
+#       name = "production-workspace"  // Inline comment
+#     }
+#   }
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/with/comments")
+#         assert result == ("production-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_multiple_terraform_files_first_has_cloud(self, mock_file, mock_listdir, mock_exists):
+#         """Test multiple .tf files where first file has cloud block."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf", "variables.tf", "backend.tf"]
+
+#         # Mock file reads - main.tf has cloud block
+#         def side_effect(*args, **kwargs):
+#             filename = args[0]
+#             if "main.tf" in filename:
+#                 mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "dev-workspace"
+#     }
+#   }
+# }
+# """
+#             else:
+#                 mock_file.return_value.read.return_value = "# Just variables"
+#             return mock_file.return_value
+
+#         mock_file.side_effect = side_effect
+
+#         result = extract_workspace_from_terraform_config("/multiple/files")
+#         assert result == ("dev-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_excluded_files_ignored(self, mock_file, mock_listdir, mock_exists):
+#         """Test that excluded files (vars.tf, var.tf, etc.) are ignored."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["vars.tf", "var.tf", "provider.tf", "variables.tf", "outputs.tf", "main.tf"]
+
+#         def side_effect(*args, **kwargs):
+#             filename = args[0]
+#             if "main.tf" in filename:
+#                 mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "test-workspace"
+#     }
+#   }
+# }
+# """
+#             else:
+#                 # These shouldn't be read due to exclusion
+#                 mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "wrong-org"
+#     workspaces {
+#       name = "wrong-workspace"
+#     }
+#   }
+# }
+# """
+#             return mock_file.return_value
+
+#         mock_file.side_effect = side_effect
+
+#         result = extract_workspace_from_terraform_config("/with/excluded")
+#         assert result == ("test-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open")
+#     def test_file_read_error(self, mock_file, mock_listdir, mock_exists):
+#         """Test handling of file read errors."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf", "backup.tf"]
+
+#         # First file throws IOError, second file is valid
+#         def side_effect(*args, **kwargs):
+#             filename = args[0]
+#             if "main.tf" in filename:
+#                 raise IOError("Permission denied")
+#             else:
+#                 return mock_open(
+#                     read_data="""
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "backup-workspace"
+#     }
+#   }
+# }
+# """
+#                 ).return_value
+
+#         mock_file.side_effect = side_effect
+
+#         result = extract_workspace_from_terraform_config("/with/error")
+#         assert result == ("backup-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open")
+#     def test_unicode_decode_error(self, mock_file, mock_listdir, mock_exists):
+#         """Test handling of Unicode decode errors."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["binary.tf", "text.tf"]
+
+#         # First file throws UnicodeDecodeError, second file is valid
+#         def side_effect(*args, **kwargs):
+#             filename = args[0]
+#             if "binary.tf" in filename:
+#                 raise UnicodeDecodeError("utf-8", b"", 0, 1, "invalid start byte")
+#             else:
+#                 return mock_open(
+#                     read_data="""
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "text-workspace"
+#     }
+#   }
+# }
+# """
+#                 ).return_value
+
+#         mock_file.side_effect = side_effect
+
+#         result = extract_workspace_from_terraform_config("/with/unicode/error")
+#         assert result == ("text-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     def test_os_error_on_listdir(self, mock_listdir, mock_exists):
+#         """Test handling of OS errors when listing directory."""
+#         mock_exists.return_value = True
+#         mock_listdir.side_effect = OSError("Permission denied")
+
+#         result = extract_workspace_from_terraform_config("/permission/denied")
+#         assert result == (None, "cli")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_case_insensitive_matching(self, mock_file, mock_listdir, mock_exists):
+#         """Test case-insensitive matching of cloud and workspace blocks."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   CLOUD {
+#     organization = "my-org"
+#     WORKSPACES {
+#       NAME = "case-insensitive-workspace"
+#     }
+#   }
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/case/insensitive")
+#         assert result == ("case-insensitive-workspace", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_workspace_with_special_characters(self, mock_file, mock_listdir, mock_exists):
+#         """Test workspace names with special characters."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       name = "my-workspace-123_test"
+#     }
+#   }
+# }
+# """
+
+#         result = extract_workspace_from_terraform_config("/special/chars")
+#         assert result == ("my-workspace-123_test", "cloud")
+
+#     @patch("os.path.exists")
+#     @patch("os.listdir")
+#     @patch("builtins.open", new_callable=mock_open)
+#     def test_malformed_cloud_block(self, mock_file, mock_listdir, mock_exists):
+#         """Test handling of malformed cloud block."""
+#         mock_exists.return_value = True
+#         mock_listdir.return_value = ["main.tf"]
+#         mock_file.return_value.read.return_value = """
+# terraform {
+#   cloud {
+#     organization = "my-org"
+#     workspaces {
+#       # Missing closing brace
+#       name = "malformed-workspace"
+#     }
+#   # Missing closing brace for cloud
+# }
+# """
+
+#         # Should still detect cloud mode even if malformed
+#         result = extract_workspace_from_terraform_config("/malformed")
+#         assert result == ("malformed-workspace", "cloud")

From e837497c1ce163180eaa4c99b046e0e7b9a6a661 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:25:10 +0530
Subject: [PATCH 16/38] AAP-46677-Updated-Terraform.py-test_terraform.py

---
 plugins/modules/terraform.py                 | 53 ++++++++++++++------
 tests/unit/plugins/modules/test_terraform.py | 18 ++++---
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index aa3c1c36..b6caf133 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -329,26 +329,51 @@
 )
 
 
+import re
+
 def clean_tf_file(tf_content: str) -> str:
     """
-    Cleans up the Terraform file content by removing comments and empty lines.
-
-    Args:
-        tf_content: The content of the Terraform file as a string.
-
-    Returns:
-        Cleaned Terraform file content as a string.
+    Cleans up the Terraform file content by removing comments (inline and block) and empty lines.
     """
-    # Remove multiline comments (/* */)
-    content_no_multiline = re.sub(r"/\*.*?\*/", "", tf_content, flags=re.DOTALL)
 
-    # Remove single-line comments (# or //)
-    content_no_singleline = re.sub(r"(?m)^\s*(#|//).*$", "", content_no_multiline)
+    def remove_multiline_comments(s):
+        pattern = re.compile(r'/\*.*?\*/', re.DOTALL)
+        while re.search(pattern, s):
+            s = re.sub(pattern, '', s)
+        return s
+
+    def remove_inline_comments(line):
+        # Remove inline # or // comments, unless inside quotes
+        quote_open = False
+        result = ''
+        i = 0
+        while i < len(line):
+            if line[i] in ('"', "'"):
+                if not quote_open:
+                    quote_open = line[i]
+                elif quote_open == line[i]:
+                    quote_open = False
+                result += line[i]
+            elif not quote_open and line[i:i+2] == '//':
+                break
+            elif not quote_open and line[i] == '#':
+                break
+            else:
+                result += line[i]
+            i += 1
+        return result.rstrip()
+
+    # Remove multi-line comments first
+    no_multiline = remove_multiline_comments(tf_content)
 
-    # Remove extra blank lines
-    cleaned_lines = [line for line in content_no_singleline.splitlines() if line.strip()]
-    return "\n".join(cleaned_lines)
+    # Remove single-line comments and inline comments
+    cleaned_lines = []
+    for line in no_multiline.splitlines():
+        stripped = remove_inline_comments(line)
+        if stripped.strip():  # Non-empty line after stripping
+            cleaned_lines.append(stripped)
 
+    return '\n'.join(cleaned_lines)
 
 def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional[str], str]:
     """
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index a797ce7c..b985fb6b 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -3,8 +3,6 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from unittest.mock import mock_open
-
 import pytest
 from ansible_collections.cloud.terraform.plugins.module_utils.models import (
     TerraformAttributeSpec,
@@ -29,7 +27,6 @@
     is_attribute_sensitive_in_providers_schema,
     sanitize_state,
 )
-from requests import patch
 
 
 @pytest.fixture
@@ -276,7 +273,8 @@ def state_contents(root_module_resource, sensitive_root_module_resource):
                 "my_sensitive_output": TerraformOutput(sensitive=True, value="my_sensitive_value", type="string"),
             },
             root_module=TerraformRootModule(
-                resources=[root_module_resource, sensitive_root_module_resource], child_modules=[]
+                resources=[root_module_resource, sensitive_root_module_resource],
+                child_modules=[],
             ),
         ),
     )
@@ -303,7 +301,13 @@ def test_not_sensitive_attributes(self, provider_schemas, root_module_resource,
             ("resource_block", True),
         ],
     )
-    def test_sensitive_attributes(self, provider_schemas, sensitive_root_module_resource, attribute, expected_result):
+    def test_sensitive_attributes(
+        self,
+        provider_schemas,
+        sensitive_root_module_resource,
+        attribute,
+        expected_result,
+    ):
         result = is_attribute_sensitive_in_providers_schema(
             provider_schemas, sensitive_root_module_resource, attribute=attribute
         )
@@ -643,7 +647,7 @@ def test_remove_multiline_comments(self):
         """Test removal of multiline comments /* */."""
         tf_content = """
 resource "aws_instance" "example" {
-  /* This is a 
+  /* This is a
      multiline comment */
   ami           = "ami-12345678"
   instance_type = "t2.micro"
@@ -705,7 +709,7 @@ def test_remove_empty_lines(self):
 resource "aws_instance" "example" {
 
   ami           = "ami-12345678"
-    
+
   instance_type = "t2.micro"
 
 }

From a5deae3228394f1ee74dad65f1dfe95594d4350e Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:26:59 +0530
Subject: [PATCH 17/38] AAP-46677-fixed-lint

---
 plugins/modules/terraform.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index b6caf133..fec377c2 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -329,23 +329,21 @@
 )
 
 
-import re
-
 def clean_tf_file(tf_content: str) -> str:
     """
     Cleans up the Terraform file content by removing comments (inline and block) and empty lines.
     """
 
     def remove_multiline_comments(s):
-        pattern = re.compile(r'/\*.*?\*/', re.DOTALL)
+        pattern = re.compile(r"/\*.*?\*/", re.DOTALL)
         while re.search(pattern, s):
-            s = re.sub(pattern, '', s)
+            s = re.sub(pattern, "", s)
         return s
 
     def remove_inline_comments(line):
         # Remove inline # or // comments, unless inside quotes
         quote_open = False
-        result = ''
+        result = ""
         i = 0
         while i < len(line):
             if line[i] in ('"', "'"):
@@ -354,9 +352,9 @@ def remove_inline_comments(line):
                 elif quote_open == line[i]:
                     quote_open = False
                 result += line[i]
-            elif not quote_open and line[i:i+2] == '//':
+            elif not quote_open and line[i : i + 2] == "//":
                 break
-            elif not quote_open and line[i] == '#':
+            elif not quote_open and line[i] == "#":
                 break
             else:
                 result += line[i]
@@ -373,7 +371,8 @@ def remove_inline_comments(line):
         if stripped.strip():  # Non-empty line after stripping
             cleaned_lines.append(stripped)
 
-    return '\n'.join(cleaned_lines)
+    return "\n".join(cleaned_lines)
+
 
 def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional[str], str]:
     """

From 27e3ddf4a9b7f1aa76055c9d4d43ffa0e0841dc2 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:30:14 +0530
Subject: [PATCH 18/38] AAP-46677-fixed-lint

---
 plugins/modules/terraform.py                 | 2 +-
 tests/unit/plugins/modules/test_terraform.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index fec377c2..0a899530 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -352,7 +352,7 @@ def remove_inline_comments(line):
                 elif quote_open == line[i]:
                     quote_open = False
                 result += line[i]
-            elif not quote_open and line[i : i + 2] == "//":
+            elif not quote_open and line[i:i + 2] == "//":
                 break
             elif not quote_open and line[i] == "#":
                 break
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index b985fb6b..7c991ec0 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -20,7 +20,6 @@
 )
 from ansible_collections.cloud.terraform.plugins.modules.terraform import (
     clean_tf_file,
-    extract_workspace_from_terraform_config,
     filter_outputs,
     filter_resource_attributes,
     is_attribute_in_sensitive_values,

From ea8be4c14d91334ad28f5d1d489f9a6a9c0b59a2 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:32:16 +0530
Subject: [PATCH 19/38] AAP46677-push

---
 plugins/modules/terraform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 0a899530..fec377c2 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -352,7 +352,7 @@ def remove_inline_comments(line):
                 elif quote_open == line[i]:
                     quote_open = False
                 result += line[i]
-            elif not quote_open and line[i:i + 2] == "//":
+            elif not quote_open and line[i : i + 2] == "//":
                 break
             elif not quote_open and line[i] == "#":
                 break

From c1fb892c503f51591c5aadbdb24019d10e89ea4a Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:37:31 +0530
Subject: [PATCH 20/38] AAP-46677-Fixed-Clean-TF-File

---
 plugins/modules/terraform.py | 48 ++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index fec377c2..883ea241 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -335,40 +335,52 @@ def clean_tf_file(tf_content: str) -> str:
     """
 
     def remove_multiline_comments(s):
-        pattern = re.compile(r"/\*.*?\*/", re.DOTALL)
-        while re.search(pattern, s):
-            s = re.sub(pattern, "", s)
-        return s
+        result = ""
+        i = 0
+        length = len(s)
+        while i < length:
+            if i + 1 < length and s[i] == "/" and s[i + 1] == "*":
+                i += 2
+                # Skip until closing '*/'
+                while i + 1 < length and not (s[i] == "*" and s[i + 1] == "/"):
+                    i += 1
+                i += 2  # Skip '*/'
+            else:
+                result += s[i]
+                i += 1
+        return result
 
     def remove_inline_comments(line):
-        # Remove inline # or // comments, unless inside quotes
         quote_open = False
         result = ""
         i = 0
-        while i < len(line):
-            if line[i] in ('"', "'"):
+        length = len(line)
+        while i < length:
+            char = line[i]
+            if char in ('"', "'"):
                 if not quote_open:
-                    quote_open = line[i]
-                elif quote_open == line[i]:
+                    quote_open = char
+                elif quote_open == char:
                     quote_open = False
-                result += line[i]
-            elif not quote_open and line[i : i + 2] == "//":
-                break
-            elif not quote_open and line[i] == "#":
-                break
+                result += char
+            elif not quote_open:
+                if i + 1 < length and line[i] == "/" and line[i + 1] == "/":
+                    break  # Start of '//' comment
+                elif line[i] == "#":
+                    break  # Start of '#' comment
+                else:
+                    result += char
             else:
-                result += line[i]
+                result += char
             i += 1
         return result.rstrip()
 
-    # Remove multi-line comments first
     no_multiline = remove_multiline_comments(tf_content)
 
-    # Remove single-line comments and inline comments
     cleaned_lines = []
     for line in no_multiline.splitlines():
         stripped = remove_inline_comments(line)
-        if stripped.strip():  # Non-empty line after stripping
+        if stripped.strip():
             cleaned_lines.append(stripped)
 
     return "\n".join(cleaned_lines)

From 9d7a1c14fa864de71e61fe614c2fa15021ae9f29 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:43:37 +0530
Subject: [PATCH 21/38] AAP-46677-updated-tests

---
 plugins/modules/terraform.py                 | 21 +++++---------------
 tests/unit/plugins/modules/test_terraform.py | 15 --------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 883ea241..17a450fb 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -334,23 +334,12 @@ def clean_tf_file(tf_content: str) -> str:
     Cleans up the Terraform file content by removing comments (inline and block) and empty lines.
     """
 
-    def remove_multiline_comments(s):
-        result = ""
-        i = 0
-        length = len(s)
-        while i < length:
-            if i + 1 < length and s[i] == "/" and s[i + 1] == "*":
-                i += 2
-                # Skip until closing '*/'
-                while i + 1 < length and not (s[i] == "*" and s[i + 1] == "/"):
-                    i += 1
-                i += 2  # Skip '*/'
-            else:
-                result += s[i]
-                i += 1
-        return result
+    def remove_multiline_comments(s: str) -> str:
+        # greedy match to remove the largest possible /* ... */ block
+        pattern = re.compile(r"/\*.*\*/", re.DOTALL)
+        return re.sub(pattern, "", s)
 
-    def remove_inline_comments(line):
+    def remove_inline_comments(line: str) -> str:
         quote_open = False
         result = ""
         i = 0
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 7c991ec0..5c4ba0c6 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -743,21 +743,6 @@ def test_only_comments(self):
         result = clean_tf_file(tf_content)
         assert result == expected
 
-    def test_nested_multiline_comments(self):
-        """Test handling of nested-like multiline comments."""
-        tf_content = """
-resource "aws_instance" "example" {
-  /* Comment with /* nested-like */ content */
-  ami = "ami-12345678"
-}
-"""
-        expected = """resource "aws_instance" "example" {
-  ami = "ami-12345678"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
 
 # class TestExtractWorkspaceFromTerraformConfig:
 #     """Test cases for the extract_workspace_from_terraform_config function."""

From b7d9e462322d95b6ed0058907f47807a49084cbe Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:47:42 +0530
Subject: [PATCH 22/38] AAP-46677-Lint

---
 plugins/modules/terraform.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 17a450fb..a4a629fd 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -340,19 +340,19 @@ def remove_multiline_comments(s: str) -> str:
         return re.sub(pattern, "", s)
 
     def remove_inline_comments(line: str) -> str:
-        quote_open = False
+        quote_open: str | None = None  # None when no quote is open
         result = ""
         i = 0
         length = len(line)
         while i < length:
             char = line[i]
             if char in ('"', "'"):
-                if not quote_open:
-                    quote_open = char
+                if quote_open is None:
+                    quote_open = char  # opening quote
                 elif quote_open == char:
-                    quote_open = False
+                    quote_open = None  # closing quote
                 result += char
-            elif not quote_open:
+            elif quote_open is None:
                 if i + 1 < length and line[i] == "/" and line[i + 1] == "/":
                     break  # Start of '//' comment
                 elif line[i] == "#":

From c800602ef858186871eab4e0d4652b91475c07a8 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:51:11 +0530
Subject: [PATCH 23/38] AAP-46677-Updated-Regex

---
 plugins/modules/terraform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index a4a629fd..64c50b86 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -335,8 +335,8 @@ def clean_tf_file(tf_content: str) -> str:
     """
 
     def remove_multiline_comments(s: str) -> str:
-        # greedy match to remove the largest possible /* ... */ block
-        pattern = re.compile(r"/\*.*\*/", re.DOTALL)
+        # Use non-greedy match to remove individual /* ... */ blocks
+        pattern = re.compile(r"/\*.*?\*/", re.DOTALL)
         return re.sub(pattern, "", s)
 
     def remove_inline_comments(line: str) -> str:

From 0ede33a18a4d1e7e802595589d2f6dc3395ef5d0 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:54:57 +0530
Subject: [PATCH 24/38] AAP-46677-Fixed-Pylint

---
 plugins/modules/terraform.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 64c50b86..edb04ed4 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -307,6 +307,7 @@
 import re
 import tempfile
 from typing import List, Optional, Tuple
+from typing import Optional
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import integer_types
@@ -340,7 +341,7 @@ def remove_multiline_comments(s: str) -> str:
         return re.sub(pattern, "", s)
 
     def remove_inline_comments(line: str) -> str:
-        quote_open: str | None = None  # None when no quote is open
+        quote_open: Optional[str] = None # None when no quote is open
         result = ""
         i = 0
         length = len(line)

From 3ddefb48e1750cc0c92c5c88e94ec01380f3626f Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 14:58:30 +0530
Subject: [PATCH 25/38] AAP-46677-Fixed-PEP8-Errors

---
 plugins/modules/terraform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index edb04ed4..96854f77 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -341,7 +341,7 @@ def remove_multiline_comments(s: str) -> str:
         return re.sub(pattern, "", s)
 
     def remove_inline_comments(line: str) -> str:
-        quote_open: Optional[str] = None # None when no quote is open
+        quote_open: Optional[str] = None  # None when no quote is open
         result = ""
         i = 0
         length = len(line)

From 7772ad8ebdcc9db30af81a4a6186d787cf6036b8 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 15:00:25 +0530
Subject: [PATCH 26/38] AAP-46677-Simple-Fixes

---
 plugins/modules/terraform.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 96854f77..353ce52f 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -307,7 +307,6 @@
 import re
 import tempfile
 from typing import List, Optional, Tuple
-from typing import Optional
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import integer_types

From 76bb8bea8180023cfe27d11cd57cf058c7b0aba2 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 15:18:55 +0530
Subject: [PATCH 27/38] AAP-46677-Added-tests-for-workspace-extraction

---
 tests/unit/plugins/modules/test_terraform.py | 87 ++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 5c4ba0c6..86ab2d6b 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -3,6 +3,9 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+import os
+import tempfile
+
 import pytest
 from ansible_collections.cloud.terraform.plugins.module_utils.models import (
     TerraformAttributeSpec,
@@ -20,6 +23,7 @@
 )
 from ansible_collections.cloud.terraform.plugins.modules.terraform import (
     clean_tf_file,
+    extract_workspace_from_terraform_config,
     filter_outputs,
     filter_resource_attributes,
     is_attribute_in_sensitive_values,
@@ -744,6 +748,89 @@ def test_only_comments(self):
         assert result == expected
 
 
+class TestExtractWorkspaceFromTerraformConfig:
+    """Test cases for the extract_workspace_from_terraform_config function using real files."""
+
+    def test_terraform_files_no_cloud_block(self):
+        """Test .tf files without cloud block."""
+        tf_content = """
+        resource "aws_instance" "example" {
+          ami           = "ami-12345678"
+          instance_type = "t2.micro"
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == (None, "cli")
+
+    def test_cloud_block_with_workspace_name(self):
+        """Test cloud block with workspace name."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace"
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("my-workspace", "cloud")
+
+    def test_cloud_block_with_comments(self):
+        """Test cloud block with comments that should be cleaned."""
+        tf_content = """
+        terraform {
+          # This is a comment
+          cloud {
+            organization = "my-org"
+            /* This is a multiline
+               comment */
+            workspaces {
+              name = "production-workspace"  // Inline comment
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("production-workspace", "cloud")
+
+    def test_workspace_with_special_characters(self):
+        """Test workspace names with special characters."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace-123_test"
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("my-workspace-123_test", "cloud")
+
+
 # class TestExtractWorkspaceFromTerraformConfig:
 #     """Test cases for the extract_workspace_from_terraform_config function."""
 

From f4efa4b4c14cc5dfbe962fbae389479b3cb20ea9 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 16:50:20 +0530
Subject: [PATCH 28/38] AAP-46677-Changes

---
 changelogs/changelog.yaml                     |   2 +-
 ...dules-terraform-update-workspace-logic.yml |   2 +-
 plugins/modules/terraform.py                  |  31 +-
 tests/unit/plugins/modules/test_terraform.py  | 309 ------------------
 4 files changed, 31 insertions(+), 313 deletions(-)

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index e54f46c2..47f24bd4 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -154,7 +154,7 @@ releases:
       - inventory/terraform_provider - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Support for custom Terraform providers (https://github.com/ansible-collections/cloud.terraform/pull/146).
-      - modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
+      - modules/terraform - Updated Workspace Logic for TFC/TFE and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
       release_summary: This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin and ``terraform`` module plugin.
 
     fragments:
diff --git a/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml b/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml
index 5b7196e0..752bb803 100644
--- a/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml
+++ b/changelogs/fragments/20250620-modules-terraform-update-workspace-logic.yml
@@ -1,3 +1,3 @@
 ---
 minor_changes:
-  - modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194)
+  - modules/terraform - Updated Workspace Logic for TFC/TFE and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194)
diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 353ce52f..5f528059 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -331,15 +331,42 @@
 
 def clean_tf_file(tf_content: str) -> str:
     """
-    Cleans up the Terraform file content by removing comments (inline and block) and empty lines.
+    Removes all comments (inline '//' and '#', and block '/* ... */') and empty lines from Terraform file content.
+
+    Args:
+      tf_content (str): The raw content of a Terraform file.
+
+    Returns:
+      str: The cleaned Terraform file content with comments and empty lines removed.
     """
 
     def remove_multiline_comments(s: str) -> str:
-        # Use non-greedy match to remove individual /* ... */ blocks
+        """
+        Removes all multiline comments (/* ... */) from the given string.
+
+        Args:
+          s (str): The input string potentially containing multiline comments.
+
+        Returns:
+          str: The input string with all multiline comments removed.
+        """
         pattern = re.compile(r"/\*.*?\*/", re.DOTALL)
         return re.sub(pattern, "", s)
 
     def remove_inline_comments(line: str) -> str:
+        """
+        Removes inline comments from a given line of text, preserving quoted strings.
+
+        This function scans the input line and removes any content following a '#' or '//' comment marker,
+        unless the marker appears within a quoted string (single or double quotes). Quoted strings are
+        preserved as-is, including any comment markers inside them.
+
+        Args:
+          line (str): The input line from which to remove inline comments.
+
+        Returns:
+          str: The line with inline comments removed, preserving quoted strings.
+        """
         quote_open: Optional[str] = None  # None when no quote is open
         result = ""
         i = 0
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 86ab2d6b..ffc80187 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -829,312 +829,3 @@ def test_workspace_with_special_characters(self):
 
             result = extract_workspace_from_terraform_config(tmpdir)
             assert result == ("my-workspace-123_test", "cloud")
-
-
-# class TestExtractWorkspaceFromTerraformConfig:
-#     """Test cases for the extract_workspace_from_terraform_config function."""
-
-#     def test_nonexistent_directory(self):
-#         """Test handling of nonexistent project directory."""
-#         result = extract_workspace_from_terraform_config("/nonexistent/path")
-#         assert result == (None, "cli")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_terraform_files_no_cloud_block(self, mock_file, mock_listdir, mock_exists):
-#         """Test .tf files without cloud block."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# resource "aws_instance" "example" {
-#   ami           = "ami-12345678"
-#   instance_type = "t2.micro"
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/no/cloud/block")
-#         assert result == (None, "cli")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_cloud_block_with_workspace_name(self, mock_file, mock_listdir, mock_exists):
-#         """Test cloud block with workspace name."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "my-workspace"
-#     }
-#   }
-# }
-
-# resource "aws_instance" "example" {
-#   ami           = "ami-12345678"
-#   instance_type = "t2.micro"
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/with/workspace")
-#         assert result == ("my-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_cloud_block_without_workspace_name(self, mock_file, mock_listdir, mock_exists):
-#         """Test cloud block without workspace name."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#   }
-# }
-
-# resource "aws_instance" "example" {
-#   ami           = "ami-12345678"
-#   instance_type = "t2.micro"
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/cloud/no/workspace")
-#         assert result == (None, "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_cloud_block_with_comments(self, mock_file, mock_listdir, mock_exists):
-#         """Test cloud block with comments that should be cleaned."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   # This is a comment
-#   cloud {
-#     organization = "my-org"
-#     /* This is a multiline
-#        comment */
-#     workspaces {
-#       name = "production-workspace"  // Inline comment
-#     }
-#   }
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/with/comments")
-#         assert result == ("production-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_multiple_terraform_files_first_has_cloud(self, mock_file, mock_listdir, mock_exists):
-#         """Test multiple .tf files where first file has cloud block."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf", "variables.tf", "backend.tf"]
-
-#         # Mock file reads - main.tf has cloud block
-#         def side_effect(*args, **kwargs):
-#             filename = args[0]
-#             if "main.tf" in filename:
-#                 mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "dev-workspace"
-#     }
-#   }
-# }
-# """
-#             else:
-#                 mock_file.return_value.read.return_value = "# Just variables"
-#             return mock_file.return_value
-
-#         mock_file.side_effect = side_effect
-
-#         result = extract_workspace_from_terraform_config("/multiple/files")
-#         assert result == ("dev-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_excluded_files_ignored(self, mock_file, mock_listdir, mock_exists):
-#         """Test that excluded files (vars.tf, var.tf, etc.) are ignored."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["vars.tf", "var.tf", "provider.tf", "variables.tf", "outputs.tf", "main.tf"]
-
-#         def side_effect(*args, **kwargs):
-#             filename = args[0]
-#             if "main.tf" in filename:
-#                 mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "test-workspace"
-#     }
-#   }
-# }
-# """
-#             else:
-#                 # These shouldn't be read due to exclusion
-#                 mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "wrong-org"
-#     workspaces {
-#       name = "wrong-workspace"
-#     }
-#   }
-# }
-# """
-#             return mock_file.return_value
-
-#         mock_file.side_effect = side_effect
-
-#         result = extract_workspace_from_terraform_config("/with/excluded")
-#         assert result == ("test-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open")
-#     def test_file_read_error(self, mock_file, mock_listdir, mock_exists):
-#         """Test handling of file read errors."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf", "backup.tf"]
-
-#         # First file throws IOError, second file is valid
-#         def side_effect(*args, **kwargs):
-#             filename = args[0]
-#             if "main.tf" in filename:
-#                 raise IOError("Permission denied")
-#             else:
-#                 return mock_open(
-#                     read_data="""
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "backup-workspace"
-#     }
-#   }
-# }
-# """
-#                 ).return_value
-
-#         mock_file.side_effect = side_effect
-
-#         result = extract_workspace_from_terraform_config("/with/error")
-#         assert result == ("backup-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open")
-#     def test_unicode_decode_error(self, mock_file, mock_listdir, mock_exists):
-#         """Test handling of Unicode decode errors."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["binary.tf", "text.tf"]
-
-#         # First file throws UnicodeDecodeError, second file is valid
-#         def side_effect(*args, **kwargs):
-#             filename = args[0]
-#             if "binary.tf" in filename:
-#                 raise UnicodeDecodeError("utf-8", b"", 0, 1, "invalid start byte")
-#             else:
-#                 return mock_open(
-#                     read_data="""
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "text-workspace"
-#     }
-#   }
-# }
-# """
-#                 ).return_value
-
-#         mock_file.side_effect = side_effect
-
-#         result = extract_workspace_from_terraform_config("/with/unicode/error")
-#         assert result == ("text-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     def test_os_error_on_listdir(self, mock_listdir, mock_exists):
-#         """Test handling of OS errors when listing directory."""
-#         mock_exists.return_value = True
-#         mock_listdir.side_effect = OSError("Permission denied")
-
-#         result = extract_workspace_from_terraform_config("/permission/denied")
-#         assert result == (None, "cli")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_case_insensitive_matching(self, mock_file, mock_listdir, mock_exists):
-#         """Test case-insensitive matching of cloud and workspace blocks."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   CLOUD {
-#     organization = "my-org"
-#     WORKSPACES {
-#       NAME = "case-insensitive-workspace"
-#     }
-#   }
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/case/insensitive")
-#         assert result == ("case-insensitive-workspace", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_workspace_with_special_characters(self, mock_file, mock_listdir, mock_exists):
-#         """Test workspace names with special characters."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       name = "my-workspace-123_test"
-#     }
-#   }
-# }
-# """
-
-#         result = extract_workspace_from_terraform_config("/special/chars")
-#         assert result == ("my-workspace-123_test", "cloud")
-
-#     @patch("os.path.exists")
-#     @patch("os.listdir")
-#     @patch("builtins.open", new_callable=mock_open)
-#     def test_malformed_cloud_block(self, mock_file, mock_listdir, mock_exists):
-#         """Test handling of malformed cloud block."""
-#         mock_exists.return_value = True
-#         mock_listdir.return_value = ["main.tf"]
-#         mock_file.return_value.read.return_value = """
-# terraform {
-#   cloud {
-#     organization = "my-org"
-#     workspaces {
-#       # Missing closing brace
-#       name = "malformed-workspace"
-#     }
-#   # Missing closing brace for cloud
-# }
-# """
-
-#         # Should still detect cloud mode even if malformed
-#         result = extract_workspace_from_terraform_config("/malformed")
-#         assert result == ("malformed-workspace", "cloud")

From 475fd6fb9eea4dac669cf3b49cd31350882e01d4 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 17:05:02 +0530
Subject: [PATCH 29/38] AAP-46677-Updated-no-workspace

---
 plugins/modules/terraform.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index 5f528059..c5307d6a 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -642,6 +642,13 @@ def main() -> None:
     cloud_workspace, terraform_offering = extract_workspace_from_terraform_config(project_path)
 
     if terraform_offering == "cloud":
+        if cloud_workspace is None and workspace == "default":
+            module.fail_json(
+                msg=(
+                    "Terraform cloud configuration found, but no workspace defined. "
+                    "Please ensure the workspace is defined in your Terraform cloud configuration."
+                )
+            )
         if cloud_workspace:
             if workspace != "default" and workspace != cloud_workspace:
                 module.fail_json(

From 8e316f9afa634ba8e64150eb621814ac8a013af9 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 17:39:27 +0530
Subject: [PATCH 30/38] AAP-46677-Paramaterized-Test-Cases

---
 .../templates/main.child.tf.j2                |   2 +-
 tests/unit/plugins/modules/test_terraform.py  | 256 ++++++++----------
 2 files changed, 110 insertions(+), 148 deletions(-)

diff --git a/tests/integration/targets/inventory_terraform_state_aws/templates/main.child.tf.j2 b/tests/integration/targets/inventory_terraform_state_aws/templates/main.child.tf.j2
index 3c7b03bf..8d1c6890 100644
--- a/tests/integration/targets/inventory_terraform_state_aws/templates/main.child.tf.j2
+++ b/tests/integration/targets/inventory_terraform_state_aws/templates/main.child.tf.j2
@@ -24,7 +24,7 @@ variable "child_group_id" {
 
 resource "aws_instance" "test_tiny" {
   ami           = var.child_ami_id
-  instance_type = "t3.micro"
+  instance_type = "t2.micro"
   subnet_id = var.child_subnet_id
   vpc_security_group_ids = [var.child_group_id]
 
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index ffc80187..71bcfa08 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -610,45 +610,39 @@ def test_from_json_nested(self):
 class TestCleanTfFile:
     """Test cases for the clean_tf_file function."""
 
-    def test_remove_single_line_comments_hash(self):
-        """Test removal of single-line comments starting with #."""
-        tf_content = """
+    @pytest.mark.parametrize(
+        "tf_content,expected",
+        [
+            (
+                """
 resource "aws_instance" "example" {
   # This is a comment
   ami           = "ami-12345678"
   instance_type = "t2.micro"
   # Another comment
 }
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_remove_single_line_comments_double_slash(self):
-        """Test removal of single-line comments starting with //."""
-        tf_content = """
+}""",
+            ),
+            (
+                """
 resource "aws_instance" "example" {
   // This is a comment
   ami           = "ami-12345678"
   instance_type = "t2.micro"
   // Another comment
 }
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_remove_multiline_comments(self):
-        """Test removal of multiline comments /* */."""
-        tf_content = """
+}""",
+            ),
+            (
+                """
 resource "aws_instance" "example" {
   /* This is a
      multiline comment */
@@ -657,18 +651,14 @@ def test_remove_multiline_comments(self):
   /* Another multiline
      comment here */
 }
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_remove_mixed_comments(self):
-        """Test removal of mixed comment types."""
-        tf_content = """
+}""",
+            ),
+            (
+                """
 # Top level comment
 resource "aws_instance" "example" {
   /* Multiline comment
@@ -678,36 +668,28 @@ def test_remove_mixed_comments(self):
   # Another hash comment
 }
 // Bottom comment
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_preserve_strings_with_comment_chars(self):
-        """Test that comment characters inside strings are preserved."""
-        tf_content = """
+}""",
+            ),
+            (
+                """
 resource "aws_instance" "example" {
   ami           = "ami-12345678"
   user_data     = "#!/bin/bash\\necho 'Hello # World // Test'"
   instance_type = "t2.micro"
 }
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   user_data     = "#!/bin/bash\\necho 'Hello # World // Test'"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_remove_empty_lines(self):
-        """Test removal of empty lines and lines with only whitespace."""
-        tf_content = """
+}""",
+            ),
+            (
+                """
 
 resource "aws_instance" "example" {
 
@@ -717,33 +699,28 @@ def test_remove_empty_lines(self):
 
 }
 
-"""
-        expected = """resource "aws_instance" "example" {
+""",
+                """resource "aws_instance" "example" {
   ami           = "ami-12345678"
   instance_type = "t2.micro"
-}"""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_empty_string(self):
-        """Test handling of empty string input."""
-        tf_content = ""
-        expected = ""
-
-        result = clean_tf_file(tf_content)
-        assert result == expected
-
-    def test_only_comments(self):
-        """Test file with only comments."""
-        tf_content = """
+}""",
+            ),
+            (
+                "",
+                "",
+            ),
+            (
+                """
 # This is a comment
 // Another comment
 /* Multiline
    comment */
-"""
-        expected = ""
-
+""",
+                "",
+            ),
+        ],
+    )
+    def test_clean_tf_file(self, tf_content, expected):
         result = clean_tf_file(tf_content)
         assert result == expected
 
@@ -751,81 +728,66 @@ def test_only_comments(self):
 class TestExtractWorkspaceFromTerraformConfig:
     """Test cases for the extract_workspace_from_terraform_config function using real files."""
 
-    def test_terraform_files_no_cloud_block(self):
-        """Test .tf files without cloud block."""
-        tf_content = """
-        resource "aws_instance" "example" {
-          ami           = "ami-12345678"
-          instance_type = "t2.micro"
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == (None, "cli")
-
-    def test_cloud_block_with_workspace_name(self):
-        """Test cloud block with workspace name."""
-        tf_content = """
-        terraform {
-          cloud {
-            organization = "my-org"
-            workspaces {
-              name = "my-workspace"
-            }
-          }
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("my-workspace", "cloud")
-
-    def test_cloud_block_with_comments(self):
-        """Test cloud block with comments that should be cleaned."""
-        tf_content = """
-        terraform {
-          # This is a comment
-          cloud {
-            organization = "my-org"
-            /* This is a multiline
-               comment */
-            workspaces {
-              name = "production-workspace"  // Inline comment
-            }
-          }
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("production-workspace", "cloud")
-
-    def test_workspace_with_special_characters(self):
-        """Test workspace names with special characters."""
-        tf_content = """
-        terraform {
-          cloud {
-            organization = "my-org"
-            workspaces {
-              name = "my-workspace-123_test"
-            }
-          }
-        }
-        """
+    @pytest.mark.parametrize(
+        "tf_content,expected",
+        [
+            (
+                """
+                resource "aws_instance" "example" {
+                  ami           = "ami-12345678"
+                  instance_type = "t2.micro"
+                }
+                """,
+                (None, "cli"),
+            ),
+            (
+                """
+                terraform {
+                  cloud {
+                    organization = "my-org"
+                    workspaces {
+                      name = "my-workspace"
+                    }
+                  }
+                }
+                """,
+                ("my-workspace", "cloud"),
+            ),
+            (
+                """
+                terraform {
+                  # This is a comment
+                  cloud {
+                    organization = "my-org"
+                    /* This is a multiline
+                       comment */
+                    workspaces {
+                      name = "production-workspace"  // Inline comment
+                    }
+                  }
+                }
+                """,
+                ("production-workspace", "cloud"),
+            ),
+            (
+                """
+                terraform {
+                  cloud {
+                    organization = "my-org"
+                    workspaces {
+                      name = "my-workspace-123_test"
+                    }
+                  }
+                }
+                """,
+                ("my-workspace-123_test", "cloud"),
+            ),
+        ],
+    )
+    def test_extract_workspace_from_terraform_config(self, tf_content, expected):
         with tempfile.TemporaryDirectory() as tmpdir:
             file_path = os.path.join(tmpdir, "main.tf")
             with open(file_path, "w") as f:
                 f.write(tf_content)
-
             result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("my-workspace-123_test", "cloud")
+            assert result == expected

From 4e80e70e080e408e8ec8aab67f6d89ba98ad9294 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 17:46:27 +0530
Subject: [PATCH 31/38] AAP-46677-revert

---
 tests/unit/plugins/modules/test_terraform.py | 131 +++++++++++--------
 1 file changed, 73 insertions(+), 58 deletions(-)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 71bcfa08..ada49d55 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -728,66 +728,81 @@ def test_clean_tf_file(self, tf_content, expected):
 class TestExtractWorkspaceFromTerraformConfig:
     """Test cases for the extract_workspace_from_terraform_config function using real files."""
 
-    @pytest.mark.parametrize(
-        "tf_content,expected",
-        [
-            (
-                """
-                resource "aws_instance" "example" {
-                  ami           = "ami-12345678"
-                  instance_type = "t2.micro"
-                }
-                """,
-                (None, "cli"),
-            ),
-            (
-                """
-                terraform {
-                  cloud {
-                    organization = "my-org"
-                    workspaces {
-                      name = "my-workspace"
-                    }
-                  }
-                }
-                """,
-                ("my-workspace", "cloud"),
-            ),
-            (
-                """
-                terraform {
-                  # This is a comment
-                  cloud {
-                    organization = "my-org"
-                    /* This is a multiline
-                       comment */
-                    workspaces {
-                      name = "production-workspace"  // Inline comment
-                    }
-                  }
-                }
-                """,
-                ("production-workspace", "cloud"),
-            ),
-            (
-                """
-                terraform {
-                  cloud {
-                    organization = "my-org"
-                    workspaces {
-                      name = "my-workspace-123_test"
-                    }
-                  }
-                }
-                """,
-                ("my-workspace-123_test", "cloud"),
-            ),
-        ],
-    )
-    def test_extract_workspace_from_terraform_config(self, tf_content, expected):
+    def test_terraform_files_no_cloud_block(self):
+        """Test .tf files without cloud block."""
+        tf_content = """
+        resource "aws_instance" "example" {
+          ami           = "ami-12345678"
+          instance_type = "t2.micro"
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == (None, "cli")
+
+    def test_cloud_block_with_workspace_name(self):
+        """Test cloud block with workspace name."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace"
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("my-workspace", "cloud")
+
+    def test_cloud_block_with_comments(self):
+        """Test cloud block with comments that should be cleaned."""
+        tf_content = """
+        terraform {
+          # This is a comment
+          cloud {
+            organization = "my-org"
+            /* This is a multiline
+               comment */
+            workspaces {
+              name = "production-workspace"  // Inline comment
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("production-workspace", "cloud")
+
+    def test_workspace_with_special_characters(self):
+        """Test workspace names with special characters."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace-123_test"
+            }
+          }
+        }
+        """
         with tempfile.TemporaryDirectory() as tmpdir:
             file_path = os.path.join(tmpdir, "main.tf")
             with open(file_path, "w") as f:
                 f.write(tf_content)
+
             result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == expected
+            assert result == ("my-workspace-123_test", "cloud")

From 0586b146d80ba722349c3297bfc191e8b2bb5c68 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 18:00:23 +0530
Subject: [PATCH 32/38] AAP-46677-Added-Test-Case

---
 plugins/modules/terraform.py                 |  1 -
 tests/unit/plugins/modules/test_terraform.py | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/modules/terraform.py b/plugins/modules/terraform.py
index c5307d6a..2b281eee 100644
--- a/plugins/modules/terraform.py
+++ b/plugins/modules/terraform.py
@@ -446,7 +446,6 @@ def extract_workspace_from_terraform_config(project_path: str) -> Tuple[Optional
 
                         # If cloud block exists but no workspace name found, it's still cloud
                         return None, "cloud"
-                    return None, "cli"  # No cloud block found, assume CLI mode
 
                 except (IOError, UnicodeDecodeError):
                     # Skip files that can't be read, continue with others
diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index ada49d55..d34e5e3d 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -806,3 +806,20 @@ def test_workspace_with_special_characters(self):
 
             result = extract_workspace_from_terraform_config(tmpdir)
             assert result == ("my-workspace-123_test", "cloud")
+    
+    def test_cloud_block_without_workspace(self):
+        """Test workspace names with special characters."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == (None, "cloud")
\ No newline at end of file

From 6a4d30085e8095545fe045a431b0255a23694c98 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 18:02:01 +0530
Subject: [PATCH 33/38] AAP-46677-Fixed-Lints

---
 tests/unit/plugins/modules/test_terraform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index d34e5e3d..9b77c2bd 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -806,7 +806,7 @@ def test_workspace_with_special_characters(self):
 
             result = extract_workspace_from_terraform_config(tmpdir)
             assert result == ("my-workspace-123_test", "cloud")
-    
+
     def test_cloud_block_without_workspace(self):
         """Test workspace names with special characters."""
         tf_content = """
@@ -822,4 +822,4 @@ def test_cloud_block_without_workspace(self):
                 f.write(tf_content)
 
             result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == (None, "cloud")
\ No newline at end of file
+            assert result == (None, "cloud")

From a5b598d8b591bbe0cd4b11e66a47ace7d2f2b3af Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 18:22:09 +0530
Subject: [PATCH 34/38] AAP-46677-Parametrized-Extract-Workspace

---
 tests/unit/plugins/modules/test_terraform.py | 159 ++++++++-----------
 1 file changed, 69 insertions(+), 90 deletions(-)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 9b77c2bd..2d5c95b7 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -728,98 +728,77 @@ def test_clean_tf_file(self, tf_content, expected):
 class TestExtractWorkspaceFromTerraformConfig:
     """Test cases for the extract_workspace_from_terraform_config function using real files."""
 
-    def test_terraform_files_no_cloud_block(self):
-        """Test .tf files without cloud block."""
-        tf_content = """
-        resource "aws_instance" "example" {
-          ami           = "ami-12345678"
-          instance_type = "t2.micro"
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == (None, "cli")
-
-    def test_cloud_block_with_workspace_name(self):
-        """Test cloud block with workspace name."""
-        tf_content = """
-        terraform {
-          cloud {
-            organization = "my-org"
-            workspaces {
-              name = "my-workspace"
-            }
-          }
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("my-workspace", "cloud")
-
-    def test_cloud_block_with_comments(self):
-        """Test cloud block with comments that should be cleaned."""
-        tf_content = """
-        terraform {
-          # This is a comment
-          cloud {
-            organization = "my-org"
-            /* This is a multiline
-               comment */
-            workspaces {
-              name = "production-workspace"  // Inline comment
-            }
-          }
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("production-workspace", "cloud")
-
-    def test_workspace_with_special_characters(self):
-        """Test workspace names with special characters."""
-        tf_content = """
-        terraform {
-          cloud {
-            organization = "my-org"
-            workspaces {
-              name = "my-workspace-123_test"
-            }
-          }
-        }
-        """
-        with tempfile.TemporaryDirectory() as tmpdir:
-            file_path = os.path.join(tmpdir, "main.tf")
-            with open(file_path, "w") as f:
-                f.write(tf_content)
-
-            result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == ("my-workspace-123_test", "cloud")
-
-    def test_cloud_block_without_workspace(self):
-        """Test workspace names with special characters."""
-        tf_content = """
-        terraform {
-          cloud {
-            organization = "my-org"
-          }
-        }
-        """
+    @pytest.mark.parametrize(
+        "tf_content, expected",
+        [
+            (
+                """
+                resource "aws_instance" "example" {
+                  ami           = "ami-12345678"
+                  instance_type = "t2.micro"
+                }
+                """,
+                (None, "cli"),
+            ),
+            (
+                """
+                terraform {
+                  cloud {
+                    organization = "my-org"
+                    workspaces {
+                      name = "my-workspace"
+                    }
+                  }
+                }
+                """,
+                ("my-workspace", "cloud"),
+            ),
+            (
+                """
+                terraform {
+                  # This is a comment
+                  cloud {
+                    organization = "my-org"
+                    /* This is a multiline
+                       comment */
+                    workspaces {
+                      name = "production-workspace"  // Inline comment
+                    }
+                  }
+                }
+                """,
+                ("production-workspace", "cloud"),
+            ),
+            (
+                """
+                terraform {
+                  cloud {
+                    organization = "my-org"
+                    workspaces {
+                      name = "my-workspace-123_test"
+                    }
+                  }
+                }
+                """,
+                ("my-workspace-123_test", "cloud"),
+            ),
+            (
+                """
+                terraform {
+                  cloud {
+                    organization = "my-org"
+                  }
+                }
+                """,
+                (None, "cloud"),
+            ),
+        ],
+    )
+    def test_extract_workspace_from_terraform_config(self, tf_content, expected):
+        """Parameterized test for extract_workspace_from_terraform_config."""
         with tempfile.TemporaryDirectory() as tmpdir:
             file_path = os.path.join(tmpdir, "main.tf")
             with open(file_path, "w") as f:
                 f.write(tf_content)
-
             result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == (None, "cloud")
+            assert result == expected

From 6b091f93639846fc5853b67b69cb0111fd9d0d1f Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 18:25:01 +0530
Subject: [PATCH 35/38] AAP-46677-Revert

---
 tests/unit/plugins/modules/test_terraform.py | 159 +++++++++++--------
 1 file changed, 90 insertions(+), 69 deletions(-)

diff --git a/tests/unit/plugins/modules/test_terraform.py b/tests/unit/plugins/modules/test_terraform.py
index 2d5c95b7..9b77c2bd 100644
--- a/tests/unit/plugins/modules/test_terraform.py
+++ b/tests/unit/plugins/modules/test_terraform.py
@@ -728,77 +728,98 @@ def test_clean_tf_file(self, tf_content, expected):
 class TestExtractWorkspaceFromTerraformConfig:
     """Test cases for the extract_workspace_from_terraform_config function using real files."""
 
-    @pytest.mark.parametrize(
-        "tf_content, expected",
-        [
-            (
-                """
-                resource "aws_instance" "example" {
-                  ami           = "ami-12345678"
-                  instance_type = "t2.micro"
-                }
-                """,
-                (None, "cli"),
-            ),
-            (
-                """
-                terraform {
-                  cloud {
-                    organization = "my-org"
-                    workspaces {
-                      name = "my-workspace"
-                    }
-                  }
-                }
-                """,
-                ("my-workspace", "cloud"),
-            ),
-            (
-                """
-                terraform {
-                  # This is a comment
-                  cloud {
-                    organization = "my-org"
-                    /* This is a multiline
-                       comment */
-                    workspaces {
-                      name = "production-workspace"  // Inline comment
-                    }
-                  }
-                }
-                """,
-                ("production-workspace", "cloud"),
-            ),
-            (
-                """
-                terraform {
-                  cloud {
-                    organization = "my-org"
-                    workspaces {
-                      name = "my-workspace-123_test"
-                    }
-                  }
-                }
-                """,
-                ("my-workspace-123_test", "cloud"),
-            ),
-            (
-                """
-                terraform {
-                  cloud {
-                    organization = "my-org"
-                  }
-                }
-                """,
-                (None, "cloud"),
-            ),
-        ],
-    )
-    def test_extract_workspace_from_terraform_config(self, tf_content, expected):
-        """Parameterized test for extract_workspace_from_terraform_config."""
+    def test_terraform_files_no_cloud_block(self):
+        """Test .tf files without cloud block."""
+        tf_content = """
+        resource "aws_instance" "example" {
+          ami           = "ami-12345678"
+          instance_type = "t2.micro"
+        }
+        """
         with tempfile.TemporaryDirectory() as tmpdir:
             file_path = os.path.join(tmpdir, "main.tf")
             with open(file_path, "w") as f:
                 f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == (None, "cli")
+
+    def test_cloud_block_with_workspace_name(self):
+        """Test cloud block with workspace name."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace"
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("my-workspace", "cloud")
+
+    def test_cloud_block_with_comments(self):
+        """Test cloud block with comments that should be cleaned."""
+        tf_content = """
+        terraform {
+          # This is a comment
+          cloud {
+            organization = "my-org"
+            /* This is a multiline
+               comment */
+            workspaces {
+              name = "production-workspace"  // Inline comment
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("production-workspace", "cloud")
+
+    def test_workspace_with_special_characters(self):
+        """Test workspace names with special characters."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+            workspaces {
+              name = "my-workspace-123_test"
+            }
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
+            result = extract_workspace_from_terraform_config(tmpdir)
+            assert result == ("my-workspace-123_test", "cloud")
+
+    def test_cloud_block_without_workspace(self):
+        """Test workspace names with special characters."""
+        tf_content = """
+        terraform {
+          cloud {
+            organization = "my-org"
+          }
+        }
+        """
+        with tempfile.TemporaryDirectory() as tmpdir:
+            file_path = os.path.join(tmpdir, "main.tf")
+            with open(file_path, "w") as f:
+                f.write(tf_content)
+
             result = extract_workspace_from_terraform_config(tmpdir)
-            assert result == expected
+            assert result == (None, "cloud")

From 92d112d96900640283b8688b9fab5a99264ff455 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 18:56:07 +0530
Subject: [PATCH 36/38] AAP-46677-Reverted-Changelog.rst-change

---
 CHANGELOG.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b610cf73..384c501e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,7 +10,7 @@ v3.1.0
 Release Summary
 ---------------
 
-This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin and ``terraform`` module plugin.
+This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin.
 
 Minor Changes
 -------------
@@ -19,7 +19,6 @@ Minor Changes
 - inventory/terraform_provider - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
 - inventory/terraform_state - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
 - inventory/terraform_state - Support for custom Terraform providers (https://github.com/ansible-collections/cloud.terraform/pull/146).
-- modules/terraform - Updated Workspace Logic for TFC and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
 
 Bugfixes
 --------

From 8b96745dd195e2baa1f464bd793062bdf9603ec2 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Tue, 24 Jun 2025 19:55:07 +0530
Subject: [PATCH 37/38] AAP-46677-Reverted_Change_Logs

---
 changelogs/changelog.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 47f24bd4..fcce7e19 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -154,7 +154,6 @@ releases:
       - inventory/terraform_provider - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Remove custom `read_config_data()` method (https://github.com/ansible-collections/cloud.terraform/pull/181).
       - inventory/terraform_state - Support for custom Terraform providers (https://github.com/ansible-collections/cloud.terraform/pull/146).
-      - modules/terraform - Updated Workspace Logic for TFC/TFE and CLI (https://github.com/ansible-collections/cloud.terraform/pull/194).
       release_summary: This release includes bug fixes and new feature for the ``terraform_state`` inventory plugin and ``terraform`` module plugin.
 
     fragments:

From 578b3a56e4ec41a23b73eb67bf45cc1ec177d017 Mon Sep 17 00:00:00 2001
From: Shashank Venkat <shvenkat@redhat.com>
Date: Wed, 25 Jun 2025 08:35:18 +0530
Subject: [PATCH 38/38] AAP-46677-Updated-main.tf

---
 .../targets/test_tfc/files/main.tf            |  36 ---
 .../targets/test_tfc/files/main.tf.j2         |  40 +++
 .../targets/test_tfc/tasks/main.yml           | 278 +++++++++---------
 .../targets/test_tfc/vars/main.yml            |   8 +
 4 files changed, 185 insertions(+), 177 deletions(-)
 delete mode 100644 tests/integration/targets/test_tfc/files/main.tf
 create mode 100644 tests/integration/targets/test_tfc/files/main.tf.j2
 create mode 100644 tests/integration/targets/test_tfc/vars/main.yml

diff --git a/tests/integration/targets/test_tfc/files/main.tf b/tests/integration/targets/test_tfc/files/main.tf
deleted file mode 100644
index 92ccf9c5..00000000
--- a/tests/integration/targets/test_tfc/files/main.tf
+++ /dev/null
@@ -1,36 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 4.16"
-    }
-  }
-  required_version = ">= 1.10.0"
-  cloud {
-    organization = "Ansible-BU-TFC"
-    hostname = "app.terraform.io"
-    workspaces { 
-      name = "my_tf_project_default"
-    }
-  }
-}
-provider "aws" {
-  region     = "us-west-2"
-  # In real scenarios, you would use environment variables or a credentials file for security.
-  # Access key and secret key are necessary only for testing locally. In GH Pipelines, these will be set using CI Keys.
-  access_key = "your_access_key"
-  secret_key = "your_secret_key"
-}
-
-resource "aws_instance" "app_server_tf" {
-  ami           = "ami-830c94e3"
-  instance_type = "t2.micro"
-
-  tags = {
-    Name = "Instance_Cloud_TF"
-  }
-}
-
-output "my_output" {
-  value = resource.aws_instance.app_server_tf
-}
\ No newline at end of file
diff --git a/tests/integration/targets/test_tfc/files/main.tf.j2 b/tests/integration/targets/test_tfc/files/main.tf.j2
new file mode 100644
index 00000000..25cef642
--- /dev/null
+++ b/tests/integration/targets/test_tfc/files/main.tf.j2
@@ -0,0 +1,40 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.16"
+    }
+  }
+  required_version = ">= 1.10.0"
+  cloud {
+    organization = "{{ tfc_organization }}"
+    hostname     = "app.terraform.io"
+    token = "{{ hcp_token }}"
+    workspaces {
+      name = "{{ tfc_workspace }}"
+    }
+  }
+}
+
+provider "aws" {
+  region     = "{{ aws_region }}"
+  {% if aws_access_key and aws_secret_key %}
+  access_key = "{{ aws_access_key }}"
+  secret_key = "{{ aws_secret_key }}"
+  {% else %}
+  # Uses environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+  {% endif %}
+}
+
+resource "aws_instance" "app_server_tf" {
+  ami           = "{{ ami_id }}"
+  instance_type = "t2.micro"
+
+  tags = {
+    Name = "Instance_Cloud_TF"
+  }
+}
+
+output "my_output" {
+  value = aws_instance.app_server_tf
+}
\ No newline at end of file
diff --git a/tests/integration/targets/test_tfc/tasks/main.yml b/tests/integration/targets/test_tfc/tasks/main.yml
index 90ef0bc9..5d593568 100644
--- a/tests/integration/targets/test_tfc/tasks/main.yml
+++ b/tests/integration/targets/test_tfc/tasks/main.yml
@@ -1,141 +1,137 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-- environment: 
-    TF_TOKEN_app_terraform_io: "your-token-here"
-    # Replace with your actual AWS secret access key when running the integration tests locally
-    AWS_ACCESS_KEY_ID: "your-access-key-id-here"
-    AWS_SECRET_ACCESS_KEY: "your-secret-access-key-here"
-
-  block:
-    - set_fact:
-        test_basedir: "{{ test_basedir | default(output_dir) }}"
-        resource_id: "vpc"
-
-    - name: Copy terraform files to work space
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: "{{ test_basedir }}/{{ item }}"
-      loop:
-        - main.tf
-
-    - name: Terraform in present check mode
-      cloud.terraform.terraform:
-        project_path: "{{ test_basedir }}"
-        state: present
-        workspace: "my_tf_project_default"
-        force_init: true
-      check_mode: true
-      register: terraform_result
-
-    - name: Verify Instance_Cloud_TF doesnt exist
-      amazon.aws.ec2_instance_info:
-        region: us-west-2
-        filters:
-          "tag:Name": Instance_Cloud_TF
-          "instance-state-name": running
-      register: instance_info
-
-    - assert:
-        that:
-          - instance_info.instances | length == 0
-        fail_msg: "Instance_Cloud_TF should not exist in check mode"
-
-    - name: TF deploy of a service
-      cloud.terraform.terraform:
-        project_path:  "{{ test_basedir }}"
-        state: present
-        force_init: true
-        workspace: "my_tf_project_default"
-      register: terraform_result1
-
-    - name: Verify Instance_Cloud_TF exist
-      amazon.aws.ec2_instance_info:
-        region: us-west-2
-        filters:
-          "tag:Name": Instance_Cloud_TF
-          "instance-state-name": running
-      register: instance_info2
-
-    - assert:
-        that:
-          - instance_info2.instances | length == 1
-        fail_msg: "Instance_Cloud_TF should exist after deployment"
-
-    - name: TF destroy of a service
-      cloud.terraform.terraform:
-        project_path:  "{{ test_basedir }}"
-        state: absent
-        force_init: true
-        workspace: "my_tf_project_default"
-      register: terraform_result3 
-
-    - name: Verify Instance_Cloud_TF doesnt exist
-      amazon.aws.ec2_instance_info:
-        region: us-west-2
-        filters:
-          "tag:Name": Instance_Cloud_TF
-          "instance-state-name": running
-      register: instance_info3
-
-    - assert:
-        that:
-          - instance_info3.instances | length == 0
-        fail_msg: "Instance_Cloud_TF should be destroyed after TF destroy operation"
-
-    - name: TF deploy of a service without giving workspace in the playbook
-      cloud.terraform.terraform:
-        project_path:  "{{ test_basedir }}"
-        state: present
-        force_init: true
-      register: terraform_result4
-
-    - name: Verify Instance_Cloud_TF exist
-      amazon.aws.ec2_instance_info:
-        region: us-west-2
-        filters:
-          "tag:Name": Instance_Cloud_TF
-          "instance-state-name": running
-      register: instance_info4
-
-    - assert:
-        that:
-          - instance_info4.instances | length == 1
-        fail_msg: "Instance_Cloud_TF should exist after deployment"
-
-    - name: TF destroy of a service
-      cloud.terraform.terraform:
-        project_path:  "{{ test_basedir }}"
-        state: absent
-        force_init: true
-      register: terraform_result4
-
-    - name: Verify Instance_Cloud_TF doesnt exist
-      amazon.aws.ec2_instance_info:
-        region: us-west-2
-        filters:
-          "tag:Name": Instance_Cloud_TF
-          "instance-state-name": running
-      register: instance_info4
-
-    - assert:
-        that:
-          - instance_info4.instances | length == 0
-        fail_msg: "Instance_Cloud_TF should be destroyed after TF destroy operation"
-
-    - name: TF deploy of a service with mismatched workspace
-      cloud.terraform.terraform:
-        project_path: "{{ test_basedir }}"
-        state: present
-        workspace: "nonexistent_workspace"
-        force_init: true
-      register: terraform_negative_test
-      failed_when: false
-
-    - name: Assert failure occurred as expected
-      assert:
-        that:
-          - "'Workspace configuration conflict' in terraform_negative_test.msg"
-        success_msg: "Terraform failed as expected for invalid workspace"
-        fail_msg: "Terraform unexpectedly succeeded for invalid workspace"
+- name: Render and test Terraform with AWS
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - ../vars/main.yml
+
+  tasks:
+    - block:
+        - name: Set test path
+          set_fact:
+            test_basedir: "{{ test_basedir | default(output_dir) }}"
+            resource_id: "vpc"
+
+        - name: Render Terraform template
+          ansible.builtin.template:
+            src: ../files/main.tf.j2
+            dest: "{{ test_basedir }}/main.tf"
+
+        - name: Terraform in check mode
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: present
+            workspace: "{{ tfc_workspace }}"
+            force_init: true
+          check_mode: true
+          register: terraform_result
+
+        - name: Check instance doesn't exist
+          amazon.aws.ec2_instance_info:
+            region: "{{ aws_region }}"
+            filters:
+              "tag:Name": Instance_Cloud_TF
+              "instance-state-name": running
+          register: instance_info
+
+        - assert:
+            that:
+              - instance_info.instances | length == 0
+            fail_msg: "Instance_Cloud_TF should not exist in check mode"
+
+        - name: Deploy Terraform
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: present
+            force_init: true
+            workspace: "{{ tfc_workspace }}"
+          register: terraform_result1
+
+        - name: Check instance exists after deploy
+          amazon.aws.ec2_instance_info:
+            region: "{{ aws_region }}"
+            filters:
+              "tag:Name": Instance_Cloud_TF
+              "instance-state-name": running
+          register: instance_info2
+
+        - assert:
+            that:
+              - instance_info2.instances | length == 1
+            fail_msg: "Instance_Cloud_TF should exist after deployment"
+
+        - name: Destroy Terraform
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: absent
+            force_init: true
+            workspace: "{{ tfc_workspace }}"
+          register: terraform_result3
+
+        - name: Verify destruction
+          amazon.aws.ec2_instance_info:
+            region: "{{ aws_region }}"
+            filters:
+              "tag:Name": Instance_Cloud_TF
+              "instance-state-name": running
+          register: instance_info3
+
+        - assert:
+            that:
+              - instance_info3.instances | length == 0
+            fail_msg: "Instance_Cloud_TF should be destroyed"
+
+        - name: Deploy using default workspace from .tf
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: present
+            force_init: true
+          register: terraform_result4
+
+        - name: Check instance exists after deploy
+          amazon.aws.ec2_instance_info:
+            region: "{{ aws_region }}"
+            filters:
+              "tag:Name": Instance_Cloud_TF
+              "instance-state-name": running
+          register: instance_info4
+
+        - assert:
+            that:
+              - instance_info4.instances | length == 1
+            fail_msg: "Instance_Cloud_TF should exist after deployment"
+
+        - name: Destroy again
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: absent
+            force_init: true
+          register: terraform_result4_destroy
+
+        - name: Confirm instance is destroyed
+          amazon.aws.ec2_instance_info:
+            region: "{{ aws_region }}"
+            filters:
+              "tag:Name": Instance_Cloud_TF
+              "instance-state-name": running
+          register: instance_info4_post_destroy
+
+        - assert:
+            that:
+              - instance_info4_post_destroy.instances | length == 0
+            fail_msg: "Instance_Cloud_TF should be destroyed"
+
+        - name: Deploy with mismatched workspace
+          cloud.terraform.terraform:
+            project_path: "{{ test_basedir }}"
+            state: present
+            workspace: "nonexistent_workspace"
+            force_init: true
+          register: terraform_negative_test
+          failed_when: false
+
+        - name: Expect failure due to invalid workspace
+          assert:
+            that:
+              - "'Workspace configuration conflict' in terraform_negative_test.msg"
+            success_msg: "Terraform failed as expected for invalid workspace"
+            fail_msg: "Terraform unexpectedly succeeded for invalid workspace"
diff --git a/tests/integration/targets/test_tfc/vars/main.yml b/tests/integration/targets/test_tfc/vars/main.yml
new file mode 100644
index 00000000..aa48a9ff
--- /dev/null
+++ b/tests/integration/targets/test_tfc/vars/main.yml
@@ -0,0 +1,8 @@
+---
+tfc_organization: "Ansible-BU-TFC"
+tfc_workspace: "my_tf_project_default"
+aws_region: "us-west-2"
+aws_access_key: "{{ lookup('env', 'AWS_ACCESS_KEY_ID') }}"
+aws_secret_key: "{{ lookup('env', 'AWS_SECRET_ACCESS_KEY') }}"
+ami_id: "ami-830c94e3"
+hcp_token: "{{ lookup('env', 'HCP_TOKEN') }}"