Align highlight and hyperlink colours with design pattern guide (#4847)

Use ANSI-defined **Bright Blue** and **Bright Cyan** for highlighted content and hyperlinks respectively, after taking into consideration what looks both visually distinct and legible across popular terminal environments and themes.

Author: JeffreyCA

cli/azd/cmd/init.go

@@ -221,7 +221,7 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		tracing.SetUsageAttributes(fields.InitMethod.String("app"))
 
 		header = "Your app is ready for the cloud!"
-		followUp = "You can provision and deploy your app to Azure by running the " + color.BlueString("azd up") +
+		followUp = "You can provision and deploy your app to Azure by running the " + output.WithHighLightFormat("azd up") +
 			" command in this directory. For more information on configuring your app, see " +
 			output.WithHighLightFormat("./next-steps.md")
 		entries, err := os.ReadDir(azdCtx.ProjectDirectory())
@@ -234,7 +234,7 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 				Err: errors.New("no files found in the current directory"),
 				Suggestion: "Ensure you're in the directory where your app code is located and try again." +
 					" If you do not have code and would like to start with an app template, run '" +
-					color.BlueString("azd init") + "' and select the option to " +
+					output.WithHighLightFormat("azd init") + "' and select the option to " +
 					color.MagentaString("Use a template") + ".",
 			}
 		}
@@ -300,7 +300,7 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 				return nil, fmt.Errorf("saving project config: %w", err)
 			}
 
-			followUp = "Run " + color.BlueString("azd add") + " to add new Azure components to your project."
+			followUp = "Run " + output.WithHighLightFormat("azd add") + " to add new Azure components to your project."
 		}
 
 		header = "Generated azure.yaml project file."

cli/azd/internal/cmd/add/add.go

@@ -29,7 +29,6 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/workflow"
 	"github.com/azure/azure-dev/cli/azd/pkg/yamlnode"
 	"github.com/braydonk/yaml"
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )
 
@@ -165,8 +164,8 @@ func (a *AddAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 			resourcesToAdd = append(resourcesToAdd, dep)
 			requiredByMessages = append(requiredByMessages,
 				fmt.Sprintf("(%s is required by %s)",
-					color.BlueString(dep.Name),
-					color.BlueString(resourceToAdd.Name)))
+					output.WithHighLightFormat(dep.Name),
+					output.WithHighLightFormat(resourceToAdd.Name)))
 		}
 	}
 
@@ -203,7 +202,7 @@ func (a *AddAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		return nil, fmt.Errorf("re-parsing yaml: %w", err)
 	}
 
-	a.console.Message(ctx, fmt.Sprintf("\nPreviewing changes to %s:\n", color.BlueString("azure.yaml")))
+	a.console.Message(ctx, fmt.Sprintf("\nPreviewing changes to %s:\n", output.WithHighLightFormat("azure.yaml")))
 	diffString, diffErr := DiffBlocks(prjConfig.Resources, newCfg.Resources)
 	if diffErr != nil {
 		a.console.Message(ctx, "Preview unavailable. Pass --debug for more details.\n")
@@ -273,14 +272,14 @@ func (a *AddAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 	})
 	keyVaultFollowUpMessage := fmt.Sprintf(
 		"\nRun '%s' to add a secret to the key vault.",
-		color.BlueString("azd env set-secret <name>"))
+		output.WithHighLightFormat("azd env set-secret <name>"))
 
 	if _, err := pathHasInfraModule(infraRoot, prjConfig.Infra.Module); err == nil {
 		followUpMessage = fmt.Sprintf(
 			"Run '%s' to re-synthesize the infrastructure, "+
 				"then run '%s' to provision these changes anytime later.",
-			color.BlueString("azd infra synth"),
-			color.BlueString("azd provision"))
+			output.WithHighLightFormat("azd infra synth"),
+			output.WithHighLightFormat("azd provision"))
 		if addedKeyVault {
 			followUpMessage += keyVaultFollowUpMessage
 		}
@@ -339,12 +338,12 @@ func (a *AddAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		}
 
 		followUpMessage = "Run '" +
