Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 cmd/config-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func updateConfigName(config string, f *Flags) (string, error) {
if f.DefaultConfig != "" {
klog.Infof("No value set. Selecting default name: %v", f.DefaultConfig)
if !files[f.DefaultConfig] {
return "", fmt.Errorf("specified config %v does not exist", config)
return "", fmt.Errorf("specified config %v does not exist", f.DefaultConfig)
}
return f.DefaultConfig, nil
}
Expand Down
60 changes: 60 additions & 0 deletions cmd/config-manager/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,63 @@ func TestUpdateSymlinkDanglingDestination(t *testing.T) {
require.Equal(t, filepath.Join(srcdir, "missing-config"), link)
})
}

func TestUpdateConfigName(t *testing.T) {
testCases := []struct {
name string
config string
defaultConfig string
expectedConfig string
expectedError string
}{
{
name: "missing default configuration",
defaultConfig: "missing-profile",
expectedError: "specified config missing-profile does not exist",
},
{
name: "existing default configuration",
defaultConfig: "default-profile",
expectedConfig: "default-profile",
},
{
name: "node configuration overrides default",
config: "node-profile",
defaultConfig: "default-profile",
expectedConfig: "node-profile",
},
{
name: "node configuration overrides missing default",
config: "node-profile",
defaultConfig: "missing-profile",
expectedConfig: "node-profile",
},
{
name: "missing node configuration does not fall back to default",
config: "missing-node-profile",
defaultConfig: "default-profile",
expectedError: "specified config missing-node-profile does not exist",
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
srcdir := t.TempDir()
for _, name := range []string{"default-profile", "node-profile"} {
require.NoError(t, os.WriteFile(filepath.Join(srcdir, name), []byte("version: v1"), 0600))
}
f := &Flags{
ConfigFileSrcdir: srcdir,
DefaultConfig: tc.defaultConfig,
}

config, err := updateConfigName(tc.config, f)
if tc.expectedError != "" {
require.EqualError(t, err, tc.expectedError)
} else {
require.NoError(t, err)
}
require.Equal(t, tc.expectedConfig, config)
})
}
}