[v1.3.x] Fix panic with "operator-sdk bundle validate" and OCI (#4386)

openshift-cherrypick-robot · blaqkube · web-flow · commit 608aa0505f50 · 2021-01-11T13:28:59.000-08:00
Co-authored-by: blaqkube &lt;64150653+blaqkube@users.noreply.github.com&gt;
diff --git a/changelog/fragments/fix-bundle-validate-panic.yaml b/changelog/fragments/fix-bundle-validate-panic.yaml
@@ -0,0 +1,4 @@
+entries:
+  - description: Fix panic when "operator-sdk bundle validate" fails
+    kind: bugfix
+    breaking: false
diff --git a/internal/cmd/operator-sdk/bundle/validate/validate.go b/internal/cmd/operator-sdk/bundle/validate/validate.go
@@ -111,7 +111,7 @@ func (c bundleValidateCmd) run(logger *log.Entry, bundleRaw string) (res *intern
 			return res, err
 		}
 		defer func() {
-			if err = os.RemoveAll(c.directory); err != nil {
+			if err := os.RemoveAll(c.directory); err != nil {
 				logger.Errorf("Error removing temp bundle dir: %v", err)
 			}
 		}()

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (c bundleValidateCmd) run(logger log.Entry, bundleRaw string) (res intern`
`111`	`111`	`return res, err`
`112`	`112`	`}`
`113`	`113`	`defer func() {`
`114`		`- if err = os.RemoveAll(c.directory); err != nil {`
	`114`	`+ if err := os.RemoveAll(c.directory); err != nil {`
`115`	`115`	`logger.Errorf("Error removing temp bundle dir: %v", err)`
`116`	`116`	`}`
`117`	`117`	`}()`