All packages follow STYLE.md guidelines

.gitignore

@@ -46,3 +46,4 @@ contexts/**/.tfstate/
 contexts/**/.kube/
 contexts/**/.talos/
 contexts/**/.aws/
+contexts/**/.omni/

api/v1alpha1/blueprint_types.go

@@ -32,13 +32,13 @@ type Blueprint struct {
 }
 
 type PartialBlueprint struct {
-	Kind                string                   `yaml:"kind"`
-	ApiVersion          string                   `yaml:"apiVersion"`
-	Metadata            Metadata                 `yaml:"metadata"`
-	Sources             []Source                 `yaml:"sources"`
-	Repository          Repository               `yaml:"repository"`
-	TerraformComponents []TerraformComponent     `yaml:"terraform"`
-	Kustomizations      []map[string]interface{} `yaml:"kustomize"`
+	Kind                string               `yaml:"kind"`
+	ApiVersion          string               `yaml:"apiVersion"`
+	Metadata            Metadata             `yaml:"metadata"`
+	Sources             []Source             `yaml:"sources"`
+	Repository          Repository           `yaml:"repository"`
+	TerraformComponents []TerraformComponent `yaml:"terraform"`
+	Kustomizations      []map[string]any     `yaml:"kustomize"`
 }
 
 // Metadata describes a blueprint, including name and authors.
@@ -113,7 +113,7 @@ type TerraformComponent struct {
 	FullPath string `yaml:"-"`
 
 	// Values are configuration values for the module.
-	Values map[string]interface{} `yaml:"values,omitempty"`
+	Values map[string]any `yaml:"values,omitempty"`
 
 	// Variables are input variables for the module.
 	Variables map[string]TerraformVariable `yaml:"variables,omitempty"`
@@ -125,7 +125,7 @@ type TerraformVariable struct {
 	Type string `yaml:"type,omitempty"`
 
 	// Default value for the variable.
-	Default interface{} `yaml:"default,omitempty"`
+	Default any `yaml:"default,omitempty"`
 
 	// Description of the variable's purpose.
 	Description string `yaml:"description,omitempty"`
@@ -247,7 +247,7 @@ func (b *Blueprint) DeepCopy() *Blueprint {
 			}
 		}
 
-		valuesCopy := make(map[string]interface{}, len(component.Values))
+		valuesCopy := make(map[string]any, len(component.Values))
 		for key, value := range component.Values {
 			valuesCopy[key] = value
 		}
@@ -379,7 +379,7 @@ func (b *Blueprint) Merge(overlay *Blueprint) {
 					mergedComponent := existingComponent
 
 					if mergedComponent.Values == nil {
-						mergedComponent.Values = make(map[string]interface{})
+						mergedComponent.Values = make(map[string]any)
 					}
 					for k, v := range overlayComponent.Values {
 						mergedComponent.Values[k] = v

api/v1alpha1/blueprint_types_test.go

@@ -41,7 +41,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values:   map[string]interface{}{"key1": "value1"},
+					Values:   map[string]any{"key1": "value1"},
 					FullPath: "original/full/path",
 				},
 			},
@@ -89,7 +89,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var2": {Default: "default2"},
 					},
-					Values:   map[string]interface{}{"key2": "value2"},
+					Values:   map[string]any{"key2": "value2"},
 					FullPath: "updated/full/path",
 				},
 				{
@@ -98,7 +98,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var3": {Default: "default3"},
 					},
-					Values:   map[string]interface{}{"key3": "value3"},
+					Values:   map[string]any{"key3": "value3"},
 					FullPath: "new/full/path",
 				},
 			},
@@ -240,7 +240,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 					FullPath: "overlay/full/path",
@@ -340,7 +340,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 					FullPath: "original/full/path",
@@ -356,7 +356,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var2": {Default: "default2"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key2": "value2",
 					},
 					FullPath: "updated/full/path",
@@ -396,7 +396,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 					FullPath: "original/full/path",
@@ -444,7 +444,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 					FullPath: "overlay/full/path",
@@ -565,7 +565,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var1": {Default: "default1"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 					FullPath: "original/full/path",
@@ -581,7 +581,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var2": {Default: "default2"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key2": "value2",
 					},
 					FullPath: "updated/full/path",
@@ -592,7 +592,7 @@ func TestBlueprint_Merge(t *testing.T) {
 					Variables: map[string]TerraformVariable{
 						"var3": {Default: "default3"},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key3": "value3",
 					},
 					FullPath: "new/full/path",
@@ -925,7 +925,7 @@ func TestBlueprint_DeepCopy(t *testing.T) {
 							Description: "A test variable",
 						},
 					},
-					Values: map[string]interface{}{
+					Values: map[string]any{
 						"key1": "value1",
 					},
 				},

