Go 1.13 error wrapping: Use fmt.Errorf as per 1.13.

Use fmt.Errorf as per 1.13. Changed errors.Wrap and errors.Wrapf to use fmt.Errorf.

Fixes operator-framework#2308

Author: nrchakradhar

CHANGELOG.md

@@ -22,7 +22,7 @@
 - Added support for override values with environment variable expansion in the `watches.yaml` file for Helm-based operators. ([#2325](https://github.com/operator-framework/operator-sdk/pull/2325))
 
 ### Changed
-
+- Changes in `errors` wrapped to handle them according to the Go version 1.13+. More info: https://blog.golang.org/go1.13-errors. ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))
 - Replace usage of `github.com/operator-framework/operator-sdk/pkg/restmapper.DynamicRESTMapper` with `sigs.k8s.io/controller-runtime/pkg/client/apiutil.DynamicRESTMapper`. ([#2309](https://github.com/operator-framework/operator-sdk/pull/2309))
 - Upgraded Helm operator packages and base image from Helm v2 to Helm v3. Cluster state for pre-existing CRs using Helm v2-based operators will be automatically migrated to Helm v3's new release storage format, and existing releases may be upgraded due to changes in Helm v3's label injection. ([#2080](https://github.com/operator-framework/operator-sdk/pull/2080))
 - Fail `operator-sdk olm-catalog gen-csv` if it is not run from a project's root, which the command already assumes is the case. ([#2322](https://github.com/operator-framework/operator-sdk/pull/2322))

cmd/operator-sdk/add/api.go

@@ -25,7 +25,6 @@ import (
 	"github.com/operator-framework/operator-sdk/internal/scaffold/input"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -115,7 +114,7 @@ func apiRun(cmd *cobra.Command, args []string) error {
 	// scaffold a group.go to prevent erroneous gengo parse errors.
 	group := &scaffold.Group{Resource: r}
 	if err := scaffoldIfNoPkgFileExists(s, cfg, group); err != nil {
-		return errors.Wrap(err, "scaffold group file")
+		return fmt.Errorf("scaffold group file: %v", err)
 	}
 
 	err = s.Execute(cfg,
@@ -126,12 +125,12 @@ func apiRun(cmd *cobra.Command, args []string) error {
 		&scaffold.CR{Resource: r},
 	)
 	if err != nil {
-		return fmt.Errorf("api scaffold failed: (%v)", err)
+		return fmt.Errorf("api scaffold failed: %v", err)
 	}
 
 	// update deploy/role.yaml for the given resource r.
 	if err := scaffold.UpdateRoleForResource(r, absProjectPath); err != nil {
-		return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", r.APIVersion, r.Kind, err)
+		return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %v", r.APIVersion, r.Kind, err)
 	}
 
 	if !skipGeneration {
@@ -155,12 +154,12 @@ func apiRun(cmd *cobra.Command, args []string) error {
 func scaffoldIfNoPkgFileExists(s *scaffold.Scaffold, cfg *input.Config, f input.File) error {
 	i, err := f.GetInput()
 	if err != nil {
-		return errors.Wrapf(err, "error getting file %s input", i.Path)
+		return fmt.Errorf("error getting file %s input: %v", i.Path, err)
 	}
 	groupDir := filepath.Dir(i.Path)
 	gdInfos, err := ioutil.ReadDir(groupDir)
 	if err != nil && !os.IsNotExist(err) {
-		return errors.Wrapf(err, "error reading dir %s", groupDir)
+		return fmt.Errorf("error reading dir %s: %v", groupDir, err)
 	}
 	if err == nil {
 		for _, info := range gdInfos {

cmd/operator-sdk/add/controller.go

@@ -92,7 +92,7 @@ func controllerRun(cmd *cobra.Command, args []string) error {
 		&scaffold.AddController{Resource: r},
 	)
 	if err != nil {
-		return fmt.Errorf("controller scaffold failed: (%v)", err)
+		return fmt.Errorf("controller scaffold failed: %v", err)
 	}
 
 	log.Info("Controller generation complete.")

cmd/operator-sdk/add/crd.go

@@ -92,7 +92,7 @@ func crdFunc(cmd *cobra.Command, args []string) error {
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("crd scaffold failed: (%v)", err)
+		return fmt.Errorf("crd scaffold failed: %v", err)
 	}
 
 	// This command does not consider an APIs dir. Instead it adds a plain CRD
@@ -105,7 +105,7 @@ func crdFunc(cmd *cobra.Command, args []string) error {
 
 	// update deploy/role.yaml for the given resource r.
 	if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
-		return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): (%v)", resource.APIVersion, resource.Kind, err)
+		return fmt.Errorf("failed to update the RBAC manifest for the resource (%v, %v): %v", resource.APIVersion, resource.Kind, err)
 	}
 
 	log.Info("CRD generation complete.")
@@ -133,7 +133,7 @@ func verifyCRDFlags() error {
 func verifyCRDDeployPath() error {
 	wd, err := os.Getwd()
 	if err != nil {
-		return fmt.Errorf("failed to determine the full path of the current directory: (%v)", err)
+		return fmt.Errorf("failed to determine the full path of the current directory: %v", err)
 	}
 	// check if the deploy sub-directory exist
 	_, err = os.Stat(filepath.Join(wd, scaffold.DeployDir))

cmd/operator-sdk/build/cmd.go

@@ -76,7 +76,7 @@ func createBuildCommand(imageBuilder, context, dockerFile, image string, imageBu
 		if bargs != "" {
 			splitArgs, err := shlex.Split(bargs)
 			if err != nil {
-				return nil, fmt.Errorf("image-build-args is not parseable: %w", err)
+				return nil, fmt.Errorf("image-build-args is not parseable: %v", err)
 			}
 			args = append(args, splitArgs...)
 		}
@@ -120,7 +120,7 @@ func buildFunc(cmd *cobra.Command, args []string) error {
 			Env:         goBuildEnv,
 		}
 		if err := projutil.GoBuild(opts); err != nil {
-			return fmt.Errorf("failed to build operator binary: (%v)", err)
+			return fmt.Errorf("failed to build operator binary: %v", err)
 		}
 	}
 
@@ -134,7 +134,7 @@ func buildFunc(cmd *cobra.Command, args []string) error {
 	}
 
 	if err := projutil.ExecCmd(buildCmd); err != nil {
-		return fmt.Errorf("failed to output build image %s: (%v)", image, err)
+		return fmt.Errorf("failed to output build image %s: %v", image, err)
 	}
 
 	log.Info("Operator build complete.")

cmd/operator-sdk/internal/genutil/crds.go

@@ -31,10 +31,46 @@ func CRDGen() error {
 
 	log.Info("Running CRD generator.")
 
-	cfg := gen.Config{}
-	crd := gencrd.NewCRDGo(cfg)
-	if err := crd.Generate(); err != nil {
-		return fmt.Errorf("error generating CRDs from APIs in %s: %w", scaffold.ApisDir, err)
+	gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
+	if err != nil {
+		return fmt.Errorf("failed to parse group versions: %v", err)
+	}
+	gvb := &strings.Builder{}
+	for g, vs := range gvMap {
+		gvb.WriteString(fmt.Sprintf("%s:%v, ", g, vs))
+	}
+
+	log.Infof("Running CRD generation for Custom Resource group versions: [%v]\n", gvb.String())
+
+	s := &scaffold.Scaffold{}
+	cfg := &input.Config{
+		Repo:           repoPkg,
+		AbsProjectPath: absProjectPath,
+		ProjectName:    filepath.Base(absProjectPath),
+	}
+	crds, err := k8sutil.GetCRDs(scaffold.CRDsDir)
+	if err != nil {
+		return err
+	}
+	for _, crd := range crds {
+		g, v, k := crd.Spec.Group, crd.Spec.Version, crd.Spec.Names.Kind
+		if v == "" {
+			if len(crd.Spec.Versions) != 0 {
+				v = crd.Spec.Versions[0].Name
+			} else {
+				return fmt.Errorf("crd of group %s kind %s has no version", g, k)
+			}
+		}
+		r, err := scaffold.NewResource(g+"/"+v, k)
+		if err != nil {
+			return err
+		}
+		err = s.Execute(cfg,
+			&scaffold.CRD{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
+		)
+		if err != nil {
+			return err
+		}
 	}
 
 	log.Info("CRD generation complete.")

cmd/operator-sdk/internal/genutil/k8s.go

@@ -25,7 +25,6 @@ import (
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	generatorargs "k8s.io/code-generator/cmd/deepcopy-gen/args"
 	"k8s.io/gengo/examples/deepcopy-gen/generators"
@@ -40,7 +39,7 @@ func K8sCodegen() error {
 
 	gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
 	if err != nil {
-		return fmt.Errorf("failed to parse group versions: (%v)", err)
+		return fmt.Errorf("failed to parse group versions: %v", err)
 	}
 	gvb := &strings.Builder{}
 	for g, vs := range gvMap {
@@ -91,7 +90,7 @@ func deepcopyGen(hf string, fqApis []string) error {
 		}
 
 		if err := generatorargs.Validate(args); err != nil {
-			return errors.Wrap(err, "deepcopy-gen argument validation error")
+			return fmt.Errorf("deepcopy-gen argument validation error: %v", err)
 		}
 
 		err = args.Execute(
@@ -100,7 +99,7 @@ func deepcopyGen(hf string, fqApis []string) error {
 			generators.Packages,
 		)
 		if err != nil {
-			return errors.Wrap(err, "deepcopy-gen generator error")
+			return fmt.Errorf("deepcopy-gen generator error: %v", err)
 		}
 	}
 	return nil

cmd/operator-sdk/internal/genutil/openapi.go

@@ -25,7 +25,6 @@ import (
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	generatorargs "k8s.io/kube-openapi/cmd/openapi-gen/args"
 	"k8s.io/kube-openapi/pkg/generators"
@@ -39,7 +38,7 @@ func OpenAPIGen() error {
 
 	gvMap, err := k8sutil.ParseGroupSubpackages(scaffold.ApisDir)
 	if err != nil {
-		return fmt.Errorf("failed to parse group versions: (%v)", err)
+		return fmt.Errorf("failed to parse group versions: %v", err)
 	}
 	gvb := &strings.Builder{}
 	for g, vs := range gvMap {
@@ -83,7 +82,7 @@ func openAPIGen(hf string, fqApis []string) error {
 		// Print API rule violations to stdout
 		cargs.ReportFilename = "-"
 		if err := generatorargs.Validate(args); err != nil {
-			return errors.Wrap(err, "openapi-gen argument validation error")
+			return fmt.Errorf("openapi-gen argument validation error: %v", err)
 		}
 
 		err := args.Execute(
@@ -92,7 +91,7 @@ func openAPIGen(hf string, fqApis []string) error {
 			generators.Packages,
 		)
 		if err != nil {
-			return errors.Wrap(err, "openapi-gen generator error")
+			return fmt.Errorf("openapi-gen generator error: %v", err)
 		}
 	}
 	return nil

cmd/operator-sdk/migrate/cmd.go

@@ -101,7 +101,7 @@ func migrateAnsible() error {
 	case os.IsNotExist(err):
 		log.Info("No playbook was found, so not including it in the new Dockerfile")
 	default:
-		return fmt.Errorf("error trying to stat %s: (%v)", ansible.PlaybookYamlFile, err)
+		return fmt.Errorf("error trying to stat %s: %v", ansible.PlaybookYamlFile, err)
 	}
 	if err := renameDockerfile(); err != nil {
 		return err
@@ -111,7 +111,7 @@ func migrateAnsible() error {
 	if headerFile != "" {
 		err = s.Execute(cfg, &scaffold.Boilerplate{BoilerplateSrcPath: headerFile})
 		if err != nil {
-			return fmt.Errorf("boilerplate scaffold failed: (%v)", err)
+			return fmt.Errorf("boilerplate scaffold failed: %v", err)
 		}
 		s.BoilerplatePath = headerFile
 	}
@@ -126,7 +126,7 @@ func migrateAnsible() error {
 		&ansible.AoLogs{},
 	)
 	if err != nil {
-		return fmt.Errorf("migrate ansible scaffold failed: (%v)", err)
+		return fmt.Errorf("migrate ansible scaffold failed: %v", err)
 	}
 	return nil
 }
@@ -149,7 +149,7 @@ func migrateHelm() error {
 	if headerFile != "" {
 		err := s.Execute(cfg, &scaffold.Boilerplate{BoilerplateSrcPath: headerFile})
 		if err != nil {
-			return fmt.Errorf("boilerplate scaffold failed: (%v)", err)
+			return fmt.Errorf("boilerplate scaffold failed: %v", err)
 		}
 		s.BoilerplatePath = headerFile
 	}
@@ -166,7 +166,7 @@ func migrateHelm() error {
 		&helm.UserSetup{},
 	)
 	if err != nil {
-		return fmt.Errorf("migrate helm scaffold failed: (%v)", err)
+		return fmt.Errorf("migrate helm scaffold failed: %v", err)
 	}
 	return nil
 }
@@ -176,7 +176,7 @@ func renameDockerfile() error {
 	newDockerfilePath := dockerfilePath + ".sdkold"
 	err := os.Rename(dockerfilePath, newDockerfilePath)
 	if err != nil {
-		return fmt.Errorf("failed to rename Dockerfile: (%v)", err)
+		return fmt.Errorf("failed to rename Dockerfile: %v", err)
 	}
 	log.Infof("Renamed Dockerfile to %s and replaced with newer version. Compare the new Dockerfile to your old one and manually migrate any customizations", newDockerfilePath)
 	return nil