From 803810ae0d5f7d2e7d1c39f73f401699e66855de Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Tue, 29 Oct 2024 17:02:36 +0000 Subject: [PATCH] fix gomod --- go.mod | 2 +- tool/tctl/common/plugin/entraid.go | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b75dec86e94a7..a519a2efb5d59 100644 --- a/go.mod +++ b/go.mod @@ -91,6 +91,7 @@ require ( github.com/elimity-com/scim v0.0.0-20240320110924-172bf2aee9c8 github.com/envoyproxy/go-control-plane v0.13.0 github.com/evanphx/json-patch v5.9.0+incompatible + github.com/fatih/color v1.17.0 github.com/fsnotify/fsnotify v1.7.0 github.com/fsouza/fake-gcs-server v1.49.3 github.com/fxamacker/cbor/v2 v2.7.0 @@ -323,7 +324,6 @@ require ( github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/camelcase v1.0.0 // indirect - github.com/fatih/color v1.17.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect diff --git a/tool/tctl/common/plugin/entraid.go b/tool/tctl/common/plugin/entraid.go index 7654193e52021..ea5010504ca9f 100644 --- a/tool/tctl/common/plugin/entraid.go +++ b/tool/tctl/common/plugin/entraid.go @@ -47,7 +47,7 @@ var ( bold = color.New(color.Bold).SprintFunc() boldRed = color.New(color.Bold, color.FgRed).SprintFunc() - step1Template = `Step 1: Run the Setup Script + step1Template = bold("Step 1: Run the Setup Script") + ` 1. Open ` + bold("Azure Cloud Shell") + ` (Bash) [https://portal.azure.com/#cloudshell/] using ` + bold("Google Chrome") + ` or ` + bold("Safari") + ` for the best compatibility. 2. Upload the setup script in ` + boldRed("%s") + ` using the ` + bold("Upload") + ` button in the Cloud Shell toolbar. @@ -60,11 +60,13 @@ var ( - During the script execution, you'll be prompted to run 'az login' to authenticate with Azure. ` + bold("Teleport") + ` does not store or persist your credentials. - ` + bold("Mozilla Firefox") + ` users may experience connectivity issues in Azure Cloud Shell; using Chrome or Safari is recommended. +To rerun the script, type 'exit' to close and then restart the process. + ` step2Template = ` -Step 2: Input Tenant ID and Client ID +` + bold("Step 2: Input Tenant ID and Client ID") + ` With the output of Step 1, please copy and paste the following information: ` @@ -151,7 +153,7 @@ func (p *PluginsCommand) entraSetupGuide(proxyPublicAddr string) (entraSettings, fmt.Fprintf(os.Stdout, step1Template, fileLoc, filepath.Base(fileLoc)) op, err := readData(os.Stdin, os.Stdout, - "Once the script completes, type 'continue' to proceed, 'exit' to quit. If you need to rerun the script, type 'exit' and restart the process.", + `Once the script completes, type 'continue' to proceed, 'exit' to quit`, func(input string) bool { return input == "continue" || input == "exit" }, "Invalid input. Please enter 'continue' or 'exit'.")