feat: flag global --no-color https://no-color.org/

aziontech · Jun 3, 2024 · caa7568 · caa7568
1 parent 97a2c36
commit caa7568
Show file tree

Hide file tree

Showing 49 changed files with 153 additions and 170 deletions.
diff --git a/messages/root/messages.go b/messages/root/messages.go
@@ -9,6 +9,7 @@ var (
 	RootLogLevel    = "Set the logging level, \"debug\", \"info\", or \"error\"."
 	RootFlagOut     = "Exports the output to the given <file_path/file_name.ext>"
 	RootFlagFormat  = "Changes the output format passing the json value to the flag"
+	RootFlagNoColor = "Disables colored output, ensuring plain text format."
 	RootLogSilent   = "Silences log completely; mostly used for automation purposes"
 	RootTokenFlag   = "Saves a given Personal Token locally to authorize CLI commands"
 	RootConfigFlag  = "Sets the Azion configuration folder for the current command only, without changing persistent settings."

diff --git a/pkg/cmd/create/cache_setting/cache_setting.go b/pkg/cmd/create/cache_setting/cache_setting.go
@@ -113,8 +113,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			creatOut := output.GeneralOutput{
-				Msg: fmt.Sprintf(msg.CreateOutputSuccess, response.GetId()),
-				Out: f.IOStreams.Out,
+				Msg:   fmt.Sprintf(msg.CreateOutputSuccess, response.GetId()),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&creatOut)
 		},

diff --git a/pkg/cmd/create/domain/domain.go b/pkg/cmd/create/domain/domain.go
@@ -112,10 +112,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			createOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.OutputSuccess, response.GetId()),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.OutputSuccess, response.GetId()),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&createOut)
 		},

diff --git a/pkg/cmd/create/edge_applications/edge_application.go b/pkg/cmd/create/edge_applications/edge_application.go
@@ -93,10 +93,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			creatOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.OutputSuccess, response.GetId()),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.OutputSuccess, response.GetId()),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&creatOut)
 		},

diff --git a/pkg/cmd/delete/cache_setting/cache_setting.go b/pkg/cmd/delete/cache_setting/cache_setting.go
@@ -73,10 +73,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.DeleteOutputSuccess, cacheSettingsID),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.DeleteOutputSuccess, cacheSettingsID),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 

diff --git a/pkg/cmd/delete/domain/domain.go b/pkg/cmd/delete/domain/domain.go
@@ -55,10 +55,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.OutputSuccess, domainID),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.OutputSuccess, domainID),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 		},

diff --git a/pkg/cmd/delete/edge_application/edge_application.go b/pkg/cmd/delete/edge_application/edge_application.go
@@ -110,10 +110,9 @@ func (del *DeleteCmd) run(cmd *cobra.Command, application_id int64) error {
 	}
 
 	deleteOut := output.GeneralOutput{
-		Msg:         fmt.Sprintf(msg.OutputSuccess, application_id),
-		Out:         del.f.IOStreams.Out,
-		FlagOutPath: del.f.Out,
-		FlagFormat:  del.f.Format,
+		Msg:   fmt.Sprintf(msg.OutputSuccess, application_id),
+		Out:   del.f.IOStreams.Out,
+		Flags: del.f.Flags,
 	}
 	return output.Print(&deleteOut)
 }

diff --git a/pkg/cmd/delete/edge_function/edge_function.go b/pkg/cmd/delete/edge_function/edge_function.go
@@ -53,10 +53,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.DeleteOutputSuccess, function_id),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.DeleteOutputSuccess, function_id),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 		},

diff --git a/pkg/cmd/delete/edge_storage/bucket.go b/pkg/cmd/delete/edge_storage/bucket.go
@@ -74,10 +74,9 @@ func (b *bucket) runE(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf(msg.ERROR_DELETE_BUCKET, err.Error())
 	}
 	deleteOut := output.GeneralOutput{
-		Msg:         fmt.Sprintf(msg.OUTPUT_DELETE_BUCKET, b.name),
-		Out:         b.factory.IOStreams.Out,
-		FlagOutPath: b.factory.Out,
-		FlagFormat:  b.factory.Format,
+		Msg:   fmt.Sprintf(msg.OUTPUT_DELETE_BUCKET, b.name),
+		Out:   b.factory.IOStreams.Out,
+		Flags: b.factory.Flags,
 	}
 	return output.Print(&deleteOut)
 }

diff --git a/pkg/cmd/delete/edge_storage/object.go b/pkg/cmd/delete/edge_storage/object.go
@@ -57,10 +57,9 @@ func (b *object) runE(cmd *cobra.Command, _ []string) error {
 	}
 
 	deleteOut := output.GeneralOutput{
-		Msg:         fmt.Sprintf(msg.OUTPUT_DELETE_OBJECT, b.objectKey),
-		Out:         b.factory.IOStreams.Out,
-		FlagOutPath: b.factory.Out,
-		FlagFormat:  b.factory.Format,
+		Msg:   fmt.Sprintf(msg.OUTPUT_DELETE_OBJECT, b.objectKey),
+		Out:   b.factory.IOStreams.Out,
+		Flags: b.factory.Flags,
 	}
 	return output.Print(&deleteOut)
 

