API to get Config from release (#2421)

* API to get Config from release

* update tests

* feedback

* f

* f

Author: sgalsaleh

api/Makefile

@@ -5,7 +5,7 @@ include ../common.mk
 .PHONY: swagger
 swagger: swag
 	swag fmt -g api.go
-	swag init --v3.1 -g api.go
+	swag init --parseDependency --v3.1 -g api.go
 
 .PHONY: swag
 swag:

api/client/client.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 )
 
 type Client interface {
@@ -16,12 +17,14 @@ type Client interface {
 	ConfigureLinuxInstallation(config types.LinuxInstallationConfig) (types.Status, error)
 	SetupLinuxInfra(ignoreHostPreflights bool) (types.Infra, error)
 	GetLinuxInfraStatus() (types.Infra, error)
+	GetLinuxAppConfig() (kotsv1beta1.Config, error)
 
 	GetKubernetesInstallationConfig() (types.KubernetesInstallationConfig, error)
 	ConfigureKubernetesInstallation(config types.KubernetesInstallationConfig) (types.Status, error)
 	GetKubernetesInstallationStatus() (types.Status, error)
 	SetupKubernetesInfra() (types.Infra, error)
 	GetKubernetesInfraStatus() (types.Infra, error)
+	GetKubernetesAppConfig() (kotsv1beta1.Config, error)
 }
 
 type client struct {

api/client/client_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
+	"github.com/replicatedhq/kotskinds/multitype"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -582,3 +584,129 @@ func TestErrorFromResponse(t *testing.T) {
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "unexpected response")
 }
+
+func TestLinuxGetAppConfig(t *testing.T) {
+	// Define expected config once
+	expectedConfig := kotsv1beta1.Config{
+		Spec: kotsv1beta1.ConfigSpec{
+			Groups: []kotsv1beta1.ConfigGroup{
+				{
+					Name:  "test-group",
+					Title: "Test Group",
+					Items: []kotsv1beta1.ConfigItem{
+						{
+							Name:    "test-item",
+							Type:    "text",
+							Title:   "Test Item",
+							Default: multitype.BoolOrString{StrVal: "default"},
+							Value:   multitype.BoolOrString{StrVal: "value"},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	// Create a test server
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "GET", r.Method)
+		assert.Equal(t, "/api/linux/install/app/config", r.URL.Path)
+
+		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
+		assert.Equal(t, "Bearer test-token", r.Header.Get("Authorization"))
+
+		// Return successful response
+		w.WriteHeader(http.StatusOK)
+		json.NewEncoder(w).Encode(expectedConfig)
+	}))
+	defer server.Close()
+
+	// Test successful get
+	c := New(server.URL, WithToken("test-token"))
+	config, err := c.GetLinuxAppConfig()
+	assert.NoError(t, err)
+	assert.Equal(t, expectedConfig, config)
+
+	// Test error response
+	errorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(types.APIError{
+			StatusCode: http.StatusInternalServerError,
+			Message:    "Internal Server Error",
+		})
+	}))
+	defer errorServer.Close()
+
+	c = New(errorServer.URL, WithToken("test-token"))
+	config, err = c.GetLinuxAppConfig()
+	assert.Error(t, err)
+	assert.Equal(t, kotsv1beta1.Config{}, config)
+
+	apiErr, ok := err.(*types.APIError)
+	require.True(t, ok, "Expected err to be of type *types.APIError")
+	assert.Equal(t, http.StatusInternalServerError, apiErr.StatusCode)
+	assert.Equal(t, "Internal Server Error", apiErr.Message)
+}
+
+func TestKubernetesGetAppConfig(t *testing.T) {
+	// Define expected config once
+	expectedConfig := kotsv1beta1.Config{
+		Spec: kotsv1beta1.ConfigSpec{
+			Groups: []kotsv1beta1.ConfigGroup{
+				{
+					Name:  "test-group",
+					Title: "Test Group",
+					Items: []kotsv1beta1.ConfigItem{
+						{
+							Name:    "test-item",
+							Type:    "text",
+							Title:   "Test Item",
+							Default: multitype.BoolOrString{StrVal: "default"},
+							Value:   multitype.BoolOrString{StrVal: "value"},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	// Create a test server
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "GET", r.Method)
+		assert.Equal(t, "/api/kubernetes/install/app/config", r.URL.Path)
+
+		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
+		assert.Equal(t, "Bearer test-token", r.Header.Get("Authorization"))
+
+		// Return successful response
+		w.WriteHeader(http.StatusOK)
+		json.NewEncoder(w).Encode(expectedConfig)
+	}))
+	defer server.Close()
+
+	// Test successful get
+	c := New(server.URL, WithToken("test-token"))
+	config, err := c.GetKubernetesAppConfig()
+	assert.NoError(t, err)
+	assert.Equal(t, expectedConfig, config)
+
+	// Test error response
+	errorServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(types.APIError{
+			StatusCode: http.StatusInternalServerError,
+			Message:    "Internal Server Error",
+		})
+	}))
+	defer errorServer.Close()
+
+	c = New(errorServer.URL, WithToken("test-token"))
+	config, err = c.GetKubernetesAppConfig()
+	assert.Error(t, err)
+	assert.Equal(t, kotsv1beta1.Config{}, config)
+
+	apiErr, ok := err.(*types.APIError)
+	require.True(t, ok, "Expected err to be of type *types.APIError")
+	assert.Equal(t, http.StatusInternalServerError, apiErr.StatusCode)
+	assert.Equal(t, "Internal Server Error", apiErr.Message)
+}

