Skip to content

refactor(config): Consolidate config handler to combine windsor.yaml and values.yaml #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmvangun merged 3 commits into from
Oct 20, 2025
+3,992 −6,936
Merged

refactor(config): Consolidate config handler to combine windsor.yaml and values.yaml #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aa59a0
refactor(config): Consolidate config handler to combine windsor.yaml …
rmvangun Oct 20, 2025
3c68a79
Add changes to cluster config
rmvangun Oct 20, 2025
a5452cd
Fix gosec
rmvangun Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1alpha1/cluster/cluster_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type NodeGroupConfig struct {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}
Expand Down
20 changes: 10 additions & 10 deletions api/v1alpha1/cluster/cluster_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -51,7 +51,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand Down Expand Up @@ -80,7 +80,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -102,7 +102,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand Down Expand Up @@ -193,7 +193,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -210,7 +210,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -234,7 +234,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -251,7 +251,7 @@ func TestClusterConfig_Merge(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand Down Expand Up @@ -333,7 +333,7 @@ func TestClusterConfig_Copy(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand All @@ -355,7 +355,7 @@ func TestClusterConfig_Copy(t *testing.T) {
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
Nodes map[string]NodeConfig `yaml:"-"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
}{
Expand Down
32 changes: 14 additions & 18 deletions cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ var initCmd = &cobra.Command{

ctx = context.WithValue(ctx, "quiet", true)
ctx = context.WithValue(ctx, "decrypt", true)
ctx = context.WithValue(ctx, "initPipeline", true)
envPipeline, err := pipelines.WithPipeline(injector, ctx, "envPipeline")
if err != nil {
return fmt.Errorf("failed to set up env pipeline: %w", err)
Expand All @@ -76,72 +77,67 @@ var initCmd = &cobra.Command{
}

configHandler := injector.Resolve("configHandler").(config.ConfigHandler)

// Initialize the config handler to ensure schema validator is available
if err := configHandler.Initialize(); err != nil {
return fmt.Errorf("failed to initialize config handler: %w", err)
}

// Load the schema to enable validation of --set flags
if err := configHandler.LoadContextConfig(); err != nil {
return fmt.Errorf("failed to load context config: %w", err)
}

// Set provider in context if it's been set (either via --provider or --platform)
if initProvider != "" {
if err := configHandler.SetContextValue("provider", initProvider); err != nil {
if err := configHandler.Set("provider", initProvider); err != nil {
return fmt.Errorf("failed to set provider: %w", err)
}
}

// Set other configuration values
if initBackend != "" {
if err := configHandler.SetContextValue("terraform.backend.type", initBackend); err != nil {
if err := configHandler.Set("terraform.backend.type", initBackend); err != nil {
return fmt.Errorf("failed to set terraform.backend.type: %w", err)
}
}
if initAwsProfile != "" {
if err := configHandler.SetContextValue("aws.profile", initAwsProfile); err != nil {
if err := configHandler.Set("aws.profile", initAwsProfile); err != nil {
return fmt.Errorf("failed to set aws.profile: %w", err)
}
}
if initAwsEndpointURL != "" {
if err := configHandler.SetContextValue("aws.endpoint_url", initAwsEndpointURL); err != nil {
if err := configHandler.Set("aws.endpoint_url", initAwsEndpointURL); err != nil {
return fmt.Errorf("failed to set aws.endpoint_url: %w", err)
}
}
if initVmDriver != "" {
if err := configHandler.SetContextValue("vm.driver", initVmDriver); err != nil {
if err := configHandler.Set("vm.driver", initVmDriver); err != nil {
return fmt.Errorf("failed to set vm.driver: %w", err)
}
}
if initCpu > 0 {
if err := configHandler.SetContextValue("vm.cpu", initCpu); err != nil {
if err := configHandler.Set("vm.cpu", initCpu); err != nil {
return fmt.Errorf("failed to set vm.cpu: %w", err)
}
}
if initDisk > 0 {
if err := configHandler.SetContextValue("vm.disk", initDisk); err != nil {
if err := configHandler.Set("vm.disk", initDisk); err != nil {
return fmt.Errorf("failed to set vm.disk: %w", err)
}
}
if initMemory > 0 {
if err := configHandler.SetContextValue("vm.memory", initMemory); err != nil {
if err := configHandler.Set("vm.memory", initMemory); err != nil {
return fmt.Errorf("failed to set vm.memory: %w", err)
}
}
if initArch != "" {
if err := configHandler.SetContextValue("vm.arch", initArch); err != nil {
if err := configHandler.Set("vm.arch", initArch); err != nil {
return fmt.Errorf("failed to set vm.arch: %w", err)
}
}
if initDocker {
if err := configHandler.SetContextValue("docker.enabled", true); err != nil {
if err := configHandler.Set("docker.enabled", true); err != nil {
return fmt.Errorf("failed to set docker.enabled: %w", err)
}
}
if initGitLivereload {
if err := configHandler.SetContextValue("git.livereload.enabled", true); err != nil {
if err := configHandler.Set("git.livereload.enabled", true); err != nil {
return fmt.Errorf("failed to set git.livereload.enabled: %w", err)
}
}
Expand All @@ -150,7 +146,7 @@ var initCmd = &cobra.Command{
for _, setFlag := range initSetFlags {
parts := strings.SplitN(setFlag, "=", 2)
if len(parts) == 2 {
if err := configHandler.SetContextValue(parts[0], parts[1]); err != nil {
if err := configHandler.Set(parts[0], parts[1]); err != nil {
return fmt.Errorf("failed to set %s: %w", parts[0], err)
}
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ func TestInitCmd(t *testing.T) {
}
})

t.Run("ConfigHandlerSetContextValueError", func(t *testing.T) {
t.Run("ConfigHandlerSetError", func(t *testing.T) {
// Given a temporary directory with mocked dependencies
mocks := setupInitTest(t)

// And a config handler that fails to set context values
mockConfigHandler := config.NewMockConfigHandler()
mockConfigHandler.SetContextValueFunc = func(key string, value interface{}) error {
mockConfigHandler.SetFunc = func(key string, value interface{}) error {
return fmt.Errorf("failed to set %s", key)
}
mocks.Injector.Register("configHandler", mockConfigHandler)
Expand Down Expand Up @@ -1066,7 +1066,7 @@ func TestInitCmd(t *testing.T) {

// And a config handler that fails to set values
mockConfigHandler := config.NewMockConfigHandler()
mockConfigHandler.SetContextValueFunc = func(key string, value interface{}) error {
mockConfigHandler.SetFunc = func(key string, value interface{}) error {
return fmt.Errorf("failed to set %s", key)
}
mocks.Injector.Register("configHandler", mockConfigHandler)
Expand Down
Loading
Loading