From 51e40304bc76509c3b50e6f928c31fca1a0bb634 Mon Sep 17 00:00:00 2001
From: Catherine Chan-Tse <cchantse@redhat.com>
Date: Wed, 24 Aug 2022 15:58:47 -0400
Subject: [PATCH] Addressing additional feedback from PR 1015

Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
---
 alpha/veneer/semver/semver.go  |  6 +++---
 cmd/opm/alpha/veneer/semver.go | 28 +++++++++++++---------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/alpha/veneer/semver/semver.go b/alpha/veneer/semver/semver.go
index 00edcc64f..6b1e484f8 100644
--- a/alpha/veneer/semver/semver.go
+++ b/alpha/veneer/semver/semver.go
@@ -128,8 +128,8 @@ func buildBundleList(bundles *[]semverVeneerBundleEntry, dict *map[string]struct
 	}
 }
 
-func readFile(data io.Reader) (*semverVeneer, error) {
-	fileData, err := io.ReadAll(data)
+func readFile(reader io.Reader) (*semverVeneer, error) {
+	data, err := io.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +140,7 @@ func readFile(data io.Reader) (*semverVeneer, error) {
 		GenerateMinorChannels: true,
 		AvoidSkipPatch:        false,
 	}
-	if err := yaml.Unmarshal(fileData, &sv); err != nil {
+	if err := yaml.Unmarshal(data, &sv); err != nil {
 		return nil, err
 	}
 	return &sv, nil
diff --git a/cmd/opm/alpha/veneer/semver.go b/cmd/opm/alpha/veneer/semver.go
index 6ee258b83..6a2486c99 100644
--- a/cmd/opm/alpha/veneer/semver.go
+++ b/cmd/opm/alpha/veneer/semver.go
@@ -23,22 +23,13 @@ func newSemverCmd() *cobra.Command {
 		Long:  "Generate a file-based catalog from a single 'semver veneer' file \nWhen FILE is '-' or not provided, the veneer is read from standard input",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			var (
-				data io.Reader
-				err  error
-			)
-
 			// Handle different input argument types
-			if len(args) == 0 || args[0] == "-" {
-				// When no arguments or "-" is passed to the command,
-				// assume input is coming from stdin
-				data = cmd.InOrStdin()
-			} else {
-				// Otherwise open the file passed to the command
-				data, err = os.Open(args[0])
-				if err != nil {
-					return err
-				}
+			// When no arguments or "-" is passed to the command,
+			// assume input is coming from stdin
+			// Otherwise open the file passed to the command
+			data, err := openFileOrReadStdin(cmd, args)
+			if err != nil {
+				return err
 			}
 
 			var write func(declcfg.DeclarativeConfig, io.Writer) error
@@ -86,3 +77,10 @@ func newSemverCmd() *cobra.Command {
 	cmd.Flags().StringVarP(&output, "output", "o", "json", "Output format (json|yaml|mermaid)")
 	return cmd
 }
+
+func openFileOrReadStdin(cmd *cobra.Command, args []string) (io.Reader, error) {
+	if len(args) == 0 || args[0] == "-" {
+		return cmd.InOrStdin(), nil
+	}
+	return os.Open(args[0])
+}