mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-04-26 18:45:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

always allow 'bucket' as a config key for object stores (#1349)

Browse Source 
Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2019-04-05 12:24:55 -06:00
committed by KubeKween
parent a519547efc
commit 2f47ca62ad
8 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/aws/object_store.go
View File

@@ -64,7 +64,7 @@ func isValidSignatureVersion(signatureVersion string) bool {
}
func (o *ObjectStore) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config,
if err := cloudprovider.ValidateObjectStoreConfigKeys(config,
regionKey,
s3URLKey,
publicURLKey,

2
pkg/cloudprovider/aws/volume_snapshotter.go
View File

@@ -66,7 +66,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter {
}
func (b *VolumeSnapshotter) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config, regionKey); err != nil {
if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config, regionKey); err != nil {
return err
}

2
pkg/cloudprovider/azure/object_store.go
View File

@@ -101,7 +101,7 @@ func mapLookup(data map[string]string) func(string) string {
}
func (o *ObjectStore) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config, resourceGroupConfigKey, storageAccountConfigKey); err != nil {
if err := cloudprovider.ValidateObjectStoreConfigKeys(config, resourceGroupConfigKey, storageAccountConfigKey); err != nil {
return err
}

2
pkg/cloudprovider/azure/volume_snapshotter.go
View File

@@ -72,7 +72,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter {
}
func (b *VolumeSnapshotter) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config, resourceGroupConfigKey, apiTimeoutConfigKey); err != nil {
if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config, resourceGroupConfigKey, apiTimeoutConfigKey); err != nil {
return err
}

17
pkg/cloudprovider/config.go
View File

@@ -21,7 +21,22 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
)
func ValidateConfigKeys(config map[string]string, validKeys ...string) error {
// ValidateObjectStoreConfigKeys ensures that an object store's config
// is valid by making sure each `config` key is in the `validKeys` list.
// The special key "bucket" is always considered valid.
func ValidateObjectStoreConfigKeys(config map[string]string, validKeys ...string) error {
// `bucket` is automatically added to all object store config by
// velero, so add it as a valid key.
return validateConfigKeys(config, append(validKeys, "bucket")...)
}
// ValidateVolumeSnapshotterConfigKeys ensures that a volume snapshotter's
// config is valid by making sure each `config` key is in the `validKeys` list.
func ValidateVolumeSnapshotterConfigKeys(config map[string]string, validKeys ...string) error {
return validateConfigKeys(config, validKeys...)
}
func validateConfigKeys(config map[string]string, validKeys ...string) error {
validKeysSet := sets.NewString(validKeys...)
var invalidKeys []string

17
pkg/cloudprovider/config_test.go
View File

@@ -23,12 +23,15 @@ import (
)
func TestValidateConfigKeys(t *testing.T) {
assert.NoError(t, ValidateConfigKeys(nil))
assert.NoError(t, ValidateConfigKeys(map[string]string{}))
assert.NoError(t, ValidateConfigKeys(map[string]string{"foo": "bar"}, "foo"))
assert.NoError(t, ValidateConfigKeys(map[string]string{"foo": "bar", "bar": "baz"}, "foo", "bar"))
assert.NoError(t, validateConfigKeys(nil))
assert.NoError(t, validateConfigKeys(map[string]string{}))
assert.NoError(t, validateConfigKeys(map[string]string{"foo": "bar"}, "foo"))
assert.NoError(t, validateConfigKeys(map[string]string{"foo": "bar", "bar": "baz"}, "foo", "bar"))
assert.Error(t, ValidateConfigKeys(map[string]string{"foo": "bar"}))
assert.Error(t, ValidateConfigKeys(map[string]string{"foo": "bar"}, "Foo"))
assert.Error(t, ValidateConfigKeys(map[string]string{"foo": "bar", "boo": ""}, "foo"))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar"}, "Foo"))
assert.Error(t, validateConfigKeys(map[string]string{"foo": "bar", "boo": ""}, "foo"))
assert.NoError(t, ValidateObjectStoreConfigKeys(map[string]string{"bucket": "foo"}))
assert.Error(t, ValidateVolumeSnapshotterConfigKeys(map[string]string{"bucket": "foo"}))
}

2
pkg/cloudprovider/gcp/object_store.go
View File

@@ -62,7 +62,7 @@ func NewObjectStore(logger logrus.FieldLogger) *ObjectStore {
}
func (o *ObjectStore) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config); err != nil {
if err := cloudprovider.ValidateObjectStoreConfigKeys(config); err != nil {
return err
}

2
pkg/cloudprovider/gcp/volume_snapshotter.go
View File

@@ -53,7 +53,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter {
}
func (b *VolumeSnapshotter) Init(config map[string]string) error {
if err := cloudprovider.ValidateConfigKeys(config); err != nil {
if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config); err != nil {
return err
}