remove github.com/pkg/errors (#1031)

* remove github.com/pkg/errors

Signed-off-by: fahed dorgaa <[email protected]>

* fixes

Signed-off-by: fahed dorgaa <[email protected]>

Author: fahedouch

cmd/versionhook/main.go

@@ -3,13 +3,12 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/agent"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
@@ -108,7 +107,7 @@ func waitForAgentHealthStatus() (agent.Health, error) {
 
 		status, ok := health.Healthiness[getHostname()]
 		if !ok {
-			return agent.Health{}, errors.Errorf("couldn't find status for hostname %s", getHostname())
+			return agent.Health{}, fmt.Errorf("couldn't find status for hostname %s", getHostname())
 		}
 
 		// We determine if the file has been updated by checking if the process is not in goal state.
@@ -117,7 +116,7 @@ func waitForAgentHealthStatus() (agent.Health, error) {
 			return health, nil
 		}
 	}
-	return agent.Health{}, errors.Errorf("agent health status not ready after waiting %s", pollingDuration.String())
+	return agent.Health{}, fmt.Errorf("agent health status not ready after waiting %s", pollingDuration.String())
 
 }
 
@@ -132,7 +131,7 @@ func getAgentHealthStatus() (agent.Health, error) {
 
 	h, err := readAgentHealthStatus(f)
 	if err != nil {
-		return agent.Health{}, errors.Errorf("could not read health status file: %s", err)
+		return agent.Health{}, fmt.Errorf("could not read health status file: %s", err)
 	}
 	return h, err
 }