api/v1alpha1/docker/docker_config.go

@@ -21,6 +21,10 @@ func (base *DockerConfig) Merge(overlay *DockerConfig) {
 		base.Enabled = overlay.Enabled
 	}
 
+	if overlay.RegistryURL != "" {
+		base.RegistryURL = overlay.RegistryURL
+	}
+
 	// Overwrite base.Registries entirely with overlay.Registries if defined, otherwise keep base.Registries
 	if overlay.Registries != nil {
 		base.Registries = overlay.Registries
@@ -49,8 +53,9 @@ func (c *DockerConfig) Copy() *DockerConfig {
 	}
 
 	return &DockerConfig{
-		Enabled:    enabledCopy,
-		Registries: registriesCopy,
+		Enabled:     enabledCopy,
+		RegistryURL: c.RegistryURL,
+		Registries:  registriesCopy,
 	}
 }
 

api/v1alpha1/docker/docker_config_test.go

@@ -7,15 +7,17 @@ import (
 func TestDockerConfig_Merge(t *testing.T) {
 	t.Run("MergeWithNonNilValues", func(t *testing.T) {
 		base := &DockerConfig{
-			Enabled: ptrBool(true),
+			Enabled:     ptrBool(true),
+			RegistryURL: "base-registry-url",
 			Registries: map[string]RegistryConfig{
 				"base-registry1": {Remote: "base-remote1", Local: "base-local1", HostName: "base-hostname1"},
 				"base-registry2": {Remote: "base-remote2", Local: "base-local2", HostName: "base-hostname2"},
 			},
 		}
 
 		overlay := &DockerConfig{
-			Enabled: ptrBool(false),
+			Enabled:     ptrBool(false),
+			RegistryURL: "overlay-registry-url",
 			Registries: map[string]RegistryConfig{
 				"base-registry1": {Remote: "overlay-remote1", Local: "overlay-local1", HostName: "overlay-hostname1"},
 				"new-registry":   {Remote: "overlay-remote2", Local: "overlay-local2", HostName: "overlay-hostname2"},
@@ -27,6 +29,9 @@ func TestDockerConfig_Merge(t *testing.T) {
 		if base.Enabled == nil || *base.Enabled != false {
 			t.Errorf("Enabled mismatch: expected %v, got %v", false, *base.Enabled)
 		}
+		if base.RegistryURL != "overlay-registry-url" {
+			t.Errorf("RegistryURL mismatch: expected %v, got %v", "overlay-registry-url", base.RegistryURL)
+		}
 		if len(base.Registries) != 2 {
 			t.Errorf("Registries length mismatch: expected %v, got %v", 2, len(base.Registries))
 		}
@@ -51,22 +56,27 @@ func TestDockerConfig_Merge(t *testing.T) {
 
 	t.Run("MergeWithNilValues", func(t *testing.T) {
 		base := &DockerConfig{
-			Enabled: ptrBool(true),
+			Enabled:     ptrBool(true),
+			RegistryURL: "base-registry-url",
 			Registries: map[string]RegistryConfig{
 				"base-registry1": {Remote: "base-remote1", Local: "base-local1", HostName: "base-hostname1"},
 			},
 		}
 
 		overlay := &DockerConfig{
-			Enabled:    nil,
-			Registries: nil,
+			Enabled:     nil,
+			RegistryURL: "",
+			Registries:  nil,
 		}
 
 		base.Merge(overlay)
 
 		if base.Enabled == nil || *base.Enabled != true {
 			t.Errorf("Enabled mismatch: expected %v, got %v", true, *base.Enabled)
 		}
+		if base.RegistryURL != "base-registry-url" {
+			t.Errorf("RegistryURL mismatch: expected %v, got %v", "base-registry-url", base.RegistryURL)
+		}
 		if len(base.Registries) != 1 || base.Registries["base-registry1"].Remote != "base-remote1" || base.Registries["base-registry1"].Local != "base-local1" || base.Registries["base-registry1"].HostName != "base-hostname1" {
 			t.Errorf("Registries mismatch: expected %v, got %v", "base-registry1", base.Registries["base-registry1"])
 		}

cmd/context_test.go

@@ -34,7 +34,7 @@ func setupSafeContextCmdMocks(optionalInjector ...di.Injector) MockSafeContextCm
 
 	// Setup mock config handler
 	mockConfigHandler := config.NewMockConfigHandler()
-	mockConfigHandler.SetFunc = func(key string, value interface{}) error {
+	mockConfigHandler.SetFunc = func(key string, value any) error {
 		return nil
 	}
 	mockConfigHandler.GetContextFunc = func() string {

cmd/down_test.go

@@ -47,7 +47,7 @@ func setupSafeDownCmdMocks(optionalInjector ...di.Injector) MockSafeDownCmdCompo
 
 	// Setup mock config handler
 	mockConfigHandler := config.NewMockConfigHandler()
-	mockConfigHandler.SetFunc = func(key string, value interface{}) error {
+	mockConfigHandler.SetFunc = func(key string, value any) error {
 		return nil
 	}
 	mockConfigHandler.GetContextFunc = func() string {

cmd/env_test.go

@@ -125,12 +125,6 @@ func TestEnvCmd(t *testing.T) {
 		}
 	})
 
-	// Also reset the session token in the shell package
-	shell.ResetSessionToken()
-	t.Cleanup(func() {
-		shell.ResetSessionToken()
-	})
-
 	t.Run("Success", func(t *testing.T) {
 		defer resetRootCmd()
 

cmd/init_test.go

@@ -27,7 +27,7 @@ func setupSafeInitCmdMocks(existingInjectors ...di.Injector) *initMockObjects {
 	mockController.InitializeComponentsFunc = func() error { return nil }
 
 	mockConfigHandler := config.NewMockConfigHandler()
-	mockConfigHandler.SetFunc = func(key string, value interface{}) error { return nil }
+	mockConfigHandler.SetFunc = func(key string, value any) error { return nil }
 	mockConfigHandler.GetContextFunc = func() string { return "test-context" }
 	mockConfigHandler.SetContextFunc = func(contextName string) error { return nil }
 	mockConfigHandler.InitializeFunc = func() error { return nil }
@@ -200,7 +200,7 @@ func TestInitCmd(t *testing.T) {
 			}
 			return nil
 		}
-		mocks.ConfigHandler.SetContextValueFunc = func(key string, value interface{}) error {
+		mocks.ConfigHandler.SetContextValueFunc = func(key string, value any) error {
 			if key == "vm.driver" {
 				if goos() == "darwin" || goos() == "windows" {
 					if value == "docker-desktop" {
@@ -356,7 +356,7 @@ func TestInitCmd(t *testing.T) {
 		mocks := setupSafeInitCmdMocks()
 
 		// Mock SetContextValue to return an error
-		mocks.ConfigHandler.SetContextValueFunc = func(key string, value interface{}) error {
+		mocks.ConfigHandler.SetContextValueFunc = func(key string, value any) error {
 			if key == "vm.driver" {
 				return fmt.Errorf("mocked error setting vm driver")
 			}
@@ -434,7 +434,7 @@ func TestInitCmd(t *testing.T) {
 		mocks := setupSafeInitCmdMocks()
 
 		// Mock SetContextValue to return an error for a specific flag
-		mocks.ConfigHandler.SetContextValueFunc = func(configPath string, value interface{}) error {
+		mocks.ConfigHandler.SetContextValueFunc = func(configPath string, value any) error {
 			if configPath == "aws.aws_endpoint_url" {
 				return fmt.Errorf("mocked error setting aws-endpoint-url configuration")
 			}

cmd/up_test.go

@@ -51,7 +51,7 @@ func setupSafeUpCmdMocks(optionalInjector ...di.Injector) SafeUpCmdComponents {
 
 	// Setup mock config handler
 	mockConfigHandler := config.NewMockConfigHandler()
-	mockConfigHandler.SetFunc = func(key string, value interface{}) error {
+	mockConfigHandler.SetFunc = func(key string, value any) error {
 		return nil
 	}
 	mockConfigHandler.GetContextFunc = func() string {

cmd/windsor/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/windsorcli/cli/cmd"
@@ -16,12 +15,6 @@ func main() {
 	// Create a new controller
 	controller := controller.NewRealController(injector)
 
-	// Initialize components
-	if err := controller.InitializeComponents(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error initializing components: %v\n", err)
-		os.Exit(1)
-	}
-
 	// Execute the root command and handle the error,
 	// exiting with a non-zero exit code if there's an error
 	if err := cmd.Execute(controller); err != nil {

docs/reference/blueprint.md

@@ -115,7 +115,7 @@ terraform:
 |------------|----------------------------------|--------------------------------------------------|
 | `source`   | `string`                         | Source of the Terraform module. Must be included in the list of sources. |
 | `path`     | `string`                         | Path of the Terraform module relative to the `terraform/` folder.                    |
-| `values`   | `map[string]interface{}`         | Configuration values for the module.             |
+| `values`   | `map[string]any`         | Configuration values for the module.             |
 | `variables`| `map[string]TerraformVariable`   | Input variables for the module.                  |
 
 ### Kustomization

go.mod

@@ -153,7 +153,6 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect
-	github.com/zeebo/errs/v2 v2.0.5 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
@@ -191,5 +190,4 @@ require (
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.0.0 // indirect
 )