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

Move validation of plugins (#1953)

Browse Source 
* Move validation of plugins

Signed-off-by: Carlisia <carlisia@vmware.com>
This commit is contained in:
KubeKween
2019-10-09 09:48:37 -07:00
committed by Steve Kriss
parent 557d170541
commit d868b71e29
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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
}

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

@@ -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,

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

@@ -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
}

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

@@ -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

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

@@ -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
}

2
pkg/cloudprovider/config.go → pkg/plugin/framework/validation.go
View File

@@ -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"

2
pkg/cloudprovider/config_test.go → pkg/plugin/framework/validation_test.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package cloudprovider
package framework
import (
"testing"