api/client/install.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 )
 
 func (c *client) GetLinuxInstallationConfig() (types.LinuxInstallationConfig, error) {
@@ -294,3 +295,57 @@ func (c *client) GetKubernetesInfraStatus() (types.Infra, error) {
 
 	return infra, nil
 }
+
+func (c *client) GetLinuxAppConfig() (kotsv1beta1.Config, error) {
+	req, err := http.NewRequest("GET", c.apiURL+"/api/linux/install/app/config", nil)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	setAuthorizationHeader(req, c.token)
+
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return kotsv1beta1.Config{}, errorFromResponse(resp)
+	}
+
+	var config kotsv1beta1.Config
+	err = json.NewDecoder(resp.Body).Decode(&config)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+
+	return config, nil
+}
+
+func (c *client) GetKubernetesAppConfig() (kotsv1beta1.Config, error) {
+	req, err := http.NewRequest("GET", c.apiURL+"/api/kubernetes/install/app/config", nil)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	setAuthorizationHeader(req, c.token)
+
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return kotsv1beta1.Config{}, errorFromResponse(resp)
+	}
+
+	var config kotsv1beta1.Config
+	err = json.NewDecoder(resp.Body).Decode(&config)
+	if err != nil {
+		return kotsv1beta1.Config{}, err
+	}
+
+	return config, nil
+}

api/controllers/kubernetes/install/app.go

@@ -0,0 +1,11 @@
+package install
+
+import (
+	"context"
+
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
+)
+
+func (c *InstallController) GetAppConfig(ctx context.Context) (kotsv1beta1.Config, error) {
+	return c.appConfigManager.Get()
+}

api/controllers/kubernetes/install/app_test.go

@@ -0,0 +1,112 @@
+package install
+
+import (
+	"context"
+	"testing"
+
+	"github.com/replicatedhq/embedded-cluster/pkg/release"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
+	"github.com/replicatedhq/kotskinds/multitype"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestInstallController_GetAppConfig(t *testing.T) {
+	tests := []struct {
+		name           string
+		releaseData    *release.ReleaseData
+		expectedConfig kotsv1beta1.Config
+		expectedError  bool
+	}{
+		{
+			name: "successful get app config",
+			releaseData: &release.ReleaseData{
+				AppConfig: &kotsv1beta1.Config{
+					Spec: kotsv1beta1.ConfigSpec{
+						Groups: []kotsv1beta1.ConfigGroup{
+							{
+								Name:  "test-group",
+								Title: "Test Group",
+								Items: []kotsv1beta1.ConfigItem{
+									{
+										Name:    "test-item",
+										Type:    "text",
+										Title:   "Test Item",
+										Default: multitype.BoolOrString{StrVal: "default"},
+										Value:   multitype.BoolOrString{StrVal: "value"},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expectedConfig: kotsv1beta1.Config{
+				Spec: kotsv1beta1.ConfigSpec{
+					Groups: []kotsv1beta1.ConfigGroup{
+						{
+							Name:  "test-group",
+							Title: "Test Group",
+							Items: []kotsv1beta1.ConfigItem{
+								{
+									Name:    "test-item",
+									Type:    "text",
+									Title:   "Test Item",
+									Default: multitype.BoolOrString{StrVal: "default"},
+									Value:   multitype.BoolOrString{StrVal: "value"},
+								},
+							},
+						},
+					},
+				},
+			},
+			expectedError: false,
+		},
+		{
+			name: "empty config",
+			releaseData: &release.ReleaseData{
+				AppConfig: &kotsv1beta1.Config{
+					Spec: kotsv1beta1.ConfigSpec{},
+				},
+			},
+			expectedConfig: kotsv1beta1.Config{
+				Spec: kotsv1beta1.ConfigSpec{},
+			},
+			expectedError: false,
+		},
+		{
+			name:           "nil release data",
+			releaseData:    nil,
+			expectedConfig: kotsv1beta1.Config{},
+			expectedError:  false,
+		},
+		{
+			name: "nil app config",
+			releaseData: &release.ReleaseData{
+				AppConfig: nil,
+			},
+			expectedConfig: kotsv1beta1.Config{},
+			expectedError:  false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create controller using NewInstallController with release data
+			controller, err := NewInstallController(
+				WithReleaseData(tt.releaseData),
+			)
+			require.NoError(t, err)
+
+			config, err := controller.GetAppConfig(context.Background())
+
+			if tt.expectedError {
+				assert.Error(t, err)
+				assert.Equal(t, kotsv1beta1.Config{}, config)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expectedConfig, config)
+			}
+		})
+	}
+}