Add cmd to list plugins (#1535)

* Add cmd to list plugins

Signed-off-by: Carlisia <carlisiac@vmware.com>
This commit is contained in:
KubeKween
2019-06-05 10:41:03 -07:00
committed by Nolan Brubaker
parent bc7ee686d7
commit 0a771e6a53
20 changed files with 403 additions and 143 deletions

View File

@@ -16,10 +16,6 @@ limitations under the License.
package framework
import (
"k8s.io/apimachinery/pkg/util/sets"
)
// PluginKind is a type alias for a string that describes
// the kind of a Velero-supported plugin.
type PluginKind string
@@ -46,11 +42,13 @@ const (
PluginKindPluginLister PluginKind = "PluginLister"
)
// allPluginKinds contains all the valid plugin kinds that Velero supports, excluding PluginLister because that is not a
// AllPluginKinds contains all the valid plugin kinds that Velero supports, excluding PluginLister because that is not a
// kind that a developer would ever need to implement (it's handled by Velero and the Velero plugin library code).
var allPluginKinds = sets.NewString(
PluginKindObjectStore.String(),
PluginKindVolumeSnapshotter.String(),
PluginKindBackupItemAction.String(),
PluginKindRestoreItemAction.String(),
)
func AllPluginKinds() map[string]PluginKind {
allPluginKinds := make(map[string]PluginKind)
allPluginKinds[PluginKindObjectStore.String()] = PluginKindObjectStore
allPluginKinds[PluginKindVolumeSnapshotter.String()] = PluginKindVolumeSnapshotter
allPluginKinds[PluginKindBackupItemAction.String()] = PluginKindBackupItemAction
allPluginKinds[PluginKindRestoreItemAction.String()] = PluginKindRestoreItemAction
return allPluginKinds
}

View File

@@ -1,34 +0,0 @@
/*
Copyright 2018, 2019 the Velero contributors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package framework
import (
"testing"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/sets"
)
func TestAllPluginKinds(t *testing.T) {
expected := sets.NewString(
PluginKindObjectStore.String(),
PluginKindVolumeSnapshotter.String(),
PluginKindBackupItemAction.String(),
PluginKindRestoreItemAction.String(),
)
assert.True(t, expected.Equal(allPluginKinds))
}

View File

@@ -87,7 +87,7 @@ func (c *PluginListerGRPCClient) ListPlugins() ([]PluginIdentifier, error) {
ret := make([]PluginIdentifier, len(resp.Plugins))
for i, id := range resp.Plugins {
if !allPluginKinds.Has(id.Kind) {
if _, ok := AllPluginKinds()[id.Kind]; !ok {
return nil, errors.Errorf("invalid plugin kind: %s", id.Kind)
}
@@ -126,7 +126,7 @@ func (s *PluginListerGRPCServer) ListPlugins(ctx context.Context, req *proto.Emp
plugins := make([]*proto.PluginIdentifier, len(list))
for i, id := range list {
if !allPluginKinds.Has(id.Kind.String()) {
if _, ok := AllPluginKinds()[id.Kind.String()]; !ok {
return nil, errors.Errorf("invalid plugin kind: %s", id.Kind)
}