From d868b71e299eca900d30e0aa47ade05eabd615ca Mon Sep 17 00:00:00 2001 From: KubeKween Date: Wed, 9 Oct 2019 09:48:37 -0700 Subject: [PATCH] Move validation of plugins (#1953) * Move validation of plugins Signed-off-by: Carlisia --- pkg/cloudprovider/aws/object_store.go | 4 ++-- pkg/cloudprovider/aws/volume_snapshotter.go | 4 ++-- pkg/cloudprovider/azure/object_store.go | 4 ++-- pkg/cloudprovider/azure/volume_snapshotter.go | 4 ++-- pkg/cloudprovider/gcp/object_store.go | 4 ++-- pkg/cloudprovider/gcp/volume_snapshotter.go | 4 ++-- .../config.go => plugin/framework/validation.go} | 2 +- .../config_test.go => plugin/framework/validation_test.go} | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename pkg/{cloudprovider/config.go => plugin/framework/validation.go} (98%) rename pkg/{cloudprovider/config_test.go => plugin/framework/validation_test.go} (98%) diff --git a/pkg/cloudprovider/aws/object_store.go b/pkg/cloudprovider/aws/object_store.go index 8e0aeb0de..68e6e2e5a 100644 --- a/pkg/cloudprovider/aws/object_store.go +++ b/pkg/cloudprovider/aws/object_store.go @@ -34,7 +34,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const ( @@ -80,7 +80,7 @@ func isValidSignatureVersion(signatureVersion string) bool { } func (o *ObjectStore) Init(config map[string]string) error { - if err := cloudprovider.ValidateObjectStoreConfigKeys(config, + if err := framework.ValidateObjectStoreConfigKeys(config, regionKey, s3URLKey, publicURLKey, diff --git a/pkg/cloudprovider/aws/volume_snapshotter.go b/pkg/cloudprovider/aws/volume_snapshotter.go index 2208fb4cc..eb483bf05 100644 --- a/pkg/cloudprovider/aws/volume_snapshotter.go +++ b/pkg/cloudprovider/aws/volume_snapshotter.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const regionKey = "region" @@ -68,7 +68,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter { } func (b *VolumeSnapshotter) Init(config map[string]string) error { - if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config, regionKey, credentialProfileKey); err != nil { + if err := framework.ValidateVolumeSnapshotterConfigKeys(config, regionKey, credentialProfileKey); err != nil { return err } diff --git a/pkg/cloudprovider/azure/object_store.go b/pkg/cloudprovider/azure/object_store.go index db36625c8..61e284fa2 100644 --- a/pkg/cloudprovider/azure/object_store.go +++ b/pkg/cloudprovider/azure/object_store.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const ( @@ -208,7 +208,7 @@ func mapLookup(data map[string]string) func(string) string { } func (o *ObjectStore) Init(config map[string]string) error { - if err := cloudprovider.ValidateObjectStoreConfigKeys(config, + if err := framework.ValidateObjectStoreConfigKeys(config, resourceGroupConfigKey, storageAccountConfigKey, subscriptionIdConfigKey, diff --git a/pkg/cloudprovider/azure/volume_snapshotter.go b/pkg/cloudprovider/azure/volume_snapshotter.go index 06d875196..585c2cfd9 100644 --- a/pkg/cloudprovider/azure/volume_snapshotter.go +++ b/pkg/cloudprovider/azure/volume_snapshotter.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const ( @@ -72,7 +72,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter { } func (b *VolumeSnapshotter) Init(config map[string]string) error { - if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config, resourceGroupConfigKey, apiTimeoutConfigKey, subscriptionIdConfigKey); err != nil { + if err := framework.ValidateVolumeSnapshotterConfigKeys(config, resourceGroupConfigKey, apiTimeoutConfigKey, subscriptionIdConfigKey); err != nil { return err } diff --git a/pkg/cloudprovider/gcp/object_store.go b/pkg/cloudprovider/gcp/object_store.go index 1ff5330e0..951f5a20b 100644 --- a/pkg/cloudprovider/gcp/object_store.go +++ b/pkg/cloudprovider/gcp/object_store.go @@ -30,7 +30,7 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const ( @@ -76,7 +76,7 @@ func NewObjectStore(logger logrus.FieldLogger) *ObjectStore { } func (o *ObjectStore) Init(config map[string]string) error { - if err := cloudprovider.ValidateObjectStoreConfigKeys(config, kmsKeyNameConfigKey, serviceAccountConfig); err != nil { + if err := framework.ValidateObjectStoreConfigKeys(config, kmsKeyNameConfigKey, serviceAccountConfig); err != nil { return err } // Find default token source to extract the GoogleAccessID diff --git a/pkg/cloudprovider/gcp/volume_snapshotter.go b/pkg/cloudprovider/gcp/volume_snapshotter.go index 88b34cbdb..a67cff318 100644 --- a/pkg/cloudprovider/gcp/volume_snapshotter.go +++ b/pkg/cloudprovider/gcp/volume_snapshotter.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/vmware-tanzu/velero/pkg/cloudprovider" + "github.com/vmware-tanzu/velero/pkg/plugin/framework" ) const ( @@ -54,7 +54,7 @@ func NewVolumeSnapshotter(logger logrus.FieldLogger) *VolumeSnapshotter { } func (b *VolumeSnapshotter) Init(config map[string]string) error { - if err := cloudprovider.ValidateVolumeSnapshotterConfigKeys(config, snapshotLocationKey, projectKey); err != nil { + if err := framework.ValidateVolumeSnapshotterConfigKeys(config, snapshotLocationKey, projectKey); err != nil { return err } diff --git a/pkg/cloudprovider/config.go b/pkg/plugin/framework/validation.go similarity index 98% rename from pkg/cloudprovider/config.go rename to pkg/plugin/framework/validation.go index 7e604feef..a7a443e5f 100644 --- a/pkg/cloudprovider/config.go +++ b/pkg/plugin/framework/validation.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cloudprovider +package framework import ( "github.com/pkg/errors" diff --git a/pkg/cloudprovider/config_test.go b/pkg/plugin/framework/validation_test.go similarity index 98% rename from pkg/cloudprovider/config_test.go rename to pkg/plugin/framework/validation_test.go index 63eef49d8..5160485dc 100644 --- a/pkg/cloudprovider/config_test.go +++ b/pkg/plugin/framework/validation_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cloudprovider +package framework import ( "testing"