github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49596 from jingxu97/July/checkVolumeSpecNil

Browse Source 
Automatic merge from submit-queue

Check volumespec is nil in FindPluginBySpec
This commit is contained in:
Kubernetes Submit Queue 2017-08-11 17:36:22 -07:00 committed by GitHub
commit 9c508f12fb
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/plugins.go
View File

@ -387,6 +387,10 @@ func (pm *VolumePluginMgr) FindPluginBySpec(spec *Spec) (VolumePlugin, error) {
pm.mutex.Lock() pm.mutex.Lock()
defer pm.mutex.Unlock() defer pm.mutex.Unlock()
if spec == nil {
return nil, fmt.Errorf("Could not find plugin because volume spec is nil")
}
matches := []string{} matches := []string{}
for k, v := range pm.plugins { for k, v := range pm.plugins {
if v.CanSupport(spec) { if v.CanSupport(spec) {

11
pkg/volume/plugins_test.go
View File

@ -112,6 +112,17 @@ func TestVolumePluginMgrFunc(t *testing.T) {
if plug.GetPluginName() != "testPlugin" { if plug.GetPluginName() != "testPlugin" {
t.Errorf("Wrong name: %s", plug.GetPluginName()) t.Errorf("Wrong name: %s", plug.GetPluginName())
} }
plug, err = vpm.FindPluginBySpec(nil)
if err == nil {
t.Errorf("Should return error if volume spec is nil")
}
volumeSpec := &Spec{}
plug, err = vpm.FindPluginBySpec(volumeSpec)
if err != nil {
t.Errorf("Should return test plugin if volume spec is not nil")
}
} }
func Test_ValidatePodTemplate(t *testing.T) { func Test_ValidatePodTemplate(t *testing.T) {