Fix proxy plugin config validation

dmcgowan · dmcgowan · commit a4482d9a6f23 · 2019-09-03T17:31:14.000-07:00
Proxy plugins are keyed only on the identifier, the type
is specified within the proxy plugin configuration which
maps to the full URI. The proxy plugin configuration is
not passed to the plugin for configuration like other
plugins.

Signed-off-by: Derek McGowan &lt;derek@mcgstyle.net&gt;
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -107,11 +107,6 @@ func (c *Config) ValidateV2() error {
 			return errors.Errorf("invalid plugin key URI %q expect io.containerd.x.vx", p)
 		}
 	}
-	for p := range c.ProxyPlugins {
-		if len(strings.Split(p, ".")) < 4 {
-			return errors.Errorf("invalid proxy plugin key URI %q expect io.containerd.x.vx", p)
-		}
-	}
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,6 @@ func (c *Config) ValidateV2() error {`
`107`	`107`	`return errors.Errorf("invalid plugin key URI %q expect io.containerd.x.vx", p)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- for p := range c.ProxyPlugins {`
`111`		`- if len(strings.Split(p, ".")) < 4 {`
`112`		`- return errors.Errorf("invalid proxy plugin key URI %q expect io.containerd.x.vx", p)`
`113`		`- }`
`114`		`- }`
`115`	`110`	`return nil`
`116`	`111`	`}`
`117`	`112`