@@ -159,7 +158,7 @@ func getHostname() string {
 func shouldDeletePod(health agent.Health) (bool, error) {
 	status, ok := health.ProcessPlans[getHostname()]
 	if !ok {
-		return false, errors.Errorf("hostname %s was not in the process plans", getHostname())
+		return false, fmt.Errorf("hostname %s was not in the process plans", getHostname())
 	}
 	return isWaitingToBeDeleted(status), nil
 }
@@ -186,15 +185,15 @@ func isWaitingToBeDeleted(healthStatus agent.MmsDirectorStatus) bool {
 func deletePod() error {
 	thisPod, err := getThisPod()
 	if err != nil {
-		return errors.Errorf("could not get pod: %s", err)
+		return fmt.Errorf("could not get pod: %s", err)
 	}
 	k8sClient, err := inClusterClient()
 	if err != nil {
-		return errors.Errorf("could not get client: %s", err)
+		return fmt.Errorf("could not get client: %s", err)
 	}
 
 	if err := k8sClient.Delete(context.TODO(), &thisPod); err != nil {
-		return errors.Errorf("could not delete pod: %s", err)
+		return fmt.Errorf("could not delete pod: %s", err)
 	}
 	return nil
 }
@@ -203,12 +202,12 @@ func deletePod() error {
 func getThisPod() (corev1.Pod, error) {
 	podName := getHostname()
 	if podName == "" {
-		return corev1.Pod{}, errors.Errorf("environment variable HOSTNAME was not present")
+		return corev1.Pod{}, fmt.Errorf("environment variable HOSTNAME was not present")
 	}
 
 	ns, err := getNamespace()
 	if err != nil {
-		return corev1.Pod{}, errors.Errorf("could not read namespace: %s", err)
+		return corev1.Pod{}, fmt.Errorf("could not read namespace: %s", err)
 	}
 
 	return corev1.Pod{
@@ -222,12 +221,12 @@ func getThisPod() (corev1.Pod, error) {
 func inClusterClient() (client.Client, error) {
 	config, err := rest.InClusterConfig()
 	if err != nil {
-		return nil, errors.Errorf("could not get cluster config: %s", err)
+		return nil, fmt.Errorf("could not get cluster config: %s", err)
 	}
 
 	k8sClient, err := client.New(config, client.Options{})
 	if err != nil {
-		return nil, errors.Errorf("could not create client: %s", err)
+		return nil, fmt.Errorf("could not create client: %s", err)
 	}
 	return k8sClient, nil
 }

controllers/mongodb_tls.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/mongodb/mongodb-kubernetes-operator/controllers/construct"
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/automationconfig"
-	"github.com/pkg/errors"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/secret"
 
@@ -172,7 +171,7 @@ func getCaCrt(cmGetter configmap.Getter, secretGetter secret.Getter, mdb mdbv1.M
 	}
 
 	if cert, ok := caData[tlsCACertName]; !ok || cert == "" {
-		return "", errors.Errorf(`CA certificate resource "%s" should have a CA certificate in field "%s"`, caResourceName, tlsCACertName)
+		return "", fmt.Errorf(`CA certificate resource "%s" should have a CA certificate in field "%s"`, caResourceName, tlsCACertName)
 	} else {
 		return cert, nil
 	}

controllers/prometheus.go

@@ -8,7 +8,6 @@ import (
 	mdbv1 "github.com/mongodb/mongodb-kubernetes-operator/api/v1"
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/automationconfig"
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/secret"
-	"github.com/pkg/errors"
 
 	"k8s.io/apimachinery/pkg/types"
 )
@@ -28,7 +27,7 @@ func getPrometheusModification(getUpdateCreator secret.GetUpdateCreator, mdb mdb
 	secretNamespacedName := types.NamespacedName{Name: mdb.Spec.Prometheus.PasswordSecretRef.Name, Namespace: mdb.Namespace}
 	password, err := secret.ReadKey(getUpdateCreator, mdb.Spec.Prometheus.GetPasswordKey(), secretNamespacedName)
 	if err != nil {
-		return automationconfig.NOOP(), errors.Errorf("could not configure Prometheus modification: %s", err)
+		return automationconfig.NOOP(), fmt.Errorf("could not configure Prometheus modification: %s", err)
 	}
 
 	var certKey string

controllers/replica_set_controller.go

@@ -28,8 +28,6 @@ import (
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/status"
 
-	"github.com/pkg/errors"
-
 	"github.com/mongodb/mongodb-kubernetes-operator/controllers/construct"
 	"github.com/mongodb/mongodb-kubernetes-operator/controllers/validation"
 	"github.com/mongodb/mongodb-kubernetes-operator/controllers/watch"
@@ -296,11 +294,11 @@ func (r *ReplicaSetReconciler) ensureTLSResources(mdb mdbv1.MongoDBCommunity) er
 	if mdb.Spec.Security.TLS.Enabled {
 		r.log.Infof("TLS is enabled, creating/updating CA secret")
 		if err := ensureCASecret(r.client, r.client, r.client, mdb); err != nil {
-			return errors.Errorf("could not ensure CA secret: %s", err)
+			return fmt.Errorf("could not ensure CA secret: %s", err)
 		}
 		r.log.Infof("TLS is enabled, creating/updating TLS secret")
 		if err := ensureTLSSecret(r.client, mdb); err != nil {
-			return errors.Errorf("could not ensure TLS secret: %s", err)
+			return fmt.Errorf("could not ensure TLS secret: %s", err)
 		}
 	}
 	return nil
@@ -317,7 +315,7 @@ func (r *ReplicaSetReconciler) ensurePrometheusTLSResources(mdb mdbv1.MongoDBCom
 	// require the contents.
 	r.log.Infof("Prometheus TLS is enabled, creating/updating TLS secret")
 	if err := ensurePrometheusTLSSecret(r.client, mdb); err != nil {
-		return errors.Errorf("could not ensure TLS secret: %s", err)
+		return fmt.Errorf("could not ensure TLS secret: %s", err)
 	}
 
 	return nil
@@ -332,17 +330,17 @@ func (r *ReplicaSetReconciler) ensurePrometheusTLSResources(mdb mdbv1.MongoDBCom
 func (r *ReplicaSetReconciler) deployStatefulSet(mdb mdbv1.MongoDBCommunity) (bool, error) {
 	r.log.Info("Creating/Updating StatefulSet")
 	if err := r.createOrUpdateStatefulSet(mdb, false); err != nil {
-		return false, errors.Errorf("error creating/updating StatefulSet: %s", err)
+		return false, fmt.Errorf("error creating/updating StatefulSet: %s", err)
 	}
 
 	r.log.Info("Creating/Updating StatefulSet for Arbiters")
 	if err := r.createOrUpdateStatefulSet(mdb, true); err != nil {
-		return false, errors.Errorf("error creating/updating StatefulSet: %s", err)
+		return false, fmt.Errorf("error creating/updating StatefulSet: %s", err)
 	}
 
 	currentSts, err := r.client.GetStatefulSet(mdb.NamespacedName())
 	if err != nil {
-		return false, errors.Errorf("error getting StatefulSet: %s", err)
+		return false, fmt.Errorf("error getting StatefulSet: %s", err)
 	}
 
 	r.log.Debugf("Ensuring StatefulSet is ready, with type: %s", mdb.GetUpdateStrategyType())
@@ -474,7 +472,7 @@ func (r *ReplicaSetReconciler) ensureService(mdb mdbv1.MongoDBCommunity) error {
 func (r *ReplicaSetReconciler) createProcessPortManager(mdb mdbv1.MongoDBCommunity) (*agent.ReplicaSetPortManager, error) {
 	currentAC, err := automationconfig.ReadFromSecret(r.client, types.NamespacedName{Name: mdb.AutomationConfigSecretName(), Namespace: mdb.Namespace})
 	if err != nil {
-		return nil, errors.Errorf("could not read existing automation config: %s", err)
+		return nil, fmt.Errorf("could not read existing automation config: %s", err)
 	}
 
 	currentPodStates, err := agent.GetAllDesiredMembersAndArbitersPodState(mdb.NamespacedName(), r.client, mdb.StatefulSetReplicasThisReconciliation(), mdb.StatefulSetArbitersThisReconciliation(), currentAC.Version, r.log)
@@ -496,7 +494,7 @@ func (r *ReplicaSetReconciler) createOrUpdateStatefulSet(mdb mdbv1.MongoDBCommun
 	err := r.client.Get(context.TODO(), name, &set)
 	err = k8sClient.IgnoreNotFound(err)
 	if err != nil {
-		return errors.Errorf("error getting StatefulSet: %s", err)
+		return fmt.Errorf("error getting StatefulSet: %s", err)
 	}
 
 	buildStatefulSetModificationFunction(mdb)(&set)
@@ -505,7 +503,7 @@ func (r *ReplicaSetReconciler) createOrUpdateStatefulSet(mdb mdbv1.MongoDBCommun
 	}
 
 	if _, err = statefulset.CreateOrUpdate(r.client, set); err != nil {
-		return errors.Errorf("error creating/updating StatefulSet: %s", err)
+		return fmt.Errorf("error creating/updating StatefulSet: %s", err)
 	}
 	return nil
 }
@@ -515,7 +513,7 @@ func (r *ReplicaSetReconciler) createOrUpdateStatefulSet(mdb mdbv1.MongoDBCommun
 func (r ReplicaSetReconciler) ensureAutomationConfig(mdb mdbv1.MongoDBCommunity) (automationconfig.AutomationConfig, error) {
 	ac, err := r.buildAutomationConfig(mdb)
 	if err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not build automation config: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not build automation config: %s", err)
 	}
 
 	return automationconfig.EnsureSecret(
@@ -618,22 +616,22 @@ func getCustomRolesModification(mdb mdbv1.MongoDBCommunity) (automationconfig.Mo
 func (r ReplicaSetReconciler) buildAutomationConfig(mdb mdbv1.MongoDBCommunity) (automationconfig.AutomationConfig, error) {
 	tlsModification, err := getTLSConfigModification(r.client, r.client, mdb)
 	if err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not configure TLS modification: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not configure TLS modification: %s", err)
 	}
 
 	customRolesModification, err := getCustomRolesModification(mdb)
 	if err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not configure custom roles: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not configure custom roles: %s", err)
 	}
 
 	currentAC, err := automationconfig.ReadFromSecret(r.client, types.NamespacedName{Name: mdb.AutomationConfigSecretName(), Namespace: mdb.Namespace})
 	if err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not read existing automation config: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not read existing automation config: %s", err)
 	}
 
 	auth := automationconfig.Auth{}
 	if err := scram.Enable(&auth, r.client, mdb); err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not configure scram authentication: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not configure scram authentication: %s", err)
 	}
 
 	prometheusModification := automationconfig.NOOP()
@@ -643,7 +641,7 @@ func (r ReplicaSetReconciler) buildAutomationConfig(mdb mdbv1.MongoDBCommunity)
 
 		prometheusModification, err = getPrometheusModification(r.client, mdb)
 		if err != nil {
-			return automationconfig.AutomationConfig{}, errors.Errorf("could not enable TLS on Prometheus endpoint: %s", err)
+			return automationconfig.AutomationConfig{}, fmt.Errorf("could not enable TLS on Prometheus endpoint: %s", err)
 		}
 	}
 
@@ -663,7 +661,7 @@ func (r ReplicaSetReconciler) buildAutomationConfig(mdb mdbv1.MongoDBCommunity)
 	)
 
 	if err != nil {
-		return automationconfig.AutomationConfig{}, errors.Errorf("could not create an automation config: %s", err)
+		return automationconfig.AutomationConfig{}, fmt.Errorf("could not create an automation config: %s", err)
 	}
 
 	if mdb.Spec.AutomationConfigOverride != nil {

controllers/replicaset_controller_test.go

@@ -19,8 +19,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/yaml"
 
-	"github.com/pkg/errors"
-
 	"github.com/stretchr/objx"
 
 	k8sClient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -176,7 +174,7 @@ func getVolumeByName(sts appsv1.StatefulSet, volumeName string) (corev1.Volume,
 			return v, nil
 		}
 	}
-	return corev1.Volume{}, errors.Errorf("volume with name %s, not found", volumeName)
+	return corev1.Volume{}, fmt.Errorf("volume with name %s, not found", volumeName)
 }
 
 func TestChangingVersion_ResultsInRollingUpdateStrategyType(t *testing.T) {
@@ -1151,11 +1149,11 @@ func loadTestFixture(yamlFileName string) (mdbv1.MongoDBCommunity, error) {
 	mdb := mdbv1.MongoDBCommunity{}
 	data, err := os.ReadFile(testPath)
 	if err != nil {
-		return mdb, errors.Errorf("error reading file: %s", err)
+		return mdb, fmt.Errorf("error reading file: %s", err)
 	}
 
 	if err := marshalRuntimeObjectFromYAMLBytes(data, &mdb); err != nil {
-		return mdb, errors.Errorf("error converting yaml bytes to service account: %s", err)
+		return mdb, fmt.Errorf("error converting yaml bytes to service account: %s", err)
 	}
 
 	return mdb, nil

controllers/validation/validation.go

@@ -1,12 +1,12 @@
 package validation
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
 	mdbv1 "github.com/mongodb/mongodb-kubernetes-operator/api/v1"
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/authentication/scram"
-	"github.com/pkg/errors"
 )
 
 // ValidateInitalSpec checks if the resource's initial Spec is valid.
@@ -77,12 +77,12 @@ func validateUsers(mdb mdbv1.MongoDBCommunity) error {
 
 	}
 	if len(nameCollisions) > 0 {
-		return errors.Errorf("connection string secret names collision, update at least one of the users so that the resulted secret names (<resource name>-<user>-<db>) are unique: %s",
+		return fmt.Errorf("connection string secret names collision, update at least one of the users so that the resulted secret names (<resource name>-<user>-<db>) are unique: %s",
 			strings.Join(nameCollisions, ", "))
 	}
 
 	if len(scramSecretNameCollisions) > 0 {
-		return errors.Errorf("scram credential secret names collision, update at least one of the users: %s",
+		return fmt.Errorf("scram credential secret names collision, update at least one of the users: %s",
 			strings.Join(scramSecretNameCollisions, ", "))
 	}
 

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/go-logr/logr v1.2.3
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/imdario/mergo v0.3.13
-	github.com/pkg/errors v0.9.1
 	github.com/spf13/cast v1.5.0
 	github.com/stretchr/objx v0.4.0
 	github.com/stretchr/testify v1.7.1
@@ -45,6 +44,7 @@ require (
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.11.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect