chore(terraform): Place terraform module shims in context specific folder

docs/guides/terraform.md

@@ -10,15 +10,16 @@ To ensure compatibility with Windsor, your Terraform project should adhere to a
 
 ```plaintext
 .windsor/
-└── .tf_modules/
-    ├── cluster/
-    │   └── talos/
-    │       ├── main.tf
-    │       └── variables.tf
-    └── gitops/
-        └── flux/
-            ├── main.tf
-            └── variables.tf
+└── contexts/
+    └── local/
+        ├── cluster/
+        │   └── talos/
+        │       ├── main.tf
+        │       └── variables.tf
+        └── gitops/
+            └── flux/
+                ├── main.tf
+                └── variables.tf
 contexts/
 └── local/
     ├── .terraform/
@@ -69,7 +70,7 @@ kustomize:
   path: ""
 ```
 
-Modules like `cluster/talos` and `gitops/flux` are remote, with shims in `.windsor/.tf_modules/cluster/talos` and `.windsor/.tf_modules/gitops/flux`. Running `windsor up` applies these modules sequentially.
+Modules like `cluster/talos` and `gitops/flux` are remote, with shims in `.windsor/contexts/<context>/cluster/talos` and `.windsor/contexts/<context>/gitops/flux`. Running `windsor up` applies these modules sequentially.
 
 Store your Terraform code in a `terraform/` folder within your project. To reference it in `blueprint.yaml`, add a section without a `source` field. For example, if your code is in `terraform/example/my-app`, add:
 
@@ -85,9 +86,9 @@ terraform:
 Now, running `windsor up` will execute your module after the `gitops/flux` module.
 
 ## Importing Resources
-The Windsor CLI offers a unique method for importing and using remote Terraform modules. Running `windsor init local` unpacks shims that reference basic modules from Windsor's [core blueprint](https://github.com/windsorcli/core), stored in `.windsor/.tf_modules`.
+The Windsor CLI offers a unique method for importing and using remote Terraform modules. Running `windsor init local` unpacks shims that reference basic modules from Windsor's [core blueprint](https://github.com/windsorcli/core), stored in `.windsor/contexts/<context>/`.
 
-Think of the `tf_modules` folder as the remote module counterpart to the local `terraform` folder. Variables for these modules are located in `contexts/<context-name>/terraform/path/to/module.tfvars`.
+Think of the `contexts/<context>/` folder as the remote module counterpart to the local `terraform` folder. Variables for these modules are located in `.windsor/contexts/<context>/path/to/module/terraform.tfvars`.
 
 ## Terraform CLI Assistance
 

pkg/composer/blueprint/blueprint_handler.go

