refactor: return plain err

Enda Phelan · Enda Phelan · commit 635665f7d426 · 2021-04-15T11:03:07.000+01:00
diff --git a/pkg/cmd/kafka/consumergroup/delete/delete.go b/pkg/cmd/kafka/consumergroup/delete/delete.go
@@ -89,11 +89,11 @@ func runCmd(opts *Options) error {
 
 	ctx := context.Background()
 
-	_, httpRes, consumerGroupErr := api.GetConsumerGroupById(ctx, opts.id).Execute()
+	_, httpRes, err := api.GetConsumerGroupById(ctx, opts.id).Execute()
 
-	if consumerGroupErr.Error() != "" {
+	if err.Error() != "" {
 		if httpRes == nil {
-			return consumerGroupErr
+			return err
 		}
 		if httpRes.StatusCode == 404 {
 			return errors.New(localizer.MustLocalize(&localizer.Config{
@@ -128,11 +128,11 @@ func runCmd(opts *Options) error {
 		}
 	}
 
-	httpRes, consumerGroupErr = api.DeleteConsumerGroupById(ctx, opts.id).Execute()
+	httpRes, err = api.DeleteConsumerGroupById(ctx, opts.id).Execute()
 
 	if err != nil {
 		if httpRes == nil {
-			return consumerGroupErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -158,9 +158,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), consumerGroupErr)
+			}), err)
 		default:
-			return consumerGroupErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/consumergroup/describe/describe.go b/pkg/cmd/kafka/consumergroup/describe/describe.go
@@ -105,11 +105,11 @@ func runCmd(opts *Options) error {
 
 	ctx := context.Background()
 
-	consumerGroupData, httpRes, consumerGroupErr := api.GetConsumerGroupById(ctx, opts.id).Execute()
+	consumerGroupData, httpRes, err := api.GetConsumerGroupById(ctx, opts.id).Execute()
 
-	if consumerGroupErr != nil && consumerGroupErr.Error() != "" {
+	if err != nil {
 		if httpRes == nil {
-			return consumerGroupErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -143,9 +143,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), consumerGroupErr)
+			}), err)
 		default:
-			return consumerGroupErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go
@@ -102,11 +102,11 @@ func runList(opts *Options) (err error) {
 		return err
 	}
 
-	consumerGroupData, httpRes, consumerGroupErr := api.GetConsumerGroupList(ctx).Limit(opts.limit).Execute()
+	consumerGroupData, httpRes, err := api.GetConsumerGroupList(ctx).Limit(opts.limit).Execute()
 
-	if consumerGroupErr != nil && consumerGroupErr.Error() != "" {
+	if err != nil && err.Error() != "" {
 		if httpRes == nil {
-			return consumerGroupErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -134,9 +134,9 @@ func runList(opts *Options) (err error) {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), consumerGroupErr)
+			}), err)
 		default:
-			return consumerGroupErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/topic/create/create.go b/pkg/cmd/kafka/topic/create/create.go
@@ -165,10 +165,10 @@ func runCmd(opts *Options) error {
 	}
 	createTopicReq = createTopicReq.NewTopicInput(topicInput)
 
-	response, httpRes, topicErr := createTopicReq.Execute()
-	if topicErr.Error() != "" {
+	response, httpRes, err := createTopicReq.Execute()
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -202,9 +202,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), topicErr)
+			}), err)
 		default:
-			return topicErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/topic/delete/delete.go b/pkg/cmd/kafka/topic/delete/delete.go
@@ -122,12 +122,12 @@ func runCmd(opts *Options) error {
 	}
 
 	// perform delete topic API request
-	_, httpRes, topicErr := api.GetTopic(context.Background(), opts.topicName).
+	_, httpRes, err := api.GetTopic(context.Background(), opts.topicName).
 		Execute()
 
