From 34c2b2360bebf0b990abc0d3c0457bd95943a9ff Mon Sep 17 00:00:00 2001 From: wangyx1992 Date: Fri, 12 Mar 2021 16:55:47 +0800 Subject: [PATCH] fix errors in wrapped format Signed-off-by: wangyx1992 --- pkg/credentialprovider/plugin/config.go | 4 ++-- pkg/credentialprovider/plugin/plugin.go | 4 ++-- .../nodeshutdown_manager_linux.go | 6 +++--- .../nodeshutdown/systemd/inhibit_linux.go | 14 ++++++------- pkg/volume/vsphere_volume/attacher_test.go | 20 +++++++++++++------ .../pkg/leadermigration/config/config.go | 2 +- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/pkg/credentialprovider/plugin/config.go b/pkg/credentialprovider/plugin/config.go index 3857853de5b..c65f3bb472f 100644 --- a/pkg/credentialprovider/plugin/config.go +++ b/pkg/credentialprovider/plugin/config.go @@ -35,12 +35,12 @@ func readCredentialProviderConfigFile(configPath string) (*kubeletconfig.Credent data, err := ioutil.ReadFile(configPath) if err != nil { - return nil, fmt.Errorf("unable to read external registry credential provider configuration from %q: %v", configPath, err) + return nil, fmt.Errorf("unable to read external registry credential provider configuration from %q: %w", configPath, err) } config, err := decode(data) if err != nil { - return nil, fmt.Errorf("error decoding config %s: %v", configPath, err) + return nil, fmt.Errorf("error decoding config %s: %w", configPath, err) } return config, nil diff --git a/pkg/credentialprovider/plugin/plugin.go b/pkg/credentialprovider/plugin/plugin.go index c646d5ca871..eee135b9423 100644 --- a/pkg/credentialprovider/plugin/plugin.go +++ b/pkg/credentialprovider/plugin/plugin.go @@ -328,7 +328,7 @@ func (e *execPlugin) ExecPlugin(ctx context.Context, image string) (*credentialp authRequest := &credentialproviderapi.CredentialProviderRequest{Image: image} data, err := e.encodeRequest(authRequest) if err != nil { - return nil, fmt.Errorf("failed to encode auth request: %v", err) + return nil, fmt.Errorf("failed to encode auth request: %w", err) } stdout := &bytes.Buffer{} @@ -385,7 +385,7 @@ func (e *execPlugin) ExecPlugin(ctx context.Context, image string) (*credentialp func (e *execPlugin) encodeRequest(request *credentialproviderapi.CredentialProviderRequest) ([]byte, error) { data, err := runtime.Encode(e.encoder, request) if err != nil { - return nil, fmt.Errorf("error encoding request: %v", err) + return nil, fmt.Errorf("error encoding request: %w", err) } return data, nil diff --git a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go index e694db19ac0..06fca892f76 100644 --- a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go +++ b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux.go @@ -126,7 +126,7 @@ func (m *Manager) Start() error { if m.shutdownGracePeriodRequested > currentInhibitDelay { err := m.dbusCon.OverrideInhibitDelay(m.shutdownGracePeriodRequested) if err != nil { - return fmt.Errorf("unable to override inhibit delay by shutdown manager: %v", err) + return fmt.Errorf("unable to override inhibit delay by shutdown manager: %w", err) } err = m.dbusCon.ReloadLogindConf() @@ -154,9 +154,9 @@ func (m *Manager) Start() error { if err != nil { releaseErr := m.dbusCon.ReleaseInhibitLock(m.inhibitLock) if releaseErr != nil { - return fmt.Errorf("failed releasing inhibitLock: %v and failed monitoring shutdown: %v", releaseErr, err) + return fmt.Errorf("failed releasing inhibitLock: %v and failed monitoring shutdown: %w", releaseErr, err) } - return fmt.Errorf("failed to monitor shutdown: %v", err) + return fmt.Errorf("failed to monitor shutdown: %w", err) } go func() { diff --git a/pkg/kubelet/nodeshutdown/systemd/inhibit_linux.go b/pkg/kubelet/nodeshutdown/systemd/inhibit_linux.go index 8069691d048..ee41c7d3fea 100644 --- a/pkg/kubelet/nodeshutdown/systemd/inhibit_linux.go +++ b/pkg/kubelet/nodeshutdown/systemd/inhibit_linux.go @@ -56,7 +56,7 @@ func (bus *DBusCon) CurrentInhibitDelay() (time.Duration, error) { obj := bus.SystemBus.Object(logindService, logindObject) res, err := obj.GetProperty(logindInterface + ".InhibitDelayMaxUSec") if err != nil { - return 0, fmt.Errorf("failed reading InhibitDelayMaxUSec property from logind: %v", err) + return 0, fmt.Errorf("failed reading InhibitDelayMaxUSec property from logind: %w", err) } delay, ok := res.Value().(uint64) @@ -80,13 +80,13 @@ func (bus *DBusCon) InhibitShutdown() (InhibitLock, error) { call := obj.Call("org.freedesktop.login1.Manager.Inhibit", 0, what, who, why, mode) if call.Err != nil { - return InhibitLock(0), fmt.Errorf("failed creating systemd inhibitor: %v", call.Err) + return InhibitLock(0), fmt.Errorf("failed creating systemd inhibitor: %w", call.Err) } var fd uint32 err := call.Store(&fd) if err != nil { - return InhibitLock(0), fmt.Errorf("failed storing inhibit lock file descriptor: %v", err) + return InhibitLock(0), fmt.Errorf("failed storing inhibit lock file descriptor: %w", err) } return InhibitLock(fd), nil @@ -97,7 +97,7 @@ func (bus *DBusCon) ReleaseInhibitLock(lock InhibitLock) error { err := syscall.Close(int(lock)) if err != nil { - return fmt.Errorf("unable to close systemd inhibitor lock: %v", err) + return fmt.Errorf("unable to close systemd inhibitor lock: %w", err) } return nil @@ -116,7 +116,7 @@ func (bus *DBusCon) ReloadLogindConf() error { call := obj.Call(systemdInterface+".KillUnit", 0, unit, who, signal) if call.Err != nil { - return fmt.Errorf("unable to reload logind conf: %v", call.Err) + return fmt.Errorf("unable to reload logind conf: %w", call.Err) } return nil @@ -166,7 +166,7 @@ const ( func (bus *DBusCon) OverrideInhibitDelay(inhibitDelayMax time.Duration) error { err := os.MkdirAll(logindConfigDirectory, 0755) if err != nil { - return fmt.Errorf("failed creating %v directory: %v", logindConfigDirectory, err) + return fmt.Errorf("failed creating %v directory: %w", logindConfigDirectory, err) } // This attempts to set the `InhibitDelayMaxUSec` dbus property of logind which is MaxInhibitDelay measured in microseconds. @@ -180,7 +180,7 @@ InhibitDelayMaxSec=%.0f logindOverridePath := filepath.Join(logindConfigDirectory, kubeletLogindConf) if err := ioutil.WriteFile(logindOverridePath, []byte(inhibitOverride), 0644); err != nil { - return fmt.Errorf("failed writing logind shutdown inhibit override file %v: %v", logindOverridePath, err) + return fmt.Errorf("failed writing logind shutdown inhibit override file %v: %w", logindOverridePath, err) } return nil diff --git a/pkg/volume/vsphere_volume/attacher_test.go b/pkg/volume/vsphere_volume/attacher_test.go index bb83f3a865c..af2dd7f088a 100644 --- a/pkg/volume/vsphere_volume/attacher_test.go +++ b/pkg/volume/vsphere_volume/attacher_test.go @@ -20,6 +20,7 @@ package vsphere_volume import ( "errors" + "fmt" "testing" v1 "k8s.io/api/core/v1" @@ -31,6 +32,13 @@ import ( "k8s.io/klog/v2" ) +var ( + // diskNameErr is the error when disk name is wrong. + diskNameErr = errors.New("wrong diskName") + // nodeNameErr is the error when node name is wrong. + nodeNameErr = errors.New("wrong nodeName") +) + func TestGetDeviceName_Volume(t *testing.T) { plugin := newPlugin(t) volPath := "[local] volumes/test" @@ -247,12 +255,12 @@ func (testcase *testcase) AttachDisk(diskName string, storagePolicyName string, if expected.diskName != diskName { testcase.t.Errorf("Unexpected AttachDisk call: expected diskName %s, got %s", expected.diskName, diskName) - return "", errors.New("Unexpected AttachDisk call: wrong diskName") + return "", fmt.Errorf(`Unexpected AttachDisk call: %w`, diskNameErr) } if expected.nodeName != nodeName { testcase.t.Errorf("Unexpected AttachDisk call: expected nodeName %s, got %s", expected.nodeName, nodeName) - return "", errors.New("Unexpected AttachDisk call: wrong nodeName") + return "", fmt.Errorf(`Unexpected AttachDisk call: %w`, nodeNameErr) } klog.V(4).Infof("AttachDisk call: %s, %s, returning %q, %v", diskName, nodeName, expected.retDeviceUUID, expected.ret) @@ -272,12 +280,12 @@ func (testcase *testcase) DetachDisk(diskName string, nodeName types.NodeName) e if expected.diskName != diskName { testcase.t.Errorf("Unexpected DetachDisk call: expected diskName %s, got %s", expected.diskName, diskName) - return errors.New("Unexpected DetachDisk call: wrong diskName") + return fmt.Errorf(`Unexpected DetachDisk call: %w`, diskNameErr) } if expected.nodeName != nodeName { testcase.t.Errorf("Unexpected DetachDisk call: expected nodeName %s, got %s", expected.nodeName, nodeName) - return errors.New("Unexpected DetachDisk call: wrong nodeName") + return fmt.Errorf(`Unexpected DetachDisk call: %w`, nodeNameErr) } klog.V(4).Infof("DetachDisk call: %s, %s, returning %v", diskName, nodeName, expected.ret) @@ -297,12 +305,12 @@ func (testcase *testcase) DiskIsAttached(diskName string, nodeName types.NodeNam if expected.diskName != diskName { testcase.t.Errorf("Unexpected DiskIsAttached call: expected diskName %s, got %s", expected.diskName, diskName) - return false, diskName, errors.New("Unexpected DiskIsAttached call: wrong diskName") + return false, diskName, fmt.Errorf(`Unexpected DiskIsAttached call: %w`, diskNameErr) } if expected.nodeName != nodeName { testcase.t.Errorf("Unexpected DiskIsAttached call: expected nodeName %s, got %s", expected.nodeName, nodeName) - return false, diskName, errors.New("Unexpected DiskIsAttached call: wrong nodeName") + return false, diskName, fmt.Errorf(`Unexpected DiskIsAttached call: %w`, nodeNameErr) } klog.V(4).Infof("DiskIsAttached call: %s, %s, returning %v, %v", diskName, nodeName, expected.isAttached, expected.ret) diff --git a/staging/src/k8s.io/controller-manager/pkg/leadermigration/config/config.go b/staging/src/k8s.io/controller-manager/pkg/leadermigration/config/config.go index 8f460a30c93..3e697dbf455 100644 --- a/staging/src/k8s.io/controller-manager/pkg/leadermigration/config/config.go +++ b/staging/src/k8s.io/controller-manager/pkg/leadermigration/config/config.go @@ -51,7 +51,7 @@ func init() { func ReadLeaderMigrationConfiguration(configFilePath string) (*internal.LeaderMigrationConfiguration, error) { data, err := ioutil.ReadFile(configFilePath) if err != nil { - return nil, fmt.Errorf("unable to read leader migration configuration from %q: %v", configFilePath, err) + return nil, fmt.Errorf("unable to read leader migration configuration from %q: %w", configFilePath, err) } config, gvk, err := serializer.NewCodecFactory(cfgScheme).UniversalDecoder().Decode(data, nil, nil) if err != nil {