Skip to content

Commit b01ad9f

Browse files
emosbaughemosbaugh
authored
chore(api): do not expose kubernetes api type (#2446)
1 parent 8bc4290 commit b01ad9f

File tree

14 files changed

+224
-552
lines changed

14 files changed

+224
-552
lines changed

‎api/client/client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"net/http"
88

99
"github.com/replicatedhq/embedded-cluster/api/types"
10-
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
1110
)
1211

1312
type Client interface {
@@ -17,14 +16,14 @@ type Client interface {
1716
ConfigureLinuxInstallation(config types.LinuxInstallationConfig) (types.Status, error)
1817
SetupLinuxInfra(ignoreHostPreflights bool) (types.Infra, error)
1918
GetLinuxInfraStatus() (types.Infra, error)
20-
GetLinuxAppConfig() (kotsv1beta1.Config, error)
19+
GetLinuxAppConfig() (types.AppConfig, error)
2120

2221
GetKubernetesInstallationConfig() (types.KubernetesInstallationConfig, error)
2322
ConfigureKubernetesInstallation(config types.KubernetesInstallationConfig) (types.Status, error)
2423
GetKubernetesInstallationStatus() (types.Status, error)
2524
SetupKubernetesInfra() (types.Infra, error)
2625
GetKubernetesInfraStatus() (types.Infra, error)
27-
GetKubernetesAppConfig() (kotsv1beta1.Config, error)
26+
GetKubernetesAppConfig() (types.AppConfig, error)
2827
}
2928

3029
type client struct {

‎api/client/client_test.go

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -587,20 +587,18 @@ func TestErrorFromResponse(t *testing.T) {
587587

588588
func TestLinuxGetAppConfig(t *testing.T) {
589589
// Define expected config once
590-
expectedConfig := kotsv1beta1.Config{
591-
Spec: kotsv1beta1.ConfigSpec{
592-
Groups: []kotsv1beta1.ConfigGroup{
593-
{
594-
Name: "test-group",
595-
Title: "Test Group",
596-
Items: []kotsv1beta1.ConfigItem{
597-
{
598-
Name: "test-item",
599-
Type: "text",
600-
Title: "Test Item",
601-
Default: multitype.BoolOrString{StrVal: "default"},
602-
Value: multitype.BoolOrString{StrVal: "value"},
603-
},
590+
expectedConfig := types.AppConfig{
591+
Groups: []kotsv1beta1.ConfigGroup{
592+
{
593+
Name: "test-group",
594+
Title: "Test Group",
595+
Items: []kotsv1beta1.ConfigItem{
596+
{
597+
Name: "test-item",
598+
Type: "text",
599+
Title: "Test Item",
600+
Default: multitype.BoolOrString{StrVal: "default"},
601+
Value: multitype.BoolOrString{StrVal: "value"},
604602
},
605603
},
606604
},
@@ -640,7 +638,7 @@ func TestLinuxGetAppConfig(t *testing.T) {
640638
c = New(errorServer.URL, WithToken("test-token"))
641639
config, err = c.GetLinuxAppConfig()
642640
assert.Error(t, err)
643-
assert.Equal(t, kotsv1beta1.Config{}, config)
641+
assert.Equal(t, types.AppConfig{}, config)
644642

645643
apiErr, ok := err.(*types.APIError)
646644
require.True(t, ok, "Expected err to be of type *types.APIError")
@@ -650,20 +648,18 @@ func TestLinuxGetAppConfig(t *testing.T) {
650648

651649
func TestKubernetesGetAppConfig(t *testing.T) {
652650
// Define expected config once
653-
expectedConfig := kotsv1beta1.Config{
654-
Spec: kotsv1beta1.ConfigSpec{
655-
Groups: []kotsv1beta1.ConfigGroup{
656-
{
657-
Name: "test-group",
658-
Title: "Test Group",
659-
Items: []kotsv1beta1.ConfigItem{
660-
{
661-
Name: "test-item",
662-
Type: "text",
663-
Title: "Test Item",
664-
Default: multitype.BoolOrString{StrVal: "default"},
665-
Value: multitype.BoolOrString{StrVal: "value"},
666-
},
651+
expectedConfig := types.AppConfig{
652+
Groups: []kotsv1beta1.ConfigGroup{
653+
{
654+
Name: "test-group",
655+
Title: "Test Group",
656+
Items: []kotsv1beta1.ConfigItem{
657+
{
658+
Name: "test-item",
659+
Type: "text",
660+
Title: "Test Item",
661+
Default: multitype.BoolOrString{StrVal: "default"},
662+
Value: multitype.BoolOrString{StrVal: "value"},
667663
},
668664
},
669665
},
@@ -703,7 +699,7 @@ func TestKubernetesGetAppConfig(t *testing.T) {
703699
c = New(errorServer.URL, WithToken("test-token"))
704700
config, err = c.GetKubernetesAppConfig()
705701
assert.Error(t, err)
706-
assert.Equal(t, kotsv1beta1.Config{}, config)
702+
assert.Equal(t, types.AppConfig{}, config)
707703

708704
apiErr, ok := err.(*types.APIError)
709705
require.True(t, ok, "Expected err to be of type *types.APIError")

‎api/client/install.go

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"net/http"
77

88
"github.com/replicatedhq/embedded-cluster/api/types"
9-
kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
109
)
1110

1211
func (c *client) GetLinuxInstallationConfig() (types.LinuxInstallationConfig, error) {
@@ -296,55 +295,55 @@ func (c *client) GetKubernetesInfraStatus() (types.Infra, error) {
296295
return infra, nil
297296
}
298297

299-
func (c *client) GetLinuxAppConfig() (kotsv1beta1.Config, error) {
298+
func (c *client) GetLinuxAppConfig() (types.AppConfig, error) {
300299
req, err := http.NewRequest("GET", c.apiURL+"/api/linux/install/app/config", nil)
301300
if err != nil {
302-
return kotsv1beta1.Config{}, err
301+
return types.AppConfig{}, err
303302
}
304303
req.Header.Set("Content-Type", "application/json")
305304
setAuthorizationHeader(req, c.token)
306305

307306
resp, err := c.httpClient.Do(req)
308307
if err != nil {
309-
return kotsv1beta1.Config{}, err
308+
return types.AppConfig{}, err
310309
}
311310
defer resp.Body.Close()
312311

313312
if resp.StatusCode != http.StatusOK {
314-
return kotsv1beta1.Config{}, errorFromResponse(resp)
313+
return types.AppConfig{}, errorFromResponse(resp)
315314
}
316315

317-
var config kotsv1beta1.Config
316+
var config types.AppConfig
318317
err = json.NewDecoder(resp.Body).Decode(&config)
319318
if err != nil {
320-
return kotsv1beta1.Config{}, err
319+
return types.AppConfig{}, err
321320
}
322321

323322
return config, nil
324323
}
325324

326-
func (c *client) GetKubernetesAppConfig() (kotsv1beta1.Config, error) {
325+
func (c *client) GetKubernetesAppConfig() (types.AppConfig, error) {
327326
req, err := http.NewRequest("GET", c.apiURL+"/api/kubernetes/install/app/config", nil)
328327
if err != nil {
329-
return kotsv1beta1.Config{}, err
328+
return types.AppConfig{}, err
330329
}
331330
req.Header.Set("Content-Type", "application/json")
332331
setAuthorizationHeader(req, c.token)
333332

334333
resp, err := c.httpClient.Do(req)
335334
if err != nil {
336-
return kotsv1beta1.Config{}, err
335+
return types.AppConfig{}, err
337336
}
338337
defer resp.Body.Close()
339338

340339
if resp.StatusCode != http.StatusOK {
341-
return kotsv1beta1.Config{}, errorFromResponse(resp)
340+
return types.AppConfig{}, errorFromResponse(resp)
342341
}
343342

344-
var config kotsv1beta1.Config
343+
var config types.AppConfig
345344
err = json.NewDecoder(resp.Body).Decode(&config)
346345
if err != nil {
347-
return kotsv1beta1.Config{}, err
346+
return types.AppConfig{}, err
348347
}
349348

350349
return config, nil

‎api/docs/docs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/docs/swagger.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)