-	if topicErr.Error() != "" {
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 		if httpRes.StatusCode == 404 {
 			return errors.New(localizer.MustLocalize(&localizer.Config{
@@ -145,7 +145,7 @@ func runCmd(opts *Options) error {
 			Message: localizer.MustLocalizeFromID("kafka.topic.delete.input.name.message"),
 		}
 		var userConfirmedName string
-		if err := survey.AskOne(promptConfirmName, &userConfirmedName); err != nil {
+		if err = survey.AskOne(promptConfirmName, &userConfirmedName); err != nil {
 			return err
 		}
 
@@ -162,11 +162,11 @@ func runCmd(opts *Options) error {
 	}
 
 	// perform delete topic API request
-	httpRes, topicErr = api.DeleteTopic(context.Background(), opts.topicName).
+	httpRes, err = api.DeleteTopic(context.Background(), opts.topicName).
 		Execute()
-	if topicErr.Error() != "" {
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -200,9 +200,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), topicErr)
+			}), err)
 		default:
-			return topicErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/topic/describe/describe.go b/pkg/cmd/kafka/topic/describe/describe.go
@@ -118,13 +118,13 @@ func runCmd(opts *Options) error {
 	}
 
 	// fetch the topic
-	topicResponse, httpRes, topicErr := api.
+	topicResponse, httpRes, err := api.
 		GetTopic(context.Background(), opts.topicName).
 		Execute()
 
-	if topicErr.Error() != "" {
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -158,9 +158,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), topicErr)
+			}), err)
 		default:
-			return topicErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/topic/list/list.go b/pkg/cmd/kafka/topic/list/list.go
@@ -102,11 +102,11 @@ func runCmd(opts *Options) error {
 	}
 
 	a := api.GetTopicsList(context.Background())
-	topicData, httpRes, topicErr := a.Execute()
+	topicData, httpRes, err := a.Execute()
 
-	if topicErr != nil {
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -134,9 +134,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), topicErr)
+			}), err)
 		default:
-			return topicErr
+			return err
 		}
 	}
 
