config: make getting config values more consistent

This commit is contained in:
albertony
2023-11-04 15:34:23 +01:00
committed by Nick Craig-Wood
parent e4749cf0d0
commit d6b0743cf4
7 changed files with 164 additions and 176 deletions

View File

@@ -33,8 +33,8 @@ func TestRc(t *testing.T) {
out, err := call.Fn(ctx, in)
require.NoError(t, err)
require.Nil(t, out)
assert.Equal(t, "local", config.FileGet(testName, "type"))
assert.Equal(t, "sausage", config.FileGet(testName, "test_key"))
assert.Equal(t, "local", config.GetValue(testName, "type"))
assert.Equal(t, "sausage", config.GetValue(testName, "test_key"))
// The sub tests rely on the remote created above but they can
// all be run independently
@@ -102,9 +102,9 @@ func TestRc(t *testing.T) {
require.NoError(t, err)
assert.Nil(t, out)
assert.Equal(t, "local", config.FileGet(testName, "type"))
assert.Equal(t, "rutabaga", config.FileGet(testName, "test_key"))
assert.Equal(t, "cabbage", config.FileGet(testName, "test_key2"))
assert.Equal(t, "local", config.GetValue(testName, "type"))
assert.Equal(t, "rutabaga", config.GetValue(testName, "test_key"))
assert.Equal(t, "cabbage", config.GetValue(testName, "test_key2"))
})
t.Run("Password", func(t *testing.T) {
@@ -122,9 +122,9 @@ func TestRc(t *testing.T) {
require.NoError(t, err)
assert.Nil(t, out)
assert.Equal(t, "local", config.FileGet(testName, "type"))
assert.Equal(t, "rutabaga", obscure.MustReveal(config.FileGet(testName, "test_key")))
assert.Equal(t, pw2, obscure.MustReveal(config.FileGet(testName, "test_key2")))
assert.Equal(t, "local", config.GetValue(testName, "type"))
assert.Equal(t, "rutabaga", obscure.MustReveal(config.GetValue(testName, "test_key")))
assert.Equal(t, pw2, obscure.MustReveal(config.GetValue(testName, "test_key2")))
})
// Delete the test remote
@@ -136,8 +136,8 @@ func TestRc(t *testing.T) {
out, err = call.Fn(context.Background(), in)
require.NoError(t, err)
assert.Nil(t, out)
assert.Equal(t, "", config.FileGet(testName, "type"))
assert.Equal(t, "", config.FileGet(testName, "test_key"))
assert.Equal(t, "", config.GetValue(testName, "type"))
assert.Equal(t, "", config.GetValue(testName, "test_key"))
}
func TestRcProviders(t *testing.T) {