🐛 Fix shared output flag variable masking across cmd packages

Author: OpenWaygate

cmd/activity/activity.go

@@ -29,7 +29,6 @@ var (
 	publishedBefore string
 	regionCode      string
 	parts           []string
-	output          string
 )
 
 var activityCmd = &cobra.Command{

cmd/activity/list.go

@@ -87,7 +87,7 @@ func init() {
 		&parts, "parts", "p", []string{"id", "snippet", "contentDetails"},
 		pkg.PartsUsage,
 	)
-	listCmd.Flags().StringVarP(&output, "output", "o", "table", pkg.TableUsage)
+	listCmd.Flags().StringP("output", "o", "table", pkg.TableUsage)
 }
 
 var listCmd = &cobra.Command{
@@ -96,6 +96,7 @@ var listCmd = &cobra.Command{
 	Long:    listLong,
 	Example: listExample,
 	Run: func(cmd *cobra.Command, args []string) {
+		output, _ := cmd.Flags().GetString("output")
 		input := activity.NewActivity(
 			activity.WithChannelId(channelId),
 			activity.WithHome(home),

cmd/caption/caption.go

@@ -46,7 +46,6 @@ var (
 	parts                  []string
 	tfmt                   string
 	tlang                  string
-	output                 string
 )
 
 var captionCmd = &cobra.Command{

cmd/caption/insert.go

@@ -103,7 +103,7 @@ func init() {
 	insertCmd.Flags().StringVarP(
 		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", pkg.OBOCOUsage,
 	)
-	insertCmd.Flags().StringVarP(&output, "output", "o", "", pkg.SilentUsage)
+	insertCmd.Flags().StringP("output", "o", "", pkg.SilentUsage)
 
 	_ = insertCmd.MarkFlagRequired("file")
 	_ = insertCmd.MarkFlagRequired("videoId")
@@ -116,6 +116,7 @@ var insertCmd = &cobra.Command{
 	Long:    insertLong,
 	Example: insertExample,
 	Run: func(c *cobra.Command, args []string) {
+		output, _ := c.Flags().GetString("output")
 		err := cmd.Confirm(c, "Would insert caption")
 		if err != nil {
 			utils.HandleCmdError(err, c)

cmd/caption/list.go

@@ -81,7 +81,7 @@ func init() {
 	listCmd.Flags().StringSliceVarP(
 		&parts, "parts", "p", []string{"id", "snippet"}, pkg.PartsUsage,
 	)
-	listCmd.Flags().StringVarP(&output, "output", "o", "table", pkg.TableUsage)
+	listCmd.Flags().StringP("output", "o", "table", pkg.TableUsage)
 }
 
 var listCmd = &cobra.Command{
@@ -90,6 +90,7 @@ var listCmd = &cobra.Command{
 	Long:    listLong,
 	Example: listExample,
 	Run: func(cmd *cobra.Command, args []string) {
+		output, _ := cmd.Flags().GetString("output")
 		input := caption.NewCaption(
 			caption.WithIds(ids),
 			caption.WithVideoId(videoId),

cmd/caption/update.go

@@ -102,7 +102,7 @@ func init() {
 	updateCmd.Flags().StringVarP(
 		&onBehalfOfContentOwner, "onBehalfOfContentOwner", "B", "", pkg.OBOCOUsage,
 	)
-	updateCmd.Flags().StringVarP(&output, "output", "o", "", pkg.SilentUsage)
+	updateCmd.Flags().StringP("output", "o", "", pkg.SilentUsage)
 
 	_ = updateCmd.MarkFlagRequired("videoId")
 	cmd.AddMutationFlags(updateCmd)
@@ -114,6 +114,7 @@ var updateCmd = &cobra.Command{
 	Long:    updateLong,
 	Example: updateExample,
 	Run: func(c *cobra.Command, args []string) {
+		output, _ := c.Flags().GetString("output")
 		err := cmd.Confirm(c, "Would update caption for video: %s", videoId)
 		if err != nil {
 			utils.HandleCmdError(err, c)

cmd/channel/channel.go

@@ -44,7 +44,6 @@ var (
 	description     string
 	title           string
 	parts           []string
-	output          string
 
 	onBehalfOfContentOwner string
 )

cmd/channel/list.go

@@ -111,7 +111,7 @@ func init() {
 	listCmd.Flags().StringSliceVarP(
 		&parts, "parts", "p", []string{"id", "snippet", "status"}, pkg.PartsUsage,
 	)
-	listCmd.Flags().StringVarP(&output, "output", "o", "table", pkg.TableUsage)
+	listCmd.Flags().StringP("output", "o", "table", pkg.TableUsage)
 }
 
 var listCmd = &cobra.Command{
@@ -120,6 +120,7 @@ var listCmd = &cobra.Command{
 	Long:    listLong,
 	Example: listExample,
 	Run: func(cmd *cobra.Command, args []string) {
+		output, _ := cmd.Flags().GetString("output")
 		input := channel.NewChannel(
 			channel.WithCategoryId(categoryId),
 			channel.WithForHandle(forHandle),

cmd/channel/update.go

@@ -79,7 +79,7 @@ func init() {
 		&description, "description", "d", "", descUsage,
 	)
 	updateCmd.Flags().StringVarP(&title, "title", "t", "", titleUsage)
-	updateCmd.Flags().StringVarP(&output, "output", "o", "", pkg.SilentUsage)
+	updateCmd.Flags().StringP("output", "o", "", pkg.SilentUsage)
 
 	_ = updateCmd.MarkFlagRequired("id")
 	cmd.AddMutationFlags(updateCmd)
@@ -91,6 +91,7 @@ var updateCmd = &cobra.Command{
 	Long:    updateLong,
 	Example: updateExample,
 	Run: func(c *cobra.Command, args []string) {
+		output, _ := c.Flags().GetString("output")
 		err := cmd.Confirm(c, "Would update channel: %s", strings.Join(ids, ", "))
 		if err != nil {
 			utils.HandleCmdError(err, c)

cmd/channelBanner/channelBanner.go

@@ -18,7 +18,6 @@ const (
 var (
 	channelId string
 	file      string
-	output    string
 
 	onBehalfOfContentOwner        string
 	onBehalfOfContentOwnerChannel string