diff --git a/pkg/cmd/kafka/topic/update/update.go b/pkg/cmd/kafka/topic/update/update.go
@@ -219,11 +219,11 @@ func runCmd(opts *Options) error {
 	// track if any values have changed
 	var needsUpdate bool
 
-	_, httpRes, topicErr := api.GetTopic(context.Background(), opts.topicName).Execute()
+	_, httpRes, err := api.GetTopic(context.Background(), opts.topicName).Execute()
 
-	if topicErr.Error() != "" {
+	if err.Error() != "" {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 		if httpRes.StatusCode == 404 {
 			return errors.New(localizer.MustLocalize(&localizer.Config{
@@ -266,11 +266,11 @@ func runCmd(opts *Options) error {
 	updateTopicReq = updateTopicReq.UpdateTopicInput(*topicSettings)
 
 	// update the topic
-	response, httpRes, topicErr := updateTopicReq.Execute()
+	response, httpRes, err := updateTopicReq.Execute()
 	// handle error
-	if topicErr.Error() != "" {
+	if err != nil {
 		if httpRes == nil {
-			return topicErr
+			return err
 		}
 
 		switch httpRes.StatusCode {
@@ -304,9 +304,9 @@ func runCmd(opts *Options) error {
 				TemplateData: map[string]interface{}{
 					"Name": kafkaInstance.GetName(),
 				},
-			}), topicErr)
+			}), err)
 		default:
-			return topicErr
+			return err
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ func runCmd(opts *Options) error {`
`89`	`89`
`90`	`90`	`ctx := context.Background()`
`91`	`91`
`92`		`- _, httpRes, consumerGroupErr := api.GetConsumerGroupById(ctx, opts.id).Execute()`
	`92`	`+ _, httpRes, err := api.GetConsumerGroupById(ctx, opts.id).Execute()`
`93`	`93`
`94`		`- if consumerGroupErr.Error() != "" {`
	`94`	`+ if err.Error() != "" {`
`95`	`95`	`if httpRes == nil {`
`96`		`- return consumerGroupErr`
	`96`	`+ return err`
`97`	`97`	`}`
`98`	`98`	`if httpRes.StatusCode == 404 {`
`99`	`99`	`return errors.New(localizer.MustLocalize(&localizer.Config{`
`@@ -128,11 +128,11 @@ func runCmd(opts *Options) error {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`- httpRes, consumerGroupErr = api.DeleteConsumerGroupById(ctx, opts.id).Execute()`
	`131`	`+ httpRes, err = api.DeleteConsumerGroupById(ctx, opts.id).Execute()`
`132`	`132`
`133`	`133`	`if err != nil {`
`134`	`134`	`if httpRes == nil {`
`135`		`- return consumerGroupErr`
	`135`	`+ return err`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`switch httpRes.StatusCode {`
`@@ -158,9 +158,9 @@ func runCmd(opts *Options) error {`
`158`	`158`	`TemplateData: map[string]interface{}{`
`159`	`159`	`"Name": kafkaInstance.GetName(),`
`160`	`160`	`},`
`161`		`- }), consumerGroupErr)`
	`161`	`+ }), err)`
`162`	`162`	`default:`
`163`		`- return consumerGroupErr`
	`163`	`+ return err`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,11 @@ func runList(opts *Options) (err error) {`
`102`	`102`	`return err`
`103`	`103`	`}`
`104`	`104`
`105`		`- consumerGroupData, httpRes, consumerGroupErr := api.GetConsumerGroupList(ctx).Limit(opts.limit).Execute()`
	`105`	`+ consumerGroupData, httpRes, err := api.GetConsumerGroupList(ctx).Limit(opts.limit).Execute()`
`106`	`106`
`107`		`- if consumerGroupErr != nil && consumerGroupErr.Error() != "" {`
	`107`	`+ if err != nil && err.Error() != "" {`
`108`	`108`	`if httpRes == nil {`
`109`		`- return consumerGroupErr`
	`109`	`+ return err`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`switch httpRes.StatusCode {`
`@@ -134,9 +134,9 @@ func runList(opts *Options) (err error) {`
`134`	`134`	`TemplateData: map[string]interface{}{`
`135`	`135`	`"Name": kafkaInstance.GetName(),`
`136`	`136`	`},`
`137`		`- }), consumerGroupErr)`
	`137`	`+ }), err)`
`138`	`138`	`default:`
`139`		`- return consumerGroupErr`
	`139`	`+ return err`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -165,10 +165,10 @@ func runCmd(opts *Options) error {`
`165`	`165`	`}`
`166`	`166`	`createTopicReq = createTopicReq.NewTopicInput(topicInput)`
`167`	`167`
`168`		`- response, httpRes, topicErr := createTopicReq.Execute()`
`169`		`- if topicErr.Error() != "" {`
	`168`	`+ response, httpRes, err := createTopicReq.Execute()`
	`169`	`+ if err != nil {`
`170`	`170`	`if httpRes == nil {`
`171`		`- return topicErr`
	`171`	`+ return err`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`switch httpRes.StatusCode {`
`@@ -202,9 +202,9 @@ func runCmd(opts *Options) error {`
`202`	`202`	`TemplateData: map[string]interface{}{`
`203`	`203`	`"Name": kafkaInstance.GetName(),`
`204`	`204`	`},`
`205`		`- }), topicErr)`
	`205`	`+ }), err)`
`206`	`206`	`default:`
`207`		`- return topicErr`
	`207`	`+ return err`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ func runCmd(opts *Options) error {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// perform delete topic API request`
`125`		`- _, httpRes, topicErr := api.GetTopic(context.Background(), opts.topicName).`
	`125`	`+ _, httpRes, err := api.GetTopic(context.Background(), opts.topicName).`
`126`	`126`	`Execute()`
`127`	`127`
`128`		`- if topicErr.Error() != "" {`
	`128`	`+ if err != nil {`
`129`	`129`	`if httpRes == nil {`
`130`		`- return topicErr`
	`130`	`+ return err`
`131`	`131`	`}`
`132`	`132`	`if httpRes.StatusCode == 404 {`
`133`	`133`	`return errors.New(localizer.MustLocalize(&localizer.Config{`
`@@ -145,7 +145,7 @@ func runCmd(opts *Options) error {`
`145`	`145`	`Message: localizer.MustLocalizeFromID("kafka.topic.delete.input.name.message"),`
`146`	`146`	`}`
`147`	`147`	`var userConfirmedName string`
`148`		`- if err := survey.AskOne(promptConfirmName, &userConfirmedName); err != nil {`
	`148`	`+ if err = survey.AskOne(promptConfirmName, &userConfirmedName); err != nil {`
`149`	`149`	`return err`
`150`	`150`	`}`
`151`	`151`
`@@ -162,11 +162,11 @@ func runCmd(opts *Options) error {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`// perform delete topic API request`
`165`		`- httpRes, topicErr = api.DeleteTopic(context.Background(), opts.topicName).`
	`165`	`+ httpRes, err = api.DeleteTopic(context.Background(), opts.topicName).`
`166`	`166`	`Execute()`
`167`		`- if topicErr.Error() != "" {`
	`167`	`+ if err != nil {`
`168`	`168`	`if httpRes == nil {`
`169`		`- return topicErr`
	`169`	`+ return err`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`switch httpRes.StatusCode {`
`@@ -200,9 +200,9 @@ func runCmd(opts *Options) error {`
`200`	`200`	`TemplateData: map[string]interface{}{`
`201`	`201`	`"Name": kafkaInstance.GetName(),`
`202`	`202`	`},`
`203`		`- }), topicErr)`
	`203`	`+ }), err)`
`204`	`204`	`default:`
`205`		`- return topicErr`
	`205`	`+ return err`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -118,13 +118,13 @@ func runCmd(opts *Options) error {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// fetch the topic`
`121`		`- topicResponse, httpRes, topicErr := api.`
	`121`	`+ topicResponse, httpRes, err := api.`
`122`	`122`	`GetTopic(context.Background(), opts.topicName).`
`123`	`123`	`Execute()`
`124`	`124`
`125`		`- if topicErr.Error() != "" {`
	`125`	`+ if err != nil {`
`126`	`126`	`if httpRes == nil {`
`127`		`- return topicErr`
	`127`	`+ return err`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`switch httpRes.StatusCode {`
`@@ -158,9 +158,9 @@ func runCmd(opts *Options) error {`
`158`	`158`	`TemplateData: map[string]interface{}{`
`159`	`159`	`"Name": kafkaInstance.GetName(),`
`160`	`160`	`},`
`161`		`- }), topicErr)`
	`161`	`+ }), err)`
`162`	`162`	`default:`
`163`		`- return topicErr`
	`163`	`+ return err`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,11 @@ func runCmd(opts *Options) error {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`a := api.GetTopicsList(context.Background())`
`105`		`- topicData, httpRes, topicErr := a.Execute()`
	`105`	`+ topicData, httpRes, err := a.Execute()`
`106`	`106`
`107`		`- if topicErr != nil {`
	`107`	`+ if err != nil {`
`108`	`108`	`if httpRes == nil {`
`109`		`- return topicErr`
	`109`	`+ return err`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`switch httpRes.StatusCode {`
`@@ -134,9 +134,9 @@ func runCmd(opts *Options) error {`
`134`	`134`	`TemplateData: map[string]interface{}{`
`135`	`135`	`"Name": kafkaInstance.GetName(),`
`136`	`136`	`},`
`137`		`- }), topicErr)`
	`137`	`+ }), err)`
`138`	`138`	`default:`
`139`		`- return topicErr`
	`139`	`+ return err`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`