diff --git a/pkg/cmd/delete/origin/origin.go b/pkg/cmd/delete/origin/origin.go
@@ -60,10 +60,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.DeleteOutputSuccess, originKey),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.DeleteOutputSuccess, originKey),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 		},

diff --git a/pkg/cmd/delete/personal_token/personal_token.go b/pkg/cmd/delete/personal_token/personal_token.go
@@ -48,10 +48,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.OutputSuccess, id),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.OutputSuccess, id),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 

diff --git a/pkg/cmd/delete/rules_engine/rules_engine.go b/pkg/cmd/delete/rules_engine/rules_engine.go
@@ -83,10 +83,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.DeleteOutputSuccess, rule_id),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.DeleteOutputSuccess, rule_id),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 

diff --git a/pkg/cmd/delete/variables/variables.go b/pkg/cmd/delete/variables/variables.go
@@ -49,10 +49,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			deleteOut := output.GeneralOutput{
-				Msg:         fmt.Sprintf(msg.DeleteOutputSuccess, variableID),
-				Out:         f.IOStreams.Out,
-				FlagOutPath: f.Out,
-				FlagFormat:  f.Format,
+				Msg:   fmt.Sprintf(msg.DeleteOutputSuccess, variableID),
+				Out:   f.IOStreams.Out,
+				Flags: f.Flags,
 			}
 			return output.Print(&deleteOut)
 

diff --git a/pkg/cmd/describe/cache_setting/cache_setting.go b/pkg/cmd/describe/cache_setting/cache_setting.go
@@ -96,10 +96,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Out:         f.IOStreams.Out,
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
+					Out:   f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
 				},
 				Fields: fields,
 				Values: resp,

diff --git a/pkg/cmd/describe/domains/domains.go b/pkg/cmd/describe/domains/domains.go
@@ -58,10 +58,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
-					Out:         f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
+					Out:   f.IOStreams.Out,
 				},
 				Fields: fields,
 				Values: domain,

diff --git a/pkg/cmd/describe/edge_applications/edge_applications.go b/pkg/cmd/describe/edge_applications/edge_applications.go
@@ -70,10 +70,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Out:         f.IOStreams.Out,
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
+					Out:   f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
 				},
 				Fields: fields,
 				Values: resp,

diff --git a/pkg/cmd/describe/edge_function/edge_function.go b/pkg/cmd/describe/edge_function/edge_function.go
@@ -71,10 +71,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
-					Out:         f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
+					Out:   f.IOStreams.Out,
 				},
 				Fields: fields,
 				Values: resp,

diff --git a/pkg/cmd/describe/edge_storage/object.go b/pkg/cmd/describe/edge_storage/object.go
@@ -61,10 +61,9 @@ func (f *Fields) RunE(cmd *cobra.Command, args []string) error {
 	}
 
 	describeOut := output.GeneralOutput{
-		Msg:         string(bFile),
-		Out:         f.Factory.IOStreams.Out,
-		FlagOutPath: f.Factory.Out,
-		FlagFormat:  f.Factory.Format,
+		Msg:   string(bFile),
+		Out:   f.Factory.IOStreams.Out,
+		Flags: f.Factory.Flags,
 	}
 	return output.Print(&describeOut)
 }

diff --git a/pkg/cmd/describe/origin/origin.go b/pkg/cmd/describe/origin/origin.go
@@ -92,10 +92,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
-					Out:         f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
+					Out:   f.IOStreams.Out,
 				},
 				Fields: fields,
 				Values: origin,

diff --git a/pkg/cmd/describe/rules_engine/rules_engine.go b/pkg/cmd/describe/rules_engine/rules_engine.go
@@ -100,10 +100,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
-					Out:         f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Flags: f.Flags,
+					Out:   f.IOStreams.Out,
 				},
 				Fields: fields,
 				Values: rules,

