InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/logger, volume/drivers: remove redundant import-aliases

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-06-30 19:22:17 +02:00
parent 47a959ee50
commit 81be279c6b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/logger/plugin.go
View File

@@ -8,13 +8,13 @@ import (
"github.com/docker/docker/api/types/plugins/logdriver"
"github.com/docker/docker/errdefs"
getter "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/pkg/stringid"
"github.com/pkg/errors"
)
var pluginGetter getter.PluginGetter
var pluginGetter plugingetter.PluginGetter
const extName = "LogDriver"
@@ -27,8 +27,8 @@ type logPlugin interface {
}
// RegisterPluginGetter sets the plugingetter
func RegisterPluginGetter(plugingetter getter.PluginGetter) {
pluginGetter = plugingetter
func RegisterPluginGetter(g plugingetter.PluginGetter) {
pluginGetter = g
}
// getPlugin returns a logging driver by its name.
@@ -46,11 +46,11 @@ func getPlugin(name string, mode int) (Creator, error) {
return makePluginCreator(name, client, p.ScopedPath), nil
}
func makePluginClient(p getter.CompatPlugin) (logPlugin, error) {
if pc, ok := p.(getter.PluginWithV1Client); ok {
func makePluginClient(p plugingetter.CompatPlugin) (logPlugin, error) {
if pc, ok := p.(plugingetter.PluginWithV1Client); ok {
return &logPluginProxy{pc.Client()}, nil
}
pa, ok := p.(getter.PluginAddr)
pa, ok := p.(plugingetter.PluginAddr)
if !ok {
return nil, errdefs.System(errors.Errorf("got unknown plugin type %T", p))
}
@@ -71,7 +71,7 @@ func makePluginCreator(name string, l logPlugin, scopePath func(s string) string
return func(logCtx Info) (logger Logger, err error) {
defer func() {
if err != nil {
pluginGetter.Get(name, extName, getter.Release)
pluginGetter.Get(name, extName, plugingetter.Release)
}
}()

20
volume/drivers/extpoint.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/containerd/log"
"github.com/docker/docker/errdefs"
getter "github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/volume"
"github.com/moby/locker"
@@ -48,11 +48,11 @@ type Store struct {
extensions map[string]volume.Driver
mu sync.Mutex
driverLock *locker.Locker
pluginGetter getter.PluginGetter
pluginGetter plugingetter.PluginGetter
}
// NewStore creates a new volume driver store
func NewStore(pg getter.PluginGetter) *Store {
func NewStore(pg plugingetter.PluginGetter) *Store {
return &Store{
extensions: make(map[string]volume.Driver),
driverLock: locker.New(),
@@ -147,19 +147,19 @@ func (s *Store) Register(d volume.Driver, name string) bool {
// GetDriver returns a volume driver by its name.
// If the driver is empty, it looks for the local driver.
func (s *Store) GetDriver(name string) (volume.Driver, error) {
return s.lookup(name, getter.Lookup)
return s.lookup(name, plugingetter.Lookup)
}
// CreateDriver returns a volume driver by its name and increments RefCount.
// If the driver is empty, it looks for the local driver.
func (s *Store) CreateDriver(name string) (volume.Driver, error) {
return s.lookup(name, getter.Acquire)
return s.lookup(name, plugingetter.Acquire)
}
// ReleaseDriver returns a volume driver by its name and decrements RefCount..
// If the driver is empty, it looks for the local driver.
func (s *Store) ReleaseDriver(name string) (volume.Driver, error) {
return s.lookup(name, getter.Release)
return s.lookup(name, plugingetter.Release)
}
// GetDriverList returns list of volume drivers registered.
@@ -177,7 +177,7 @@ func (s *Store) GetDriverList() []string {
// GetAllDrivers lists all the registered drivers
func (s *Store) GetAllDrivers() ([]volume.Driver, error) {
var plugins []getter.CompatPlugin
var plugins []plugingetter.CompatPlugin
if s.pluginGetter != nil {
var err error
plugins, err = s.pluginGetter.GetAllByCap(extName)
@@ -213,12 +213,12 @@ func (s *Store) GetAllDrivers() ([]volume.Driver, error) {
return ds, nil
}
func makePluginAdapter(p getter.CompatPlugin) (*volumeDriverAdapter, error) {
if pc, ok := p.(getter.PluginWithV1Client); ok {
func makePluginAdapter(p plugingetter.CompatPlugin) (*volumeDriverAdapter, error) {
if pc, ok := p.(plugingetter.PluginWithV1Client); ok {
return &volumeDriverAdapter{name: p.Name(), scopePath: p.ScopedPath, proxy: &volumeDriverProxy{pc.Client()}}, nil
}
pa, ok := p.(getter.PluginAddr)
pa, ok := p.(plugingetter.PluginAddr)
if !ok {
return nil, errdefs.System(errors.Errorf("got unknown plugin instance %T", p))
}