*: use fmt.Errorf with %w/%v for Go 1.13 error wrapping #2355

nrchakradhar · 2019-12-28T07:17:08Z

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

Description of the change:
As the code is upgraded to go 1.13, error handling has been changed. The PR addresses the same.

errors.Wrap(), errors.Wrapf(), are replaced with fmt.Errorf() with %w.
fmt.Errorf() calls that wrap an error, but use %s or %v, are replaced with fmt.Errorf() with %w
Uses of the github.com/pkg/errors package is transitioned over to Go's standard library errors package.

All fmt.Errorf() calls that wrap an error are changed as below:

fmt.Errorf("some context about my error: %w", err)

Motivation for the change:
Upgrade to go 1.13 version

nrchakradhar · 2019-12-29T10:02:10Z

@joelanford @jmrodri @jmccormick2001
Can you please take a look. I had made multiple commits but have now squashed them and CI has passed.
Let me know if there are any changes to be done.

cmd/operator-sdk/new/cmd.go

cmd/operator-sdk/add/api.go

internal/scorecard/scorecard.go

internal/util/operator-registry/package_manifest.go

pkg/ansible/watches/watches.go

pkg/helm/release/manager.go

internal/generate/gen/rules.go

CHANGELOG.md

nrchakradhar · 2020-01-04T02:51:25Z

@estroz can you please check the changes and let me know if additional changes are needed. Thanks

CHANGELOG.md

camilamacedo86

Great collab 🥇. Really tks for the contribution.
It shows fine, however, needs to be rebased with the master.
Could you please rebase for we are able to check if all are changed as requested?

nrchakradhar · 2020-01-08T13:04:42Z

@camilamacedo86 I have rebased and pre-submit checks have passed. PTAL.
Let me know if any additional changes are needed. Thanks for accepting the contribution.
I had missed one change and realised after commenting. I have updated the PR.

estroz · 2020-01-09T17:40:07Z

test/e2e/_incluster-test-code/memcached_test.go

