f

emosbaugh · emosbaugh · commit 69cd9045ece5 · 2025-07-14T12:22:57.000-07:00
diff --git a/api/controllers/kubernetes/install/app.go b/api/controllers/kubernetes/install/app.go
@@ -76,5 +76,5 @@ func (c *InstallController) GetAppConfigValues(ctx context.Context, maskPassword
 		return nil, fmt.Errorf("get app config: %w", err)
 	}
 
-	return c.appConfigManager.GetConfigValues(ctx, appConfig, maskPasswords)
+	return c.appConfigManager.GetConfigValues(appConfig, maskPasswords)
 }
diff --git a/api/controllers/kubernetes/install/app_test.go b/api/controllers/kubernetes/install/app_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestInstallController_SetAppConfigValues(t *testing.T) {
+func TestInstallController_PatchAppConfigValues(t *testing.T) {
 	// Create an app config for testing
 	appConfig := kotsv1beta1.Config{
 		Spec: kotsv1beta1.ConfigSpec{
@@ -169,7 +169,7 @@ func TestInstallController_SetAppConfigValues(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			err = controller.SetAppConfigValues(t.Context(), tt.values)
+			err = controller.PatchAppConfigValues(t.Context(), tt.values)
 
 			if tt.expectedErr {
 				assert.Error(t, err)
@@ -244,7 +244,7 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			values, err := controller.GetAppConfigValues(t.Context())
+			values, err := controller.GetAppConfigValues(t.Context(), false)
 
 			if tt.expectedErr {
 				assert.Error(t, err)
diff --git a/api/controllers/kubernetes/install/controller.go b/api/controllers/kubernetes/install/controller.go
@@ -210,7 +210,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 		if err != nil {
 			return nil, fmt.Errorf("validate app config values: %w", err)
 		}
-		err = controller.appConfigManager.SetConfigValues(*controller.releaseData.AppConfig, controller.configValues)
+		err = controller.appConfigManager.PatchConfigValues(*controller.releaseData.AppConfig, controller.configValues)
 		if err != nil {
 			return nil, fmt.Errorf("set app config values: %w", err)
 		}
diff --git a/api/controllers/kubernetes/install/infra.go b/api/controllers/kubernetes/install/infra.go
@@ -28,7 +28,7 @@ func (c *InstallController) SetupInfra(ctx context.Context) (finalErr error) {
 		}
 	}()
 
-	configValues, err := c.appConfigManager.GetKotsadmConfigValues(ctx, *c.releaseData.AppConfig)
+	configValues, err := c.appConfigManager.GetKotsadmConfigValues(*c.releaseData.AppConfig)
 	if err != nil {
 		return fmt.Errorf("failed to get kotsadm config values: %w", err)
 	}
diff --git a/api/controllers/linux/install/app.go b/api/controllers/linux/install/app.go
@@ -76,5 +76,5 @@ func (c *InstallController) GetAppConfigValues(ctx context.Context, maskPassword
 		return nil, fmt.Errorf("get app config: %w", err)
 	}
 
-	return c.appConfigManager.GetConfigValues(ctx, appConfig, maskPasswords)
+	return c.appConfigManager.GetConfigValues(appConfig, maskPasswords)
 }
diff --git a/api/controllers/linux/install/app_test.go b/api/controllers/linux/install/app_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestInstallController_SetAppConfigValues(t *testing.T) {
+func TestInstallController_PatchAppConfigValues(t *testing.T) {
 	// Create an app config for testing
 	appConfig := kotsv1beta1.Config{
 		Spec: kotsv1beta1.ConfigSpec{
@@ -169,7 +169,7 @@ func TestInstallController_SetAppConfigValues(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			err = controller.SetAppConfigValues(t.Context(), tt.values)
+			err = controller.PatchAppConfigValues(t.Context(), tt.values)
 
 			if tt.expectedErr {
 				assert.Error(t, err)
@@ -244,7 +244,7 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
 			)
 			require.NoError(t, err)
 
-			values, err := controller.GetAppConfigValues(t.Context())
+			values, err := controller.GetAppConfigValues(t.Context(), false)
 
 			if tt.expectedErr {
 				assert.Error(t, err)
diff --git a/api/controllers/linux/install/controller.go b/api/controllers/linux/install/controller.go
@@ -264,7 +264,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 		if err != nil {
 			return nil, fmt.Errorf("validate app config values: %w", err)
 		}
-		err = controller.appConfigManager.SetConfigValues(*controller.releaseData.AppConfig, controller.configValues)
+		err = controller.appConfigManager.PatchConfigValues(*controller.releaseData.AppConfig, controller.configValues)
 		if err != nil {
 			return nil, fmt.Errorf("set app config values: %w", err)
 		}
diff --git a/api/controllers/linux/install/infra.go b/api/controllers/linux/install/infra.go
@@ -43,7 +43,7 @@ func (c *InstallController) SetupInfra(ctx context.Context, ignoreHostPreflights
 		}
 	}
 
-	configValues, err := c.appConfigManager.GetKotsadmConfigValues(ctx, *c.releaseData.AppConfig)
+	configValues, err := c.appConfigManager.GetKotsadmConfigValues(*c.releaseData.AppConfig)
 	if err != nil {
 		return fmt.Errorf("failed to get kotsadm config values: %w", err)
 	}
diff --git a/api/integration/kubernetes/install/app_test.go b/api/integration/kubernetes/install/app_test.go
@@ -352,7 +352,7 @@ func TestKubernetesPatchAppConfigValues(t *testing.T) {
 		apiInstance.RegisterRoutes(router)
 
 		// Create a request to set config values without the required item
-		setRequest := types.SetAppConfigValuesRequest{
+		setRequest := types.PatchAppConfigValuesRequest{
 			Values: map[string]string{
 				"test-item": "new-value",
 				// required-item is intentionally omitted
@@ -363,7 +363,7 @@ func TestKubernetesPatchAppConfigValues(t *testing.T) {
 		require.NoError(t, err)
 
 		// Create a request
-		req := httptest.NewRequest(http.MethodPost, "/kubernetes/install/app/config/values", bytes.NewReader(reqBodyBytes))
+		req := httptest.NewRequest(http.MethodPatch, "/kubernetes/install/app/config/values", bytes.NewReader(reqBodyBytes))
 		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set("Authorization", "Bearer "+"TOKEN")
 		rec := httptest.NewRecorder()
@@ -544,34 +544,34 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 	// Create client with the predefined token
 	c := apiclient.New(server.URL, apiclient.WithToken("TOKEN"))
 
-	// Test SetKubernetesAppConfigValues
-	t.Run("SetKubernetesAppConfigValues", func(t *testing.T) {
+	// Test PatchKubernetesAppConfigValues
+	t.Run("PatchKubernetesAppConfigValues", func(t *testing.T) {
 		// Create config values to set
 		configValues := map[string]string{
 			"test-item":     "new-value",
 			"required-item": "required-value",
 		}
 
 		// Set the app config values using the client
-		config, err := c.SetKubernetesAppConfigValues(configValues)
-		require.NoError(t, err, "SetKubernetesAppConfigValues should succeed")
+		config, err := c.PatchKubernetesAppConfigValues(configValues)
+		require.NoError(t, err, "PatchKubernetesAppConfigValues should succeed")
 
 		// Verify the raw app config is returned (not the applied values)
 		assert.Equal(t, "value", config.Groups[0].Items[0].Value.String(), "first item should return raw config schema value")
 		assert.Equal(t, "", config.Groups[0].Items[1].Value.String(), "second item should return empty value since it has no default")
 	})
 
-	// Test SetKubernetesAppConfigValues with missing required item
-	t.Run("SetKubernetesAppConfigValues missing required", func(t *testing.T) {
+	// Test PatchKubernetesAppConfigValues with missing required item
+	t.Run("PatchKubernetesAppConfigValues missing required", func(t *testing.T) {
 		// Create config values without the required item
 		configValues := map[string]string{
 			"test-item": "new-value",
 			// required-item is intentionally omitted
 		}
 
 		// Set the app config values using the client
-		_, err := c.SetKubernetesAppConfigValues(configValues)
-		require.Error(t, err, "SetKubernetesAppConfigValues should fail with missing required item")
+		_, err := c.PatchKubernetesAppConfigValues(configValues)
+		require.Error(t, err, "PatchKubernetesAppConfigValues should fail with missing required item")
 
 		// Check that the error is of correct type
 		apiErr, ok := err.(*types.APIError)
@@ -582,8 +582,8 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 		assert.Equal(t, "item is required", apiErr.Errors[0].Message, "Error should indicate item is required")
 	})
 
-	// Test SetKubernetesAppConfigValues with invalid state transition
-	t.Run("SetKubernetesAppConfigValues invalid state", func(t *testing.T) {
+	// Test PatchKubernetesAppConfigValues with invalid state transition
+	t.Run("PatchKubernetesAppConfigValues invalid state", func(t *testing.T) {
 		// Create an install controller in a completed state
 		completedInstallController, err := kubernetesinstall.NewInstallController(
 			kubernetesinstall.WithStateMachine(kubernetesinstall.NewStateMachine(kubernetesinstall.WithCurrentState(kubernetesinstall.StateSucceeded))),
@@ -622,8 +622,8 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 		}
 
 		// Set the app config values using the client
-		_, err = completedClient.SetKubernetesAppConfigValues(configValues)
-		require.Error(t, err, "SetKubernetesAppConfigValues should fail with invalid state transition")
+		_, err = completedClient.PatchKubernetesAppConfigValues(configValues)
+		require.Error(t, err, "PatchKubernetesAppConfigValues should fail with invalid state transition")
 
 		// Check that the error is of correct type
 		apiErr, ok := err.(*types.APIError)
diff --git a/api/integration/linux/install/app_test.go b/api/integration/linux/install/app_test.go
@@ -354,7 +354,7 @@ func TestLinuxPatchAppConfigValues(t *testing.T) {
 		apiInstance.RegisterRoutes(router)
 
 		// Create a request to set config values without the required item
-		setRequest := types.SetAppConfigValuesRequest{
+		setRequest := types.PatchAppConfigValuesRequest{
 			Values: map[string]string{
 				"test-item": "new-value",
 				// required-item is intentionally omitted
@@ -365,7 +365,7 @@ func TestLinuxPatchAppConfigValues(t *testing.T) {
 		require.NoError(t, err)
 
 		// Create a request
-		req := httptest.NewRequest(http.MethodPost, "/linux/install/app/config/values", bytes.NewReader(reqBodyBytes))
+		req := httptest.NewRequest(http.MethodPatch, "/linux/install/app/config/values", bytes.NewReader(reqBodyBytes))
 		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set("Authorization", "Bearer "+"TOKEN")
 		rec := httptest.NewRecorder()
@@ -546,34 +546,34 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 	// Create client with the predefined token
 	c := apiclient.New(server.URL, apiclient.WithToken("TOKEN"))
 
-	// Test SetLinuxAppConfigValues
-	t.Run("SetLinuxAppConfigValues", func(t *testing.T) {
+	// Test PatchLinuxAppConfigValues
+	t.Run("PatchLinuxAppConfigValues", func(t *testing.T) {
 		// Create config values to set
 		configValues := map[string]string{
 			"test-item":     "new-value",
 			"required-item": "required-value",
 		}
 
 		// Set the app config values using the client
-		config, err := c.SetLinuxAppConfigValues(configValues)
-		require.NoError(t, err, "SetLinuxAppConfigValues should succeed")
+		config, err := c.PatchLinuxAppConfigValues(configValues)
+		require.NoError(t, err, "PatchLinuxAppConfigValues should succeed")
 
 		// Verify the raw app config is returned (not the applied values)
 		assert.Equal(t, "value", config.Groups[0].Items[0].Value.String(), "first item should return raw config schema value")
 		assert.Equal(t, "", config.Groups[0].Items[1].Value.String(), "second item should return empty value since it has no default")
 	})
 
-	// Test SetLinuxAppConfigValues with missing required item
-	t.Run("SetLinuxAppConfigValues missing required", func(t *testing.T) {
+	// Test PatchLinuxAppConfigValues with missing required item
+	t.Run("PatchLinuxAppConfigValues missing required", func(t *testing.T) {
 		// Create config values without the required item
 		configValues := map[string]string{
 			"test-item": "new-value",
 			// required-item is intentionally omitted
 		}
 
 		// Set the app config values using the client
-		_, err := c.SetLinuxAppConfigValues(configValues)
-		require.Error(t, err, "SetLinuxAppConfigValues should fail with missing required item")
+		_, err := c.PatchLinuxAppConfigValues(configValues)
+		require.Error(t, err, "PatchLinuxAppConfigValues should fail with missing required item")
 
 		// Check that the error is of correct type
 		apiErr, ok := err.(*types.APIError)
@@ -584,8 +584,8 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 		assert.Equal(t, "item is required", apiErr.Errors[0].Message, "Error should indicate item is required")
 	})
 
-	// Test SetLinuxAppConfigValues with invalid state transition
-	t.Run("SetLinuxAppConfigValues invalid state", func(t *testing.T) {
+	// Test PatchLinuxAppConfigValues with invalid state transition
+	t.Run("PatchLinuxAppConfigValues invalid state", func(t *testing.T) {
 		// Create an install controller in a completed state
 		completedInstallController, err := linuxinstall.NewInstallController(
 			linuxinstall.WithStateMachine(linuxinstall.NewStateMachine(linuxinstall.WithCurrentState(linuxinstall.StateSucceeded))),
@@ -624,8 +624,8 @@ func TestInstallController_SetAppConfigValuesWithAPIClient(t *testing.T) {
 		}
 
 		// Set the app config values using the client
-		_, err = completedClient.SetLinuxAppConfigValues(configValues)
-		require.Error(t, err, "SetLinuxAppConfigValues should fail with invalid state transition")
+		_, err = completedClient.PatchLinuxAppConfigValues(configValues)
+		require.Error(t, err, "PatchLinuxAppConfigValues should fail with invalid state transition")
 
 		// Check that the error is of correct type
 		apiErr, ok := err.(*types.APIError)
diff --git a/api/internal/managers/app/config/config.go b/api/internal/managers/app/config/config.go
@@ -1,7 +1,6 @@
 package config
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"maps"
@@ -49,7 +48,7 @@ func (m *appConfigManager) ValidateConfigValues(config kotsv1beta1.Config, confi
 }
 
 // PatchConfigValues performs a partial update by merging new values with existing ones
-func (m *appConfigManager) PatchConfigValues(ctx context.Context, config kotsv1beta1.Config, newValues map[string]string) error {
+func (m *appConfigManager) PatchConfigValues(config kotsv1beta1.Config, newValues map[string]string) error {
 	// Get existing values
 	existingValues, err := m.appConfigStore.GetConfigValues()
 	if err != nil {
@@ -84,7 +83,7 @@ func (m *appConfigManager) PatchConfigValues(ctx context.Context, config kotsv1b
 }
 
 // GetConfigValues returns config values with optional password field masking
-func (m *appConfigManager) GetConfigValues(ctx context.Context, config kotsv1beta1.Config, maskPasswords bool) (map[string]string, error) {
+func (m *appConfigManager) GetConfigValues(config kotsv1beta1.Config, maskPasswords bool) (map[string]string, error) {
 	configValues, err := m.appConfigStore.GetConfigValues()
 	if err != nil {
 		return nil, err
@@ -120,13 +119,13 @@ func (m *appConfigManager) GetConfigValues(ctx context.Context, config kotsv1bet
 	return maskedValues, nil
 }
 
-func (m *appConfigManager) GetKotsadmConfigValues(ctx context.Context, config kotsv1beta1.Config) (kotsv1beta1.ConfigValues, error) {
+func (m *appConfigManager) GetKotsadmConfigValues(config kotsv1beta1.Config) (kotsv1beta1.ConfigValues, error) {
 	filteredConfig, err := m.GetConfig(config)
 	if err != nil {
 		return kotsv1beta1.ConfigValues{}, fmt.Errorf("get config: %w", err)
 	}
 
-	storedValues, err := m.GetConfigValues(ctx, filteredConfig, false)
+	storedValues, err := m.GetConfigValues(filteredConfig, false)
 	if err != nil {
 		return kotsv1beta1.ConfigValues{}, fmt.Errorf("get config values: %w", err)
 	}
diff --git a/api/internal/managers/app/config/config_test.go b/api/internal/managers/app/config/config_test.go
@@ -1,7 +1,6 @@
 package config
 
 import (
-	"context"
 	"errors"
 	"testing"
 
@@ -1190,7 +1189,7 @@ func TestAppConfigManager_PatchConfigValues(t *testing.T) {
 			}
 
 			// Call PatchConfigValues
-			err := manager.PatchConfigValues(context.Background(), tt.config, tt.newValues)
+			err := manager.PatchConfigValues(tt.config, tt.newValues)
 
 			// Verify expectations
 			if tt.wantErr {
@@ -1505,7 +1504,7 @@ func TestAppConfigManager_GetConfigValues(t *testing.T) {
 			}
 
 			// Call GetConfigValues
-			result, err := manager.GetConfigValues(context.Background(), tt.appConfig, tt.maskPasswords)
+			result, err := manager.GetConfigValues(tt.appConfig, tt.maskPasswords)
 
 			// Verify expectations
 			if tt.wantErr {
@@ -2260,7 +2259,7 @@ func TestAppConfigManager_GetKotsadmConfigValues(t *testing.T) {
 			}
 
 			// Call GetKotsadmConfigValues
-			result, err := manager.GetKotsadmConfigValues(t.Context(), tt.config)
+			result, err := manager.GetKotsadmConfigValues(tt.config)
 
 			// Verify expectations
 			if tt.wantErr {
diff --git a/api/internal/managers/app/config/manager.go b/api/internal/managers/app/config/manager.go
@@ -1,8 +1,6 @@
 package config
 
 import (
-	"context"
-
 	configstore "github.com/replicatedhq/embedded-cluster/api/internal/store/app/config"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
@@ -16,14 +14,14 @@ type AppConfigManager interface {
 	// GetConfig returns the config with disabled groups and items filtered out
 	GetConfig(config kotsv1beta1.Config) (kotsv1beta1.Config, error)
 	// GetConfigValues returns the current config values
-	GetConfigValues(ctx context.Context, config kotsv1beta1.Config, maskPasswords bool) (map[string]string, error)
+	GetConfigValues(config kotsv1beta1.Config, maskPasswords bool) (map[string]string, error)
 	// ValidateConfigValues validates the config values
 	ValidateConfigValues(config kotsv1beta1.Config, values map[string]string) error
 	// PatchConfigValues patches the current config values
-	PatchConfigValues(ctx context.Context, config kotsv1beta1.Config, values map[string]string) error
+	PatchConfigValues(config kotsv1beta1.Config, values map[string]string) error
 	// GetKotsadmConfigValues merges the config values with the app config defaults and returns a
 	// kotsv1beta1.ConfigValues struct.
-	GetKotsadmConfigValues(ctx context.Context, config kotsv1beta1.Config) (kotsv1beta1.ConfigValues, error)
+	GetKotsadmConfigValues(config kotsv1beta1.Config) (kotsv1beta1.ConfigValues, error)
 }
 
 // appConfigManager is an implementation of the AppConfigManager interface
diff --git a/api/internal/managers/app/config/manager_mock.go b/api/internal/managers/app/config/manager_mock.go

Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,5 @@ func (c *InstallController) GetAppConfigValues(ctx context.Context, maskPassword`
`76`	`76`	`return nil, fmt.Errorf("get app config: %w", err)`
`77`	`77`	`}`
`78`	`78`
`79`		`- return c.appConfigManager.GetConfigValues(ctx, appConfig, maskPasswords)`
	`79`	`+ return c.appConfigManager.GetConfigValues(appConfig, maskPasswords)`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,`
`210`	`210`	`if err != nil {`
`211`	`211`	`return nil, fmt.Errorf("validate app config values: %w", err)`
`212`	`212`	`}`
`213`		`- err = controller.appConfigManager.SetConfigValues(*controller.releaseData.AppConfig, controller.configValues)`
	`213`	`+ err = controller.appConfigManager.PatchConfigValues(*controller.releaseData.AppConfig, controller.configValues)`
`214`	`214`	`if err != nil {`
`215`	`215`	`return nil, fmt.Errorf("set app config values: %w", err)`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (c *InstallController) SetupInfra(ctx context.Context) (finalErr error) {`
`28`	`28`	`}`
`29`	`29`	`}()`
`30`	`30`
`31`		`- configValues, err := c.appConfigManager.GetKotsadmConfigValues(ctx, *c.releaseData.AppConfig)`
	`31`	`+ configValues, err := c.appConfigManager.GetKotsadmConfigValues(*c.releaseData.AppConfig)`
`32`	`32`	`if err != nil {`
`33`	`33`	`return fmt.Errorf("failed to get kotsadm config values: %w", err)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,`
`264`	`264`	`if err != nil {`
`265`	`265`	`return nil, fmt.Errorf("validate app config values: %w", err)`
`266`	`266`	`}`
`267`		`- err = controller.appConfigManager.SetConfigValues(*controller.releaseData.AppConfig, controller.configValues)`
	`267`	`+ err = controller.appConfigManager.PatchConfigValues(*controller.releaseData.AppConfig, controller.configValues)`
`268`	`268`	`if err != nil {`
`269`	`269`	`return nil, fmt.Errorf("set app config values: %w", err)`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (c *InstallController) SetupInfra(ctx context.Context, ignoreHostPreflights`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- configValues, err := c.appConfigManager.GetKotsadmConfigValues(ctx, *c.releaseData.AppConfig)`
	`46`	`+ configValues, err := c.appConfigManager.GetKotsadmConfigValues(*c.releaseData.AppConfig)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return fmt.Errorf("failed to get kotsadm config values: %w", err)`
`49`	`49`	`}`