@@ -1266,7 +1266,7 @@ func (b *BaseBlueprintHandler) resolveComponentPaths(blueprint *blueprintv1alpha
 		componentCopy := component
 
 		if b.isValidTerraformRemoteSource(componentCopy.Source) || b.isOCISource(componentCopy.Source) || strings.HasPrefix(componentCopy.Source, "file://") {
-			componentCopy.FullPath = filepath.Join(projectRoot, ".windsor", ".tf_modules", componentCopy.Path)
+			componentCopy.FullPath = filepath.Join(projectRoot, ".windsor", "contexts", b.runtime.ContextName, "terraform", componentCopy.Path)
 		} else {
 			componentCopy.FullPath = filepath.Join(projectRoot, "terraform", componentCopy.Path)
 		}

pkg/composer/blueprint/blueprint_handler_private_test.go

@@ -536,6 +536,7 @@ func TestBaseBlueprintHandler_resolveComponentPaths(t *testing.T) {
 		// Given a handler with components using remote sources
 		handler := setup(t)
 		handler.runtime.ProjectRoot = "/test/project"
+		handler.runtime.ContextName = "local"
 		blueprint := &blueprintv1alpha1.Blueprint{
 			TerraformComponents: []blueprintv1alpha1.TerraformComponent{
 				{
@@ -548,8 +549,8 @@ func TestBaseBlueprintHandler_resolveComponentPaths(t *testing.T) {
 		// When resolving component paths
 		handler.resolveComponentPaths(blueprint)
 
-		// Then remote source components should use .windsor/.tf_modules path
-		if blueprint.TerraformComponents[0].FullPath != filepath.Join("/test/project", ".windsor", ".tf_modules", "test-module") {
+		// Then remote source components should use .windsor/contexts/<context> path
+		if blueprint.TerraformComponents[0].FullPath != filepath.Join("/test/project", ".windsor", "contexts", "local", "terraform", "test-module") {
 			t.Errorf("Expected FullPath for remote source, got: %s", blueprint.TerraformComponents[0].FullPath)
 		}
 	})
@@ -558,6 +559,7 @@ func TestBaseBlueprintHandler_resolveComponentPaths(t *testing.T) {
 		// Given a handler with components using OCI sources
 		handler := setup(t)
 		handler.runtime.ProjectRoot = "/test/project"
+		handler.runtime.ContextName = "local"
 		handler.blueprint = blueprintv1alpha1.Blueprint{
 			Sources: []blueprintv1alpha1.Source{
 				{
@@ -578,8 +580,8 @@ func TestBaseBlueprintHandler_resolveComponentPaths(t *testing.T) {
 		// When resolving component paths
 		handler.resolveComponentPaths(blueprint)
 
-		// Then OCI source components should use .windsor/.tf_modules path
-		if blueprint.TerraformComponents[0].FullPath != filepath.Join("/test/project", ".windsor", ".tf_modules", "test-module") {
+		// Then OCI source components should use .windsor/contexts/<context> path
+		if blueprint.TerraformComponents[0].FullPath != filepath.Join("/test/project", ".windsor", "contexts", "local", "terraform", "test-module") {
 			t.Errorf("Expected FullPath for OCI source, got: %s", blueprint.TerraformComponents[0].FullPath)
 		}
 	})

pkg/composer/blueprint/blueprint_handler_public_test.go

@@ -392,6 +392,7 @@ func setupBlueprintMocks(t *testing.T, opts ...func(*BlueprintTestMocks)) *Bluep
 		TemplateRoot:  filepath.Join(tmpDir, "contexts", "_template"),
 		ConfigHandler: configHandler,
 		Shell:         mockShell,
+		ContextName:   "local",
 	}
 
 	// Create mocks struct
@@ -605,7 +606,7 @@ func TestBlueprintHandler_GetTerraformComponents(t *testing.T) {
 		}
 
 		// And the component should have the correct full path
-		expectedPath := filepath.FromSlash(filepath.Join(projectRoot, ".windsor", ".tf_modules", "path/to/module"))
+		expectedPath := filepath.FromSlash(filepath.Join(projectRoot, ".windsor", "contexts", "local", "terraform", "path/to/module"))
 		if resolvedComponents[0].FullPath != expectedPath {
 			t.Errorf("Expected path %q, got %q", expectedPath, resolvedComponents[0].FullPath)
 		}
@@ -679,7 +680,7 @@ func TestBlueprintHandler_GetTerraformComponents(t *testing.T) {
 		}
 
 		// And the component should have the correct full path with backslashes preserved
-		expectedPath := filepath.Join(projectRoot, ".windsor", ".tf_modules", "path\\to\\module")
+		expectedPath := filepath.Join(projectRoot, ".windsor", "contexts", "local", "terraform", "path\\to\\module")
 		if resolvedComponents[0].FullPath != expectedPath {
 			t.Errorf("Expected path %q, got %q", expectedPath, resolvedComponents[0].FullPath)
 		}
@@ -692,6 +693,7 @@ func TestBlueprintHandler_GetTerraformComponents(t *testing.T) {
 		// And a project root directory
 		projectRoot := "/test/project"
 		handler.runtime.ProjectRoot = projectRoot
+		handler.runtime.ContextName = "local"
 
 		// And an OCI source
 		sources := []blueprintv1alpha1.Source{
@@ -729,7 +731,7 @@ func TestBlueprintHandler_GetTerraformComponents(t *testing.T) {
 		}
 
 		// And the component should have the correct full path
-		expectedPath := filepath.FromSlash(filepath.Join(projectRoot, ".windsor", ".tf_modules", "cluster/talos"))
+		expectedPath := filepath.FromSlash(filepath.Join(projectRoot, ".windsor", "contexts", "local", "terraform", "cluster/talos"))
 		if resolvedComponents[0].FullPath != expectedPath {
 			t.Errorf("Expected path %q, got %q", expectedPath, resolvedComponents[0].FullPath)
 		}

pkg/composer/terraform/archive_module_resolver_test.go

@@ -120,7 +120,7 @@ func TestArchiveModuleResolver_ProcessModules(t *testing.T) {
 				{
 					Path:     "test-module",
 					Source:   "file://" + archivePath + "//terraform/test-module",
-					FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+					FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 				},
 			}
 		}
@@ -134,7 +134,7 @@ func TestArchiveModuleResolver_ProcessModules(t *testing.T) {
 		}
 
 		// And the module directory should be created
-		moduleDir := filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module")
+		moduleDir := filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module")
 		if _, err := os.Stat(moduleDir); err != nil {
 			t.Errorf("Expected module directory to be created, got error: %v", err)
 		}
@@ -180,7 +180,7 @@ func TestArchiveModuleResolver_ProcessModules(t *testing.T) {
 				{
 					Path:     "test-module",
 					Source:   "file:///invalid/path.tar.gz//terraform/test-module",
-					FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+					FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 				},
 			}
 		}
@@ -1130,7 +1130,7 @@ func TestArchiveModuleResolver_processComponent(t *testing.T) {
 		component := blueprintv1alpha1.TerraformComponent{
 			Path:     "test-module",
 			Source:   "file:///invalid/path.tar.gz//terraform/test-module",
-			FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+			FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 		}
 
 		// Override MkdirAll to succeed
@@ -1159,7 +1159,7 @@ func TestArchiveModuleResolver_processComponent(t *testing.T) {
 		component := blueprintv1alpha1.TerraformComponent{
 			Path:     "test-module",
 			Source:   "file://" + archivePath + "//terraform/test-module",
-			FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+			FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 		}
 
 		// Override shims for real file operations
@@ -1200,7 +1200,7 @@ func TestArchiveModuleResolver_processComponent(t *testing.T) {
 		component := blueprintv1alpha1.TerraformComponent{
 			Path:     "test-module",
 			Source:   "file://" + archivePath + "//terraform/test-module",
-			FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+			FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 		}
 
 		// Override shims for real file operations
@@ -1246,7 +1246,7 @@ func TestArchiveModuleResolver_processComponent(t *testing.T) {
 		component := blueprintv1alpha1.TerraformComponent{
 			Path:     "test-module",
 			Source:   "file://" + archivePath + "//terraform/test-module",
-			FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+			FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 		}
 
 		// Override shims for real file operations
@@ -1293,7 +1293,7 @@ func TestArchiveModuleResolver_processComponent(t *testing.T) {
 		component := blueprintv1alpha1.TerraformComponent{
 			Path:     "test-module",
 			Source:   "file://" + archivePath + "//terraform/test-module",
-			FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module"),
+			FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module"),
 		}
 
 		// Override shims for real file operations

pkg/composer/terraform/composite_module_resolver_test.go

@@ -68,7 +68,7 @@ func TestCompositeModuleResolver_ProcessModules(t *testing.T) {
 				{
 					Path:     "oci-module",
 					Source:   "oci://registry.example.com/module:latest//terraform/oci-module",
-					FullPath: filepath.Join(tmpDir, ".windsor", ".tf_modules", "oci-module"),
+					FullPath: filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "oci-module"),
 				},
 				{
 					Path:     "standard-module",
@@ -287,8 +287,9 @@ func TestCompositeModuleResolver_GenerateTfvars(t *testing.T) {
 		resolver, mocks := setup(t)
 		tmpDir := t.TempDir()
 		mocks.Runtime.ProjectRoot = tmpDir
+		mocks.Runtime.ContextName = "local"
 
-		moduleDir := filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module")
+		moduleDir := filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module")
 		if err := os.MkdirAll(moduleDir, 0755); err != nil {
 			t.Fatalf("Failed to create module directory: %v", err)
 		}
@@ -332,8 +333,9 @@ func TestCompositeModuleResolver_GenerateTfvars(t *testing.T) {
 		resolver, mocks := setup(t)
 		tmpDir := t.TempDir()
 		mocks.Runtime.ProjectRoot = tmpDir
+		mocks.Runtime.ContextName = "local"
 
-		moduleDir := filepath.Join(tmpDir, ".windsor", ".tf_modules", "test-module")
+		moduleDir := filepath.Join(tmpDir, ".windsor", "contexts", "local", "terraform", "test-module")
 		if err := os.MkdirAll(moduleDir, 0755); err != nil {
 			t.Fatalf("Failed to create module directory: %v", err)
 		}

pkg/composer/terraform/module_resolver.go

@@ -190,7 +190,7 @@ func (h *BaseModuleResolver) parseVariablesFile(variablesTfPath string, protecte
 }
 
 // generateComponentTfvars generates tfvars files for a single Terraform component.
-// All components write tfvars files to .windsor/.tf_modules/<component.Path>/terraform.tfvars,
+// All components write tfvars files to .windsor/contexts/<context>/terraform/<component.Path>/terraform.tfvars,
 // regardless of whether they have a Source (remote) or not (local). This unifies the behavior
 // between local templates and OCI artifacts, preventing writes to the contexts folder.
 // Returns an error if variables.tf cannot be found or if tfvars file generation fails.
@@ -200,7 +200,7 @@ func (h *BaseModuleResolver) generateComponentTfvars(projectRoot string, compone
 		return fmt.Errorf("failed to find variables.tf for component %s: %w", component.Path, err)
 	}
 
-	moduleTfvarsPath := filepath.Join(projectRoot, ".windsor", ".tf_modules", component.Path, "terraform.tfvars")
+	moduleTfvarsPath := filepath.Join(projectRoot, ".windsor", "contexts", h.runtime.ContextName, "terraform", component.Path, "terraform.tfvars")
 	if err := h.removeTfvarsFiles(filepath.Dir(moduleTfvarsPath)); err != nil {
 		return fmt.Errorf("failed cleaning existing .tfvars in module dir %s: %w", filepath.Dir(moduleTfvarsPath), err)
 	}
@@ -212,14 +212,14 @@ func (h *BaseModuleResolver) generateComponentTfvars(projectRoot string, compone
 }
 
 // findVariablesTfFileForComponent returns the path to the variables.tf file for the specified Terraform component.
-// If the component has a non-empty Source, the path is .windsor/.tf_modules/<component.Path>/variables.tf under the project root.
+// If the component has a non-empty Source, the path is .windsor/contexts/<context>/terraform/<component.Path>/variables.tf under the project root.
 // If the component has an empty Source, the path is terraform/<component.Path>/variables.tf under the project root.
 // Returns the variables.tf file path if it exists, or an error if not found.
 func (h *BaseModuleResolver) findVariablesTfFileForComponent(projectRoot string, component blueprintv1alpha1.TerraformComponent) (string, error) {
 	var variablesTfPath string
 
 	if component.Source != "" {
-		variablesTfPath = filepath.Join(projectRoot, ".windsor", ".tf_modules", component.Path, "variables.tf")
+		variablesTfPath = filepath.Join(projectRoot, ".windsor", "contexts", h.runtime.ContextName, "terraform", component.Path, "variables.tf")
 	} else {
 		variablesTfPath = filepath.Join(projectRoot, "terraform", component.Path, "variables.tf")
 	}