-			color.BlueString(fmt.Sprintf("azd show %s", resourceToAdd.Name)) +
+			output.WithHighLightFormat("azd show %s", resourceToAdd.Name) +
 			"' to show details about the newly provisioned resource."
 	} else {
 		followUpMessage = fmt.Sprintf(
 			"Run '%s' to %s these changes anytime later.",
-			color.BlueString("azd %s", followUpCmd),
+			output.WithHighLightFormat("azd %s", followUpCmd),
 			verb)
 	}
 

cli/azd/internal/cmd/add/add_configure.go

@@ -14,7 +14,6 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/input"
 	"github.com/azure/azure-dev/cli/azd/pkg/output"
 	"github.com/azure/azure-dev/cli/azd/pkg/project"
-	"github.com/fatih/color"
 )
 
 // DbMap is a map of supported database dependencies.
@@ -192,7 +191,7 @@ func fillUses(
 			labels = formatted
 		}
 		uses, err := console.MultiSelect(ctx, input.ConsoleOptions{
-			Message: fmt.Sprintf("Select the resources that %s uses", color.BlueString(r.Name)),
+			Message: fmt.Sprintf("Select the resources that %s uses", output.WithHighLightFormat(r.Name)),
 			Options: labels,
 		})
 		if err != nil {

cli/azd/internal/cmd/add/add_preview.go

@@ -124,7 +124,7 @@ func (a *AddAction) previewProvision(
 	}
 
 	a.console.Message(ctx, fmt.Sprintf("\n%s\n", output.WithBold("Previewing Azure resource changes")))
-	a.console.Message(ctx, "Environment: "+color.BlueString(a.env.Name()))
+	a.console.Message(ctx, "Environment: "+output.WithHighLightFormat(a.env.Name()))
 
 	if environmentDetails.Subscription != "" {
 		a.console.MessageUxItem(ctx, &environmentDetails)

cli/azd/internal/cmd/show/show.go

@@ -424,7 +424,8 @@ func showModelDeployment(
 	if account.Properties.Endpoint != nil {
 		console.Message(ctx, color.HiMagentaString("%s (Azure AI Services Model Deployment)", id.Name))
 		console.Message(ctx, "  Endpoint:")
-		console.Message(ctx, color.HiBlueString(fmt.Sprintf("    AZURE_OPENAI_ENDPOINT=%s", *account.Properties.Endpoint)))
+		console.Message(ctx,
+			output.WithHighLightFormat(fmt.Sprintf("    AZURE_OPENAI_ENDPOINT=%s", *account.Properties.Endpoint)))
 		console.Message(ctx, "  Access:")
 		console.Message(ctx, "    Keyless (Microsoft Entra ID)")
 		//nolint:lll

cli/azd/internal/repository/detect_confirm.go

@@ -198,7 +198,7 @@ func (d *detectConfirm) render(ctx context.Context) error {
 			status = " " + output.WithSuccessFormat("[Added]")
 		}
 
-		d.console.Message(ctx, "  "+color.BlueString(projectDisplayName(svc))+status)
+		d.console.Message(ctx, "  "+output.WithHighLightFormat(projectDisplayName(svc))+status)
 		d.console.Message(ctx, "  "+"Detected in: "+output.WithHighLightFormat(relSafe(d.root, svc.Path)))
 		d.console.Message(ctx, "")
 
@@ -224,7 +224,7 @@ func (d *detectConfirm) render(ctx context.Context) error {
 			status = " " + output.WithSuccessFormat("[Added]")
 		}
 
-		d.console.Message(ctx, "  "+color.BlueString(db.Display())+status)
+		d.console.Message(ctx, "  "+output.WithHighLightFormat(db.Display())+status)
 		d.console.Message(ctx, "")
 	}
 

cli/azd/internal/repository/detect_confirm_apphost.go

@@ -79,7 +79,7 @@ func (d *detectConfirmAppHost) Confirm(ctx context.Context) error {
 func (d *detectConfirmAppHost) render(ctx context.Context) error {
 	d.console.Message(ctx, "\n"+output.WithBold("Detected services:")+"\n")
 
-	d.console.Message(ctx, "  "+color.BlueString(projectDisplayName(d.AppHost)))
+	d.console.Message(ctx, "  "+output.WithHighLightFormat(projectDisplayName(d.AppHost)))
 	d.console.Message(ctx, "  "+"Detected in: "+output.WithHighLightFormat(relSafe(d.root, d.AppHost.Path)))
 	d.console.Message(ctx, "")
 	d.console.Message(

cli/azd/pkg/input/asker.go

@@ -115,9 +115,9 @@ func askOnePrompt(p survey.Prompt, response interface{}, isTerminal bool, stdout
 		}
 
 		opts = append(opts, survey.WithIcons(func(icons *survey.IconSet) {
-			// use bold blue question mark for all questions
-			icons.Question.Format = "blue+b"
-			icons.SelectFocus.Format = "blue+b"
+			// use bright, bold, blue question mark for all questions
+			icons.Question.Format = "blue+hb"
+			icons.SelectFocus.Format = "blue+hb"
 
 			icons.Help.Format = "black+h"
 			icons.Help.Text = "Hint:"
@@ -247,18 +247,18 @@ func askOnePrompt(p survey.Prompt, response interface{}, isTerminal bool, stdout
 }
 
 func init() {
-	// blue for everything
+	// bright blue for everything
 
 	// Customize the input question template:
-	//   - Use blue instead of cyan for answers: {{- color "blue"}}{{.Answer}}
+	//   - Use bright blue instead of cyan for answers: {{- color "blue+h"}}{{.Answer}}
 	//   - Use gray instead of cyan for default value: {{color "black+h"}}({{.Default}})
 	//nolint:lll
 	survey.InputQuestionTemplate = `
 	{{- if .ShowHelp }}{{- color .Config.Icons.Help.Format }}{{ .Config.Icons.Help.Text }} {{ .Help }}{{color "reset"}}{{"\n"}}{{end}}
 	{{- color .Config.Icons.Question.Format }}{{ .Config.Icons.Question.Text }} {{color "reset"}}
 	{{- color "default+hb"}}{{ .Message }} {{color "reset"}}
 	{{- if .ShowAnswer}}
-	  {{- color "blue"}}{{.Answer}}{{color "reset"}}{{"\n"}}
+	  {{- color "blue+h"}}{{.Answer}}{{color "reset"}}{{"\n"}}
 	{{- else if .PageEntries -}}
 	  {{- .Answer}} [Use arrows to move, enter to select, type to continue]
 	  {{- "\n"}}
@@ -268,10 +268,20 @@ func init() {
 		{{- color "reset"}}{{"\n"}}
 	  {{- end}}
 	{{- else }}
-	  {{- if or (and .Help (not .ShowHelp)) .Suggest }}{{color "cyan"}}[
+	  {{- if or (and .Help (not .ShowHelp)) .Suggest }}{{color "blue+h"}}[
 		{{- if and .Help (not .ShowHelp)}}{{ print .Config.HelpInput }} for help {{- if and .Suggest}}, {{end}}{{end -}}
-		{{- if and .Suggest }}{{color "cyan"}}{{ print .Config.SuggestInput }} for suggestions{{end -}}
+		{{- if and .Suggest }}{{color "blue+h"}}{{ print .Config.SuggestInput }} for suggestions{{end -}}
 	  ]{{color "reset"}} {{end}}
 	  {{- if .Default}}{{color "black+h"}}({{.Default}}) {{color "reset"}}{{end}}
 	{{- end}}`
+
+	// Replace cyan with blue in other other templates
+	otherTemplates := []*string{
+		&survey.ConfirmQuestionTemplate,
+		&survey.SelectQuestionTemplate,
+		&survey.MultiSelectQuestionTemplate,
+	}
+	for _, template := range otherTemplates {
+		*template = strings.ReplaceAll(*template, `"cyan"`, `"blue+h"`)
+	}
 }

cli/azd/pkg/output/colors.go

@@ -16,7 +16,7 @@ func WithLinkFormat(link string, a ...interface{}) string {
 
 // withHighLightFormat creates string with highlight-looking color
 func WithHighLightFormat(text string, a ...interface{}) string {
-	return color.CyanString(text, a...)
+	return color.HiBlueString(text, a...)
 }
 
 func WithErrorFormat(text string, a ...interface{}) string {

cli/azd/pkg/output/ux/environment_details.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 
 	"github.com/azure/azure-dev/cli/azd/pkg/output"
-	"github.com/fatih/color"
 )
 
 type EnvironmentDetails struct {
@@ -19,11 +18,11 @@ type EnvironmentDetails struct {
 func (t *EnvironmentDetails) ToString(currentIndentation string) string {
 	var location string
 	if t.Location != "" {
-		location = fmt.Sprintf("\nLocation: %s", color.BlueString(t.Location))
+		location = fmt.Sprintf("\nLocation: %s", output.WithHighLightFormat(t.Location))
 	}
 	return fmt.Sprintf(
 		"Subscription: %s%s\n",
-		color.BlueString(t.Subscription),
+		output.WithHighLightFormat(t.Subscription),
 		location,
 	)
 }

cli/azd/pkg/output/ux/show.go

@@ -23,7 +23,7 @@ func (s *ShowService) ToString(currentIndentation string) string {
 		"%s\n"+
 			"  Endpoint: %s\n"+
 			"  Environment variables:\n"+
-			color.HiBlueString(formatEnv("    ", s.Env)),
+			output.WithHighLightFormat(formatEnv("    ", s.Env)),
 		color.HiMagentaString("%s (Container App)", s.Name),
 		output.WithLinkFormat(s.IngresUrl))
 }
@@ -71,7 +71,7 @@ func (s *Show) ToString(currentIndentation string) string {
 		"%s%s%s%s%s%s%s%s%s    %s\n",
 		pickHeader,
 		"To view a different environment, run ",
-		color.HiBlueString("%s\n\n", "azd show -e <environment name>"),
+		output.WithHighLightFormat("%s\n\n", "azd show -e <environment name>"),
 		color.HiMagentaString(s.AppName),
 		"\n  Services:\n",
 		services(s.Services),
@@ -86,8 +86,8 @@ func azurePortalLink(link string) string {
 	if link == "" {
 		return fmt.Sprintf(
 			"Application is not yet provisioned. Run %s or %s first.",
-			color.HiBlueString("azd provision"),
-			color.HiBlueString("azd up"),
+			output.WithHighLightFormat("azd provision"),
+			output.WithHighLightFormat("azd up"),
 		)
 	}
 	return output.WithLinkFormat(link)
@@ -98,14 +98,14 @@ func services(services []*ShowService) string {
 	if servicesCount == 0 {
 		return fmt.Sprintf(
 			"    You don't have services defined. Add your services to %s.",
-			color.HiBlueString("azure.yaml"),
+			output.WithHighLightFormat("azure.yaml"),
 		)
 	}
 	lines := make([]string, servicesCount)
 	for index, service := range services {
 		lines[index] = fmt.Sprintf(
 			"    %s  %s",
-			color.HiBlueString(service.Name),
+			output.WithHighLightFormat(service.Name),
 			output.WithLinkFormat(service.IngresUrl),
 		)
 	}
@@ -117,7 +117,7 @@ func environments(environments []*ShowEnvironment) string {
 	if environmentsCount == 0 {
 		return fmt.Sprintf(
 			"    You haven't created any environments. Run %s to create one.",
-			color.HiBlueString("azd env new"),
+			output.WithHighLightFormat("azd env new"),
 		)
 	}
 
@@ -133,7 +133,7 @@ func environments(environments []*ShowEnvironment) string {
 		}
 		lines[index] = fmt.Sprintf(
 			"    %s%s%s",
-			color.HiBlueString(environment.Name),
+			output.WithHighLightFormat(environment.Name),
 			defaultEnv,
 			output.WithGrayFormat(isRemote),
 		)