Skip to content

Commit a8bda7e

Browse files
emosbaughemosbaugh
committed
f
1 parent 75b3725 commit a8bda7e

File tree

3 files changed

+29
-35
lines changed

3 files changed

+29
-35
lines changed

‎api/controllers/kubernetes/install/app_test.go

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
5555
expectedState: StateApplicationConfigured,
5656
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
5757
mock.InOrder(
58-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
59-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
58+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
59+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
6060
)
6161
},
6262
expectedErr: false,
@@ -70,8 +70,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
7070
expectedState: StateApplicationConfigured,
7171
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
7272
mock.InOrder(
73-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
74-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
73+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
74+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
7575
)
7676
},
7777
expectedErr: false,
@@ -85,8 +85,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
8585
expectedState: StateApplicationConfigured,
8686
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
8787
mock.InOrder(
88-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
89-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
88+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
89+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
9090
)
9191
},
9292
expectedErr: false,
@@ -100,7 +100,7 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
100100
expectedState: StateApplicationConfigurationFailed,
101101
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
102102
mock.InOrder(
103-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "invalid-value"}}).Return(errors.New("validation error")),
103+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "invalid-value"}}).Return(errors.New("validation error")),
104104
)
105105
},
106106
expectedErr: true,
@@ -114,8 +114,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
114114
expectedState: StateApplicationConfigurationFailed,
115115
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
116116
mock.InOrder(
117-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
118-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(errors.New("set config error")),
117+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(nil),
118+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-item"}}).Return(errors.New("set config error")),
119119
)
120120
},
121121
expectedErr: true,
@@ -206,8 +206,7 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
206206
"test-item": types.AppConfigValue{Value: "test-value"},
207207
"another-item": types.AppConfigValue{Value: "another-value"},
208208
}
209-
am.On("GetConfig").Return(appConfig, nil)
210-
am.On("GetConfigValues", appConfig, false).Return(expectedValues, nil)
209+
am.On("GetConfigValues", false).Return(expectedValues, nil)
211210
},
212211
expectedValues: types.AppConfigValues{
213212
"test-item": types.AppConfigValue{Value: "test-value"},
@@ -218,17 +217,15 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
218217
{
219218
name: "get config values error",
220219
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
221-
am.On("GetConfig").Return(appConfig, nil)
222-
am.On("GetConfigValues", appConfig, false).Return(nil, errors.New("get config values error"))
220+
am.On("GetConfigValues", false).Return(nil, errors.New("get config values error"))
223221
},
224222
expectedValues: nil,
225223
expectedErr: true,
226224
},
227225
{
228226
name: "empty config values",
229227
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
230-
am.On("GetConfig").Return(appConfig, nil)
231-
am.On("GetConfigValues", appConfig, false).Return(types.AppConfigValues{}, nil)
228+
am.On("GetConfigValues", false).Return(types.AppConfigValues{}, nil)
232229
},
233230
expectedValues: types.AppConfigValues{},
234231
expectedErr: false,

‎api/controllers/linux/install/app_test.go

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
5555
expectedState: StateApplicationConfigured,
5656
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
5757
mock.InOrder(
58-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
59-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
58+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
59+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
6060
)
6161
},
6262
expectedErr: false,
@@ -70,8 +70,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
7070
expectedState: StateApplicationConfigured,
7171
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
7272
mock.InOrder(
73-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
74-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
73+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
74+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
7575
)
7676
},
7777
expectedErr: false,
@@ -85,8 +85,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
8585
expectedState: StateApplicationConfigured,
8686
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
8787
mock.InOrder(
88-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
89-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
88+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
89+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
9090
)
9191
},
9292
expectedErr: false,
@@ -100,7 +100,7 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
100100
expectedState: StateApplicationConfigurationFailed,
101101
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
102102
mock.InOrder(
103-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "invalid-value"}}).Return(errors.New("validation error")),
103+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "invalid-value"}}).Return(errors.New("validation error")),
104104
)
105105
},
106106
expectedErr: true,
@@ -114,8 +114,8 @@ func TestInstallController_PatchAppConfigValues(t *testing.T) {
114114
expectedState: StateApplicationConfigurationFailed,
115115
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
116116
mock.InOrder(
117-
am.On("ValidateConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
118-
am.On("PatchConfigValues", appConfig, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(errors.New("set config error")),
117+
am.On("ValidateConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(nil),
118+
am.On("PatchConfigValues", types.AppConfigValues{"test-item": types.AppConfigValue{Value: "new-value"}}).Return(errors.New("set config error")),
119119
)
120120
},
121121
expectedErr: true,
@@ -206,8 +206,7 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
206206
"test-item": types.AppConfigValue{Value: "value"},
207207
"another-item": types.AppConfigValue{Value: "another-value"},
208208
}
209-
am.On("GetConfig").Return(appConfig, nil)
210-
am.On("GetConfigValues", appConfig, false).Return(expectedValues, nil)
209+
am.On("GetConfigValues", false).Return(expectedValues, nil)
211210
},
212211
expectedValues: types.AppConfigValues{
213212
"test-item": types.AppConfigValue{Value: "value"},
@@ -218,17 +217,15 @@ func TestInstallController_GetAppConfigValues(t *testing.T) {
218217
{
219218
name: "get config values error",
220219
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
221-
am.On("GetConfig").Return(appConfig, nil)
222-
am.On("GetConfigValues", appConfig, false).Return(nil, errors.New("get config values error"))
220+
am.On("GetConfigValues", false).Return(nil, errors.New("get config values error"))
223221
},
224222
expectedValues: nil,
225223
expectedErr: true,
226224
},
227225
{
228226
name: "empty config values",
229227
setupMocks: func(am *appconfig.MockAppConfigManager, st *store.MockStore) {
230-
am.On("GetConfig").Return(appConfig, nil)
231-
am.On("GetConfigValues", appConfig, false).Return(types.AppConfigValues{}, nil)
228+
am.On("GetConfigValues", false).Return(types.AppConfigValues{}, nil)
232229
},
233230
expectedValues: types.AppConfigValues{},
234231
expectedErr: false,

‎api/internal/managers/app/config/config_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ func TestAppConfigManager_PatchConfigValues(t *testing.T) {
13141314
"templated-disabled-item": types.AppConfigValue{Value: "disabled-value"},
13151315
},
13161316
setupMock: func(mockStore *config.MockStore) {
1317-
mockStore.On("GetConfigValues").Return(map[string]string{}, nil)
1317+
mockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
13181318
expectedValues := types.AppConfigValues{
13191319
"templated-enabled-item": types.AppConfigValue{Value: "enabled-value"},
13201320
// templated-disabled-item should be filtered out due to when: "false"
@@ -2477,10 +2477,10 @@ func TestAppConfigManager_GetKotsadmConfigValues(t *testing.T) {
24772477
},
24782478
},
24792479
setupMock: func(mockStore *config.MockStore) {
2480-
storeValues := map[string]string{
2481-
"templated-item": "store-overridden-value",
2482-
"sprig-functions-item": "store-sprig-value",
2483-
"disabled-templated-item": "disabled-store-value",
2480+
storeValues := types.AppConfigValues{
2481+
"templated-item": types.AppConfigValue{Value: "store-overridden-value"},
2482+
"sprig-functions-item": types.AppConfigValue{Value: "store-sprig-value"},
2483+
"disabled-templated-item": types.AppConfigValue{Value: "disabled-store-value"},
24842484
}
24852485
mockStore.On("GetConfigValues").Return(storeValues, nil)
24862486
},

0 commit comments

Comments
 (0)