Merge pull request #64 from inteon/replace_deprecated

Replace deprecated functions and add missing error checks

Author: jetstack-bot

driver/controllerserver.go

@@ -17,8 +17,9 @@ limitations under the License.
 package driver
 
 import (
+	"context"
+
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

driver/identityserver.go

@@ -17,8 +17,9 @@ limitations under the License.
 package driver
 
 import (
+	"context"
+
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

driver/nodeserver.go

@@ -111,18 +111,18 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	}
 
 	log.Info("Ensuring data directory for volume is mounted into pod...")
-	notMnt, err := mount.IsNotMountPoint(ns.mounter, req.GetTargetPath())
+	isMnt, err := ns.mounter.IsMountPoint(req.GetTargetPath())
 	switch {
 	case os.IsNotExist(err):
 		if err := os.MkdirAll(req.GetTargetPath(), 0440); err != nil {
 			return nil, err
 		}
-		notMnt = true
+		isMnt = false
 	case err != nil:
 		return nil, err
 	}
 
-	if !notMnt {
+	if isMnt {
 		// Nothing more to do if the targetPath is already a bind mount
 		log.Info("Volume already mounted to pod, nothing to do")
 		success = true
@@ -158,11 +158,12 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, request *csi.Node
 	ns.manager.UnmanageVolume(request.GetVolumeId())
 	log.Info("Stopped management of volume")
 
-	notMnt, err := mount.IsNotMountPoint(ns.mounter, request.GetTargetPath())
+	isMnt, err := ns.mounter.IsMountPoint(request.GetTargetPath())
 	if err != nil {
 		return nil, err
 	}
-	if !notMnt {
+
+	if isMnt {
 		if err := ns.mounter.Unmount(request.GetTargetPath()); err != nil {
 			return nil, err
 		}

driver/server.go

@@ -17,6 +17,7 @@ limitations under the License.
 package driver
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@@ -25,12 +26,10 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/go-logr/logr"
 	"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
 
 type GRPCServer struct {
-	log    logr.Logger
 	server *grpc.Server
 	lis    net.Listener
 }

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/go-logr/logr v1.3.0
 	github.com/kubernetes-csi/csi-lib-utils v0.15.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/net v0.19.0
 	google.golang.org/grpc v1.59.0
 	k8s.io/apimachinery v0.28.4
 	k8s.io/client-go v0.28.4
@@ -58,6 +57,7 @@ require (
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/crypto v0.16.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/term v0.15.0 // indirect

manager/manager.go

@@ -169,7 +169,7 @@ func NewManager(opts Options) (*Manager, error) {
 	// Fetch the lister before calling Start() to ensure this informer is
 	// registered with the factory
 	lister := informerFactory.Certmanager().V1().CertificateRequests().Lister()
-	informerFactory.Certmanager().V1().CertificateRequests().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+	if _, err := informerFactory.Certmanager().V1().CertificateRequests().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		DeleteFunc: func(obj interface{}) {
 			requestToPrivateKeyLock.Lock()
 			defer requestToPrivateKeyLock.Unlock()
@@ -190,7 +190,9 @@ func NewManager(opts Options) (*Manager, error) {
 
 			delete(requestToPrivateKeyMap, req.UID)
 		},
-	})
+	}); err != nil {
+		return nil, fmt.Errorf("failed to add event handler to CertificateRequest informer: %w", err)
+	}
 
 	// create a stop channel that manages all sub goroutines
 	stopCh := make(chan struct{})
@@ -720,7 +722,7 @@ func (m *Manager) submitRequest(ctx context.Context, meta metadata.Metadata, csr
 	// This ensures callers that read from the lister/cache do not enter a confused state
 	// where the CertificateRequest does not exist after calling submitRequest due to
 	// cache timing issues.
-	wait.PollUntilContextCancel(ctx, time.Millisecond*50, true, func(ctx context.Context) (bool, error) {
+	if err := wait.PollUntilContextCancel(ctx, time.Millisecond*50, true, func(ctx context.Context) (bool, error) {
 		_, err := m.lister.CertificateRequests(csrBundle.Namespace).Get(req.Name)
 		if apierrors.IsNotFound(err) {
 			return false, nil
@@ -729,7 +731,9 @@ func (m *Manager) submitRequest(ctx context.Context, meta metadata.Metadata, csr
 			return false, err
 		}
 		return true, nil
-	})
+	}); err != nil {
+		return nil, fmt.Errorf("waiting for CertificateRequest to be observed by lister: %w", err)
+	}
 
 	return req, nil
 }

storage/filesystem.go

@@ -20,8 +20,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -74,7 +74,7 @@ func NewFilesystem(log logr.Logger, baseDir string) (*Filesystem, error) {
 		fs: os.DirFS("/").(fs.StatFS),
 	}
 
-	notMnt, err := mount.IsNotMountPoint(mount.New(""), f.tempfsPath())
+	isMnt, err := mount.New("").IsMountPoint(f.tempfsPath())
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return nil, err
@@ -84,7 +84,7 @@ func NewFilesystem(log logr.Logger, baseDir string) (*Filesystem, error) {
 		}
 	}
 
-	if notMnt {
+	if !isMnt {
 		if err := mount.New("").Mount("tmpfs", f.tempfsPath(), "tmpfs", []string{}); err != nil {
 			return nil, fmt.Errorf("mounting tmpfs: %w", err)
 		}
@@ -290,7 +290,7 @@ func (f *Filesystem) ReadFile(volumeID, name string) ([]byte, error) {
 	}
 	defer file.Close()
 
-	return ioutil.ReadAll(file)
+	return io.ReadAll(file)
 }
 
 // metadataPathForVolumeID returns the metadata.json path for the volume with