@@ -126,7 +126,7 @@ func verifyLeader(t *testing.T, namespace string, f *framework.Framework, labels
 		return true, nil
 	})
 	if err != nil {
-		return nil, fmt.Errorf("error getting leader lock configmap: %v", err)


@nrchakradhar also nothing in test/ should be wrapped. Otherwise LGTM.

Changes done.

CHANGELOG.md

nrchakradhar · 2020-01-12T14:42:07Z

I hope I have addressed all the changes. @estroz @camilamacedo86 PTAL. Thanks.

estroz

/lgtm

camilamacedo86 · 2020-01-13T18:37:03Z

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
-
+- Changed error wrapping according to Go version 1.13+ [error handling](https://blog.golang.org/go1.13-errors). ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))


Hi @nrchakradhar,

We had a new release so it needs to be updated with the master and the CHANGELOG properly updated. Could you please do that for we are able to merge?

camilamacedo86

Has /lgtm
Needs just rebase with master and updated properly the CHANGELOG.

openshift-ci-robot · 2020-01-14T06:01:12Z

New changes are detected. LGTM label has been removed.

nrchakradhar · 2020-01-14T07:49:08Z

@estroz @camilamacedo86 Travis error shows that there is a mismatch in go module versions.
I am not sure why the build is failing and how to fix it. Can you please help?

estroz · 2020-01-16T05:30:52Z

@nrchakradhar merge your branch with master, that should resolve the issue.

Use fmt.Errorf as per 1.13. Changed errors.Wrap and errors.Wrapf to use fmt.Errorf. Fixes operator-framework#2308

nrchakradhar · 2020-01-16T10:48:05Z

The new failure seems to be different than the changes.
https://travis-ci.org/operator-framework/operator-sdk/jobs/637862112?utm_medium=notification

Found broken url (#1571 -> #1571) at ./CHANGELOG.md:221 : 502 Bad Gateway
Found broken url (#2298 -> #2298) at ./CHANGELOG.md:81 : 502 Bad Gateway

May be there is some network issue during the build.

How do I re-trigger the build? @estroz @camilamacedo86

camilamacedo86

/gtm
/approved

Already LGTM'd

openshift-ci-robot requested review from jmccormick2001 and jmrodri December 28, 2019 07:17

openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 28, 2019

nrchakradhar force-pushed the golangFmtErrorF branch from 76a2698 to 84fc90b Compare December 29, 2019 09:38

estroz suggested changes Dec 30, 2019

View reviewed changes

nrchakradhar requested a review from estroz December 31, 2019 06:32

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 1, 2020

camilamacedo86 reviewed Jan 8, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

camilamacedo86 reviewed Jan 8, 2020

View reviewed changes

nrchakradhar force-pushed the golangFmtErrorF branch from f12a52f to 4d96e44 Compare January 8, 2020 09:44

estroz reviewed Jan 9, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

nrchakradhar force-pushed the golangFmtErrorF branch from f8b2ea7 to fc4f218 Compare January 12, 2020 13:11

nrchakradhar requested a review from estroz January 12, 2020 14:40

estroz approved these changes Jan 13, 2020

View reviewed changes

openshift-ci-robot assigned estroz Jan 13, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 13, 2020

camilamacedo86 reviewed Jan 13, 2020

View reviewed changes

camilamacedo86 previously requested changes Jan 13, 2020

View reviewed changes

nrchakradhar force-pushed the golangFmtErrorF branch from fc4f218 to 7003190 Compare January 14, 2020 06:01

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2020

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2020

nrchakradhar added 8 commits January 16, 2020 13:19

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

61a73d4

Use fmt.Errorf as per 1.13. Changed errors.Wrap and errors.Wrapf to use fmt.Errorf. Fixes operator-framework#2308

After rebase and few changes

0c09780

fix build errors after rebase

c950d0a

Missed committing one change

7655c5b

Fixing build issues

e43df2d

Incorporate newer review comments

b91e47f

After rebase with release of v0.14.0

c7d646a

After rebase with release of v0.14.0. fix build

f72306f

nrchakradhar force-pushed the golangFmtErrorF branch from e4dac51 to f72306f Compare January 16, 2020 07:51

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2020

After one more rebase to master

a9895a1

camilamacedo86 reviewed Jan 16, 2020

View reviewed changes

estroz requested a review from camilamacedo86 January 16, 2020 21:50

estroz changed the title ~~Go 1.13 error wrapping: Use fmt.Errorf as per 1.13.~~ *: use fmt.Errorf with %w/%v for Go 1.13 error wrapping Jan 16, 2020

estroz merged commit 3dec6d2 into operator-framework:master Jan 16, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: use fmt.Errorf with %w/%v for Go 1.13 error wrapping #2355

*: use fmt.Errorf with %w/%v for Go 1.13 error wrapping #2355

nrchakradhar commented Dec 28, 2019

nrchakradhar commented Dec 29, 2019

nrchakradhar commented Jan 4, 2020

camilamacedo86 left a comment

nrchakradhar commented Jan 8, 2020 •

edited

Loading

estroz Jan 9, 2020

nrchakradhar Jan 12, 2020

nrchakradhar commented Jan 12, 2020

estroz left a comment

camilamacedo86 Jan 13, 2020

camilamacedo86 left a comment

openshift-ci-robot commented Jan 14, 2020

nrchakradhar commented Jan 14, 2020

estroz commented Jan 16, 2020

nrchakradhar commented Jan 16, 2020 •

edited

Loading

camilamacedo86 left a comment

*: use fmt.Errorf with %w/%v for Go 1.13 error wrapping #2355

*: use fmt.Errorf with %w/%v for Go 1.13 error wrapping #2355

Conversation

nrchakradhar commented Dec 28, 2019

nrchakradhar commented Dec 29, 2019

nrchakradhar commented Jan 4, 2020

camilamacedo86 left a comment

Choose a reason for hiding this comment

nrchakradhar commented Jan 8, 2020 • edited Loading

estroz Jan 9, 2020

Choose a reason for hiding this comment

nrchakradhar Jan 12, 2020

Choose a reason for hiding this comment

nrchakradhar commented Jan 12, 2020

estroz left a comment

Choose a reason for hiding this comment

camilamacedo86 Jan 13, 2020

Choose a reason for hiding this comment

camilamacedo86 left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jan 14, 2020

nrchakradhar commented Jan 14, 2020

estroz commented Jan 16, 2020

nrchakradhar commented Jan 16, 2020 • edited Loading

camilamacedo86 left a comment

Choose a reason for hiding this comment

nrchakradhar commented Jan 8, 2020 •

edited

Loading

nrchakradhar commented Jan 16, 2020 •

edited

Loading