diff --git a/pkg/cmd/describe/variables/variables.go b/pkg/cmd/describe/variables/variables.go
@@ -63,10 +63,9 @@ func NewCmd(f *cmdutil.Factory) *cobra.Command {
 
 			describeOut := output.DescribeOutput{
 				GeneralOutput: output.GeneralOutput{
-					Msg:         filepath.Clean(opts.OutPath),
-					FlagOutPath: f.Out,
-					FlagFormat:  f.Format,
-					Out:         f.IOStreams.Out,
+					Msg:   filepath.Clean(opts.OutPath),
+					Out:   f.IOStreams.Out,
+					Flags: f.Flags,
 				},
 				Fields: fields,
 				Values: variable,

diff --git a/pkg/cmd/list/cache_setting/cache_setting.go b/pkg/cmd/list/cache_setting/cache_setting.go
@@ -72,11 +72,9 @@ func PrintTable(cmd *cobra.Command, f *cmdutil.Factory, opts *contracts.ListOpti
 	}
 
 	listOut := output.ListOutput{}
-
 	listOut.Columns = []string{"ID", "NAME", "BROWSER CACHE SETTINGS"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if cmd.Flags().Changed("details") {
 		listOut.Columns = []string{"ID", "NAME", "BROWSER CACHE SETTINGS", "CDN CACHE SETTINGS", "CACHE BY COOKIES", "ENABLE CACHING FOR POST"}

diff --git a/pkg/cmd/list/domain/domain.go b/pkg/cmd/list/domain/domain.go
@@ -50,8 +50,7 @@ func PrintTable(cmd *cobra.Command, f *cmdutil.Factory, opts *contracts.ListOpti
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ID", "NAME"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if opts.Details {
 		listOut.Columns = []string{"ID", "NAME", "EDGE DOMAIN", "DIGITAL CERTIFICATE ID", "EDGE APPLICATION ID", "CNAME ACCESS ONLY", "CNAMES", "ACTIVE"}

diff --git a/pkg/cmd/list/edge_applications/edge_applications.go b/pkg/cmd/list/edge_applications/edge_applications.go
@@ -59,8 +59,7 @@ func PrintTable(cmd *cobra.Command, client *api.Client, f *cmdutil.Factory, opts
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ID", "NAME", "ACTIVE"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if opts.Details {
 		listOut.Columns = []string{"ID", "NAME", "ACTIVE", "LAST EDITOR", "LAST MODIFIED", "DEBUG RULES"}

diff --git a/pkg/cmd/list/edge_function/edge_function.go b/pkg/cmd/list/edge_function/edge_function.go
@@ -55,8 +55,7 @@ func PrintTable(cmd *cobra.Command, f *cmdutil.Factory, opts *contracts.ListOpti
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ID", "NAME", "LANGUAGE", "ACTIVE"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if opts.Details {
 		listOut.Columns = []string{"ID", "NAME", "LANGUAGE", "ACTIVE", "LAST EDITOR", "MODIFIED", "REFERENCE COUNT", "INITIATOR_TYPE"}

diff --git a/pkg/cmd/list/edge_storage/bucket.go b/pkg/cmd/list/edge_storage/bucket.go
@@ -54,8 +54,7 @@ func (b *Bucket) PrintTable(client *api.Client) error {
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"NAME", "EDGE ACCESS"}
 	listOut.Out = b.Factory.IOStreams.Out
-	listOut.FlagOutPath = b.Factory.Out
-	listOut.FlagFormat = b.Factory.Format
+	listOut.Flags = b.Factory.Flags
 
 	for _, v := range resp.Results {
 		ln := []string{

diff --git a/pkg/cmd/list/edge_storage/object.go b/pkg/cmd/list/edge_storage/object.go
@@ -78,8 +78,7 @@ func (b *Objects) PrintTable(client *api.Client) error {
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"KEY", "LAST MODIFIED"}
 	listOut.Out = b.Factory.IOStreams.Out
-	listOut.FlagOutPath = b.Factory.Out
-	listOut.FlagFormat = b.Factory.Format
+	listOut.Flags = b.Factory.Flags
 
 	if b.Options.Details {
 		listOut.Columns = []string{"KEY", "LAST MODIFIED", "SIZE", "ETAG"}

diff --git a/pkg/cmd/list/origin/origin.go b/pkg/cmd/list/origin/origin.go
@@ -75,8 +75,7 @@ func PrintTable(client *api.Client, f *cmdutil.Factory, opts *contracts.ListOpti
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ORIGIN KEY", "NAME"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if opts.Details {
 		listOut.Columns = []string{"ORIGIN KEY", "NAME", "ID", "ORIGIN TYPE", "ORIGIN PATH", "ADDRESSES", "CONNECTION TIMEOUT"}

diff --git a/pkg/cmd/list/personal_token/personal_token.go b/pkg/cmd/list/personal_token/personal_token.go
@@ -57,8 +57,7 @@ func PrintTable(client *api.Client, f *cmdutil.Factory, details bool) error {
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ID", "NAME", "EXPIRES AT"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if details {
 		listOut.Columns = []string{"ID", "NAME", "EXPIRES AT", "CREATED AT", "DESCRIPTION"}

diff --git a/pkg/cmd/list/rule_engine/rule_engine.go b/pkg/cmd/list/rule_engine/rule_engine.go
@@ -86,8 +86,7 @@ func PrintTable(cmd *cobra.Command, f *cmdutil.Factory, opts *contracts.ListOpti
 	listOut := output.ListOutput{}
 	listOut.Columns = []string{"ID", "NAME"}
 	listOut.Out = f.IOStreams.Out
-	listOut.FlagOutPath = f.Out
-	listOut.FlagFormat = f.Format
+	listOut.Flags = f.Flags
 
 	if cmd.Flags().Changed("details") {
 		listOut.Columns = []string{"ID", "NAME", "ORDER", "PHASE", "ACTIVE"}