From 1559c7803458f1fcf0ad5f818cba4af0503067ae Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Mon, 15 Jul 2024 09:48:24 +0530 Subject: [PATCH 01/21] Added use case to ensure if domain if passed in cli, it's populated to device login flow Signed-off-by: Rajat Bajaj --- internal/auth/auth.go | 4 ++-- internal/cli/cli.go | 4 ++-- internal/cli/login.go | 44 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 2122e78b1..5e354133d 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -144,13 +144,13 @@ var RequiredScopes = []string{ // GetDeviceCode kicks-off the device authentication flow by requesting // a device code from Auth0. The returned state contains the // URI for the next step of the flow. -func GetDeviceCode(ctx context.Context, httpClient *http.Client, additionalScopes []string) (State, error) { +func GetDeviceCode(ctx context.Context, httpClient *http.Client, additionalScopes []string, domain string) (State, error) { a := credentials data := url.Values{ "client_id": []string{a.ClientID}, "scope": []string{strings.Join(append(RequiredScopes, additionalScopes...), " ")}, - "audience": []string{a.Audience}, + "audience": []string{domain}, } request, err := http.NewRequestWithContext( diff --git a/internal/cli/cli.go b/internal/cli/cli.go index b374a4555..7a226181c 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -73,7 +73,7 @@ func (c *cli) setupWithAuthentication(ctx context.Context) error { switch err { case config.ErrTokenMissingRequiredScopes: c.renderer.Warnf("Required scopes have changed. Please log in to re-authorize the CLI.\n") - tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes()) + tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes(), "") if err != nil { return err } @@ -95,7 +95,7 @@ func (c *cli) setupWithAuthentication(ctx context.Context) error { c.renderer.Warnf("Failed to renew access token: %s", err) c.renderer.Warnf("Please log in to re-authorize the CLI.\n") - tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes()) + tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes(), "") if err != nil { return err } diff --git a/internal/cli/login.go b/internal/cli/login.go index 527371e69..a9fb9aff8 100644 --- a/internal/cli/login.go +++ b/internal/cli/login.go @@ -58,7 +58,11 @@ type LoginInputs struct { } func (i *LoginInputs) isLoggingInAsAMachine() bool { - return i.ClientID != "" || i.ClientSecret != "" || i.Domain != "" + return i.ClientID != "" || i.ClientSecret != "" +} + +func (i *LoginInputs) isLoggingInAsAUser() bool { + return i.ClientID == "" && i.ClientSecret == "" && i.Domain != "" } func (i *LoginInputs) isLoggingInWithAdditionalScopes() bool { @@ -86,7 +90,7 @@ func loginCmd(cli *cli) *cobra.Command { // We want to prompt if we don't pass the following flags: // --no-input, --scopes, --client-id, --client-secret, --domain. // Because then the prompt is unnecessary as we know the login type. - shouldPrompt := !inputs.isLoggingInAsAMachine() && !cli.noInput && !inputs.isLoggingInWithAdditionalScopes() + shouldPrompt := !inputs.isLoggingInAsAMachine() && !cli.noInput && !inputs.isLoggingInWithAdditionalScopes() && !inputs.isLoggingInAsAUser() if shouldPrompt { cli.renderer.Output( fmt.Sprintf( @@ -116,9 +120,9 @@ func loginCmd(cli *cli) *cobra.Command { ctx := cmd.Context() // Allows to skip to user login if either the --no-input or --scopes flag is passed. - shouldLoginAsUser := (cli.noInput && !inputs.isLoggingInAsAMachine()) || inputs.isLoggingInWithAdditionalScopes() || selectedLoginType == loginAsUser + shouldLoginAsUser := (cli.noInput && !inputs.isLoggingInAsAMachine()) || inputs.isLoggingInWithAdditionalScopes() || inputs.isLoggingInAsAUser() || selectedLoginType == loginAsUser if shouldLoginAsUser { - if _, err := RunLoginAsUser(ctx, cli, inputs.AdditionalScopes); err != nil { + if _, err := RunLoginAsUser(ctx, cli, inputs.AdditionalScopes, inputs.Domain); err != nil { return fmt.Errorf("failed to start the authentication process: %w", err) } } else { @@ -143,7 +147,7 @@ func loginCmd(cli *cli) *cobra.Command { loginClientID.RegisterString(cmd, &inputs.ClientID, "") loginClientSecret.RegisterString(cmd, &inputs.ClientSecret, "") loginAdditionalScopes.RegisterStringSlice(cmd, &inputs.AdditionalScopes, []string{}) - cmd.MarkFlagsRequiredTogether("client-id", "client-secret", "domain") + cmd.MarkFlagsRequiredTogether("client-id", "client-secret") cmd.MarkFlagsMutuallyExclusive("client-id", "scopes") cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) { @@ -154,10 +158,36 @@ func loginCmd(cli *cli) *cobra.Command { return cmd } +func ensureAuth0URL(input string) (string, error) { + if input == "" { + return "https://*.auth0.com/api/v2/", nil + } + input = strings.TrimPrefix(input, "http://") + input = strings.TrimPrefix(input, "https://") + input = strings.TrimSuffix(input, "/api/v2") + + // Check if the input ends with auth0.com + if !strings.HasSuffix(input, "auth0.com") { + return "", fmt.Errorf("not a valid auth0.com domain") + } + + // Extract the domain part without any path + domainParts := strings.Split(input, "/") + domain := domainParts[0] + + // Return the formatted URL + return fmt.Sprintf("https://%s/api/v2/", domain), nil +} + // RunLoginAsUser runs the login flow guiding the user through the process // by showing the login instructions, opening the browser. -func RunLoginAsUser(ctx context.Context, cli *cli, additionalScopes []string) (config.Tenant, error) { - state, err := auth.GetDeviceCode(ctx, http.DefaultClient, additionalScopes) +func RunLoginAsUser(ctx context.Context, cli *cli, additionalScopes []string, domain string) (config.Tenant, error) { + domain, err := ensureAuth0URL(domain) + if err != nil { + return config.Tenant{}, err + } + + state, err := auth.GetDeviceCode(ctx, http.DefaultClient, additionalScopes, domain) if err != nil { return config.Tenant{}, fmt.Errorf("failed to get the device code: %w", err) } From 05f1b5bfb3251d223eeb892d1455ef181b662a9f Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Thu, 25 Jul 2024 11:04:46 +0530 Subject: [PATCH 02/21] Updated login flow, improved validations, added relevant comments. --- internal/cli/cli.go | 4 --- internal/cli/flags.go | 2 +- internal/cli/login.go | 82 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 7a226181c..eb9dfc9aa 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -136,10 +136,6 @@ func canPrompt(cmd *cobra.Command) bool { return iostream.IsInputTerminal() && iostream.IsOutputTerminal() && !noInput } -func shouldPrompt(cmd *cobra.Command, flag *Flag) bool { - return canPrompt(cmd) && !flag.IsSet(cmd) -} - func shouldPromptWhenNoLocalFlagsSet(cmd *cobra.Command) bool { localFlagIsSet := false cmd.LocalFlags().VisitAll(func(f *pflag.Flag) { diff --git a/internal/cli/flags.go b/internal/cli/flags.go index acea7d85f..b81e32b29 100644 --- a/internal/cli/flags.go +++ b/internal/cli/flags.go @@ -287,7 +287,7 @@ func shouldAsk(cmd *cobra.Command, f *Flag, isUpdate bool) bool { return shouldPromptWhenNoLocalFlagsSet(cmd) } - return shouldPrompt(cmd, f) + return canPrompt(cmd) && !f.IsSet(cmd) } func markFlagRequired(cmd *cobra.Command, f *Flag, isUpdate bool) error { diff --git a/internal/cli/login.go b/internal/cli/login.go index a9fb9aff8..2cf5b8ec6 100644 --- a/internal/cli/login.go +++ b/internal/cli/login.go @@ -57,13 +57,13 @@ type LoginInputs struct { AdditionalScopes []string } -func (i *LoginInputs) isLoggingInAsAMachine() bool { - return i.ClientID != "" || i.ClientSecret != "" -} +//func (i *LoginInputs) isLoggingInAsAMachine() bool { +// return i.ClientID != "" && i.ClientSecret != "" && i.Domain != "" +//} -func (i *LoginInputs) isLoggingInAsAUser() bool { - return i.ClientID == "" && i.ClientSecret == "" && i.Domain != "" -} +//func (i *LoginInputs) isLoggingInAsAUser() bool { +// return i.ClientID == "" && i.ClientSecret == "" && i.Domain != "" +//} func (i *LoginInputs) isLoggingInWithAdditionalScopes() bool { return len(i.AdditionalScopes) > 0 @@ -86,12 +86,64 @@ func loginCmd(cli *cli) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { var selectedLoginType string const loginAsUser, loginAsMachine = "As a user", "As a machine" + shouldLoginAsUser, shouldLoginAsMachine := false, false + + /* + Based on the initial inputs we'd like to determine if + it's a machine login or a user login + If we successfully determine it, we don't need to prompt the user. + + The --no-input flag add strict restriction that we shall not take any further input after + initial command. + Hence, the flow diverges into two based on no-input flag's value. + */ + if cli.noInput { + // --no-input has been passed in command + if inputs.Domain != "" && inputs.ClientSecret != "" && inputs.ClientID != "" { + //If all three fields are passed, machine login flag is set to true. + shouldLoginAsMachine = true + } else if inputs.Domain != "" && inputs.ClientSecret == "" && inputs.ClientID == "" { + /* + The domain flag is common between Machine and User Login. + If domain is passed without client-id and client-secret, + it can be evaluated that it is a user login flow. + */ + shouldLoginAsUser = true + } else if inputs.Domain != "" || inputs.ClientSecret != "" || inputs.ClientID != "" { + /* + At this point, if AT LEAST one of the three flags are passed but not ALL three, + we return an error since it's a no-input flow and it will need all three params + for successful machine flow. + Note that we already determined it's not a user login flow in the condition above. + */ + return fmt.Errorf("flags client-id, client-secret and domain are required together") + } else { + /* + If no flags are passed along with --no-input, it is defaulted to user login flow. + */ + shouldLoginAsUser = true + } + } else { + if !(inputs.Domain != "" && inputs.ClientSecret == "" && inputs.ClientID == "") { + /* + If all three params are passed, we evaluate it as a Machine Login Flow. + Else required params are prompted for. + */ + shouldLoginAsMachine = true + } + } + + //If additional scopes are passed we mark shouldLoginAsUser flag to be true + if inputs.isLoggingInWithAdditionalScopes() { + shouldLoginAsUser = true + } - // We want to prompt if we don't pass the following flags: - // --no-input, --scopes, --client-id, --client-secret, --domain. - // Because then the prompt is unnecessary as we know the login type. - shouldPrompt := !inputs.isLoggingInAsAMachine() && !cli.noInput && !inputs.isLoggingInWithAdditionalScopes() && !inputs.isLoggingInAsAUser() - if shouldPrompt { + /* + If we are unable to determine if it's a user login or a machine login + based on all the evaluation above, we go on to prompt the user and + determine if it's LoginAsUser or LoginAsMachine + */ + if !shouldLoginAsUser && !shouldLoginAsMachine { cli.renderer.Output( fmt.Sprintf( "%s\n\n%s\n%s\n\n%s\n%s\n%s\n%s\n\n", @@ -111,7 +163,7 @@ func loginCmd(cli *cli) *cobra.Command { "Authenticating as a user is recommended if performing ad-hoc operations or working locally.", "Alternatively, authenticating as a machine is recommended for automated workflows (ex:CI).", ) - input := prompt.SelectInput("", label, help, []string{loginAsUser, loginAsMachine}, loginAsUser, shouldPrompt) + input := prompt.SelectInput("", label, help, []string{loginAsUser, loginAsMachine}, loginAsUser, true) if err := prompt.AskOne(input, &selectedLoginType); err != nil { return handleInputError(err) } @@ -119,9 +171,7 @@ func loginCmd(cli *cli) *cobra.Command { ctx := cmd.Context() - // Allows to skip to user login if either the --no-input or --scopes flag is passed. - shouldLoginAsUser := (cli.noInput && !inputs.isLoggingInAsAMachine()) || inputs.isLoggingInWithAdditionalScopes() || inputs.isLoggingInAsAUser() || selectedLoginType == loginAsUser - if shouldLoginAsUser { + if shouldLoginAsUser || selectedLoginType == loginAsUser { if _, err := RunLoginAsUser(ctx, cli, inputs.AdditionalScopes, inputs.Domain); err != nil { return fmt.Errorf("failed to start the authentication process: %w", err) } @@ -147,8 +197,8 @@ func loginCmd(cli *cli) *cobra.Command { loginClientID.RegisterString(cmd, &inputs.ClientID, "") loginClientSecret.RegisterString(cmd, &inputs.ClientSecret, "") loginAdditionalScopes.RegisterStringSlice(cmd, &inputs.AdditionalScopes, []string{}) - cmd.MarkFlagsRequiredTogether("client-id", "client-secret") cmd.MarkFlagsMutuallyExclusive("client-id", "scopes") + cmd.MarkFlagsMutuallyExclusive("client-secret", "scopes") cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) { _ = cmd.Flags().MarkHidden("tenant") From d00612e89dd54092c7074b9dac39ab1625ec5e6d Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Thu, 25 Jul 2024 11:30:11 +0530 Subject: [PATCH 03/21] minor update to flow --- internal/cli/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cli/login.go b/internal/cli/login.go index 2cf5b8ec6..61230b857 100644 --- a/internal/cli/login.go +++ b/internal/cli/login.go @@ -124,7 +124,7 @@ func loginCmd(cli *cli) *cobra.Command { shouldLoginAsUser = true } } else { - if !(inputs.Domain != "" && inputs.ClientSecret == "" && inputs.ClientID == "") { + if inputs.ClientSecret != "" || inputs.ClientID != "" { /* If all three params are passed, we evaluate it as a Machine Login Flow. Else required params are prompted for. From e058d756f815422a1928a3b2f7f74974af79ab4f Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Fri, 26 Jul 2024 20:55:05 +0530 Subject: [PATCH 04/21] Added test cases for new login flow --- internal/cli/login_test.go | 86 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 internal/cli/login_test.go diff --git a/internal/cli/login_test.go b/internal/cli/login_test.go new file mode 100644 index 000000000..d4b8a48fa --- /dev/null +++ b/internal/cli/login_test.go @@ -0,0 +1,86 @@ +package cli + +import ( + "bytes" + "github.com/auth0/auth0-cli/internal/display" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestLoginCommand(t *testing.T) { + t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { + + cli := &cli{} + cli.noInput = true + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9"}) + err := cmd.Execute() + + assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") + }) + + t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { + cli := &cli{} + cli.noInput = true + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpwsRiTkqdjjwEFT04rgCjfslianfs"}) + err := cmd.Execute() + + assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") + }) + + t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { + cli := &cli{} + cli.noInput = true + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpkqdjjwEFT0EFT04rgCp4PZL4Z"}) + err := cmd.Execute() + + assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") + }) + + t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { + cli := &cli{} + cli.noInput = true + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--domain", "duedares.us.auth0.com"}) + err := cmd.Execute() + + assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") + }) + + t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { + cli := &cli{} + cli.noInput = true + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpkqdjjwEFT0EFT04rgCp4PZL4Z", "--domain", "duedares.us.auth0.com"}) + err := cmd.Execute() + + assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") + }) + + t.Run("Positive Test: All three params are passed and Machine Flow is executed", func(t *testing.T) { + message := &bytes.Buffer{} + result := &bytes.Buffer{} + cli := &cli{ + renderer: &display.Renderer{ + MessageWriter: message, + ResultWriter: result, + }, + noInput: true, + } + + cmd := loginCmd(cli) + cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpwsRiTkqdjjwEFT04rgCp4PZL4Z", "--domain", "duedares.us.auth0.com"}) + err := cmd.Execute() + + assert.NoError(t, err) + assert.Contains(t, message.String(), "Successfully logged in.") + }) +} From eefe58ff619623e2b8cef210e0fbb16de7c88d07 Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Fri, 26 Jul 2024 22:09:25 +0530 Subject: [PATCH 05/21] Updated auth_test GetDeviceCode func call --- internal/auth/auth_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index ba63540f8..f4bd1fff2 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -132,7 +132,7 @@ func TestGetDeviceCode(t *testing.T) { u := url.URL{Scheme: "https", Host: parsedURL.Host, Path: "/oauth/device/code"} credentials.DeviceCodeEndpoint = u.String() - state, err := GetDeviceCode(context.Background(), ts.Client(), []string{}) + state, err := GetDeviceCode(context.Background(), ts.Client(), []string{}, "") assert.NoError(t, err) assert.Equal(t, "device-code-here", state.DeviceCode) @@ -180,7 +180,7 @@ func TestGetDeviceCode(t *testing.T) { u := url.URL{Scheme: "https", Host: parsedURL.Host, Path: "/oauth/device/code"} credentials.DeviceCodeEndpoint = u.String() - _, err = GetDeviceCode(context.Background(), ts.Client(), []string{}) + _, err = GetDeviceCode(context.Background(), ts.Client(), []string{}, "") assert.EqualError(t, err, testCase.expect) }) From 72ff8c1951fe6fb32ae3933eee85df3b8bde45e8 Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Mon, 29 Jul 2024 11:15:00 +0530 Subject: [PATCH 06/21] Convert if-else clause to switch case --- internal/cli/login.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/internal/cli/login.go b/internal/cli/login.go index 61230b857..c3286c3de 100644 --- a/internal/cli/login.go +++ b/internal/cli/login.go @@ -57,14 +57,6 @@ type LoginInputs struct { AdditionalScopes []string } -//func (i *LoginInputs) isLoggingInAsAMachine() bool { -// return i.ClientID != "" && i.ClientSecret != "" && i.Domain != "" -//} - -//func (i *LoginInputs) isLoggingInAsAUser() bool { -// return i.ClientID == "" && i.ClientSecret == "" && i.Domain != "" -//} - func (i *LoginInputs) isLoggingInWithAdditionalScopes() bool { return len(i.AdditionalScopes) > 0 } @@ -97,19 +89,20 @@ func loginCmd(cli *cli) *cobra.Command { initial command. Hence, the flow diverges into two based on no-input flag's value. */ - if cli.noInput { - // --no-input has been passed in command - if inputs.Domain != "" && inputs.ClientSecret != "" && inputs.ClientID != "" { - //If all three fields are passed, machine login flag is set to true. + switch { + case cli.noInput: + switch { + case inputs.Domain != "" && inputs.ClientSecret != "" && inputs.ClientID != "": + // If all three fields are passed, machine login flag is set to true. shouldLoginAsMachine = true - } else if inputs.Domain != "" && inputs.ClientSecret == "" && inputs.ClientID == "" { + case inputs.Domain != "" && inputs.ClientSecret == "" && inputs.ClientID == "": /* The domain flag is common between Machine and User Login. If domain is passed without client-id and client-secret, it can be evaluated that it is a user login flow. */ shouldLoginAsUser = true - } else if inputs.Domain != "" || inputs.ClientSecret != "" || inputs.ClientID != "" { + case inputs.Domain != "" || inputs.ClientSecret != "" || inputs.ClientID != "": /* At this point, if AT LEAST one of the three flags are passed but not ALL three, we return an error since it's a no-input flow and it will need all three params @@ -117,13 +110,13 @@ func loginCmd(cli *cli) *cobra.Command { Note that we already determined it's not a user login flow in the condition above. */ return fmt.Errorf("flags client-id, client-secret and domain are required together") - } else { + default: /* If no flags are passed along with --no-input, it is defaulted to user login flow. */ shouldLoginAsUser = true } - } else { + default: if inputs.ClientSecret != "" || inputs.ClientID != "" { /* If all three params are passed, we evaluate it as a Machine Login Flow. From 3e96dada20b6249aff7a60b10cf507a7934e2337 Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Mon, 29 Jul 2024 20:44:35 +0530 Subject: [PATCH 07/21] Fixed linitng issues --- internal/cli/login.go | 8 ++++---- internal/cli/login_test.go | 14 ++------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/internal/cli/login.go b/internal/cli/login.go index c3286c3de..e1824ab4c 100644 --- a/internal/cli/login.go +++ b/internal/cli/login.go @@ -126,7 +126,7 @@ func loginCmd(cli *cli) *cobra.Command { } } - //If additional scopes are passed we mark shouldLoginAsUser flag to be true + // If additional scopes are passed we mark shouldLoginAsUser flag to be true. if inputs.isLoggingInWithAdditionalScopes() { shouldLoginAsUser = true } @@ -209,16 +209,16 @@ func ensureAuth0URL(input string) (string, error) { input = strings.TrimPrefix(input, "https://") input = strings.TrimSuffix(input, "/api/v2") - // Check if the input ends with auth0.com + // Check if the input ends with auth0.com . if !strings.HasSuffix(input, "auth0.com") { return "", fmt.Errorf("not a valid auth0.com domain") } - // Extract the domain part without any path + // Extract the domain part without any path. domainParts := strings.Split(input, "/") domain := domainParts[0] - // Return the formatted URL + // Return the formatted URL. return fmt.Sprintf("https://%s/api/v2/", domain), nil } diff --git a/internal/cli/login_test.go b/internal/cli/login_test.go index d4b8a48fa..870bb4cda 100644 --- a/internal/cli/login_test.go +++ b/internal/cli/login_test.go @@ -2,18 +2,17 @@ package cli import ( "bytes" - "github.com/auth0/auth0-cli/internal/display" "testing" + "github.com/auth0/auth0-cli/internal/display" + "github.com/stretchr/testify/assert" ) func TestLoginCommand(t *testing.T) { t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { - cli := &cli{} cli.noInput = true - cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9"}) err := cmd.Execute() @@ -24,44 +23,36 @@ func TestLoginCommand(t *testing.T) { t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { cli := &cli{} cli.noInput = true - cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpwsRiTkqdjjwEFT04rgCjfslianfs"}) err := cmd.Execute() - assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") }) t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { cli := &cli{} cli.noInput = true - cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpkqdjjwEFT0EFT04rgCp4PZL4Z"}) err := cmd.Execute() - assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") }) t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { cli := &cli{} cli.noInput = true - cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--domain", "duedares.us.auth0.com"}) err := cmd.Execute() - assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") }) t.Run("Negative Test: it returns an error since client-id, client-secret and domain must be passed together", func(t *testing.T) { cli := &cli{} cli.noInput = true - cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpkqdjjwEFT0EFT04rgCp4PZL4Z", "--domain", "duedares.us.auth0.com"}) err := cmd.Execute() - assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") }) @@ -79,7 +70,6 @@ func TestLoginCommand(t *testing.T) { cmd := loginCmd(cli) cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpwsRiTkqdjjwEFT04rgCp4PZL4Z", "--domain", "duedares.us.auth0.com"}) err := cmd.Execute() - assert.NoError(t, err) assert.Contains(t, message.String(), "Successfully logged in.") }) From dde1069ae6abaa261ade7e3314aade7450a8ed1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:38:22 +0530 Subject: [PATCH 08/21] Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 58674ea6b..6c66d87b3 100644 --- a/go.mod +++ b/go.mod @@ -35,11 +35,11 @@ require ( github.com/tidwall/pretty v1.2.1 github.com/zalando/go-keyring v0.2.5 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 - golang.org/x/net v0.26.0 + golang.org/x/net v0.27.0 golang.org/x/oauth2 v0.21.0 golang.org/x/sync v0.7.0 - golang.org/x/sys v0.21.0 - golang.org/x/term v0.21.0 + golang.org/x/sys v0.22.0 + golang.org/x/term v0.22.0 golang.org/x/text v0.16.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -91,7 +91,7 @@ require ( github.com/yuin/goldmark v1.5.4 // indirect github.com/yuin/goldmark-emoji v1.0.2 // indirect github.com/zclconf/go-cty v1.14.4 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect diff --git a/go.sum b/go.sum index 135a86344..f32781da8 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -267,8 +267,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -295,8 +295,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -304,8 +304,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From 87230cd32e66a836396331c11bac92d297b840b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:34:36 +0530 Subject: [PATCH 09/21] Bump github.com/auth0/go-auth0 from 1.7.0 to 1.8.0 (#1036) Bumps [github.com/auth0/go-auth0](https://github.com/auth0/go-auth0) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/auth0/go-auth0/releases) - [Changelog](https://github.com/auth0/go-auth0/blob/main/CHANGELOG.md) - [Commits](https://github.com/auth0/go-auth0/compare/v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: github.com/auth0/go-auth0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6c66d87b3..8e750ca7c 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ replace github.com/mholt/archiver/v3 => github.com/anchore/archiver/v3 v3.5.2 require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/PuerkitoBio/rehttp v1.4.0 - github.com/auth0/go-auth0 v1.7.0 + github.com/auth0/go-auth0 v1.8.0 github.com/briandowns/spinner v1.23.1 github.com/charmbracelet/glamour v0.7.0 github.com/fsnotify/fsnotify v1.7.0 @@ -59,7 +59,7 @@ require ( github.com/dlclark/regexp2 v1.4.0 // indirect github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect github.com/fatih/color v1.16.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/css v1.0.0 // indirect diff --git a/go.sum b/go.sum index f32781da8..c46fe416b 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/auth0/go-auth0 v1.7.0 h1:THNAa+r4vRqRft7nO4pSH1KoFpBj7HS/LuxwoxUw99M= -github.com/auth0/go-auth0 v1.7.0/go.mod h1:k1+9letwAlJR1UIlHJVekSOm/WOOJiRHt39rLUfsO+A= +github.com/auth0/go-auth0 v1.8.0 h1:3aawDXl446+ok8HVmrH4FBTG+ZzgS8qHaJaOGoQdg4k= +github.com/auth0/go-auth0 v1.8.0/go.mod h1:J/t2M/i8XraHTRi9hX6VcMX2wiyWzKnUD04nigFwtfk= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 h1:0NmehRCgyk5rljDQLKUO+cRJCnduDyn11+zGZIc9Z48= github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0/go.mod h1:6L7zgvqo0idzI7IO8de6ZC051AfXb5ipkIJ7bIA2tGA= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= @@ -78,8 +78,9 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= From bcd28e1ddaa5f455f4c1b44c4be594dfc074e23f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:32:19 +0530 Subject: [PATCH 10/21] Bump rexml from 3.2.8 to 3.3.2 in /docs (#1041) Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.2. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.2) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 15ae8ee1e..b6ba01fbd 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -242,8 +242,8 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.2) + strscan rouge (3.30.0) rubyzip (2.3.2) safe_yaml (1.0.5) From e833603d6a055f69ca6341e98ab56ba3af62ca7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:12:55 +0530 Subject: [PATCH 11/21] Bump github.com/lestrrat-go/jwx from 1.2.29 to 1.2.30 (#1042) Bumps [github.com/lestrrat-go/jwx](https://github.com/lestrrat-go/jwx) from 1.2.29 to 1.2.30. - [Release notes](https://github.com/lestrrat-go/jwx/releases) - [Changelog](https://github.com/lestrrat-go/jwx/blob/v1.2.30/Changes) - [Commits](https://github.com/lestrrat-go/jwx/compare/v1.2.29...v1.2.30) --- updated-dependencies: - dependency-name: github.com/lestrrat-go/jwx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 30 ++---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/go.mod b/go.mod index 8e750ca7c..3e8ae5aae 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/hashicorp/hc-install v0.7.0 github.com/hashicorp/terraform-exec v0.21.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/lestrrat-go/jwx v1.2.29 + github.com/lestrrat-go/jwx v1.2.30 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/mattn/go-isatty v0.0.20 github.com/mholt/archiver/v3 v3.5.1 diff --git a/go.sum b/go.sum index c46fe416b..34a2d0b8c 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,6 @@ github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0S github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= @@ -78,7 +76,6 @@ github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -146,8 +143,8 @@ github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZ github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= -github.com/lestrrat-go/jwx v1.2.29 h1:QT0utmUJ4/12rmsVQrJ3u55bycPkKqGYuGT4tyRhxSQ= -github.com/lestrrat-go/jwx v1.2.29/go.mod h1:hU8k2l6WF0ncx20uQdOmik/Gjg6E3/wIRtXSNFeZuB8= +github.com/lestrrat-go/jwx v1.2.30 h1:VKIFrmjYn0z2J51iLPadqoHIVLzvWNa1kCsTqNDHYPA= +github.com/lestrrat-go/jwx v1.2.30/go.mod h1:vMxrwFhunGZ3qddmfmEm2+uced8MSI6QFWGTKygjSzQ= github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= @@ -212,16 +209,12 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= @@ -248,15 +241,12 @@ github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgr golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -265,9 +255,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -275,7 +262,6 @@ golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -290,20 +276,12 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= @@ -312,16 +290,12 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 5d3e8e392512d501ed6301962ad0f77214ce6941 Mon Sep 17 00:00:00 2001 From: stevenwong-okta Date: Tue, 30 Jul 2024 14:25:39 +0800 Subject: [PATCH 12/21] Update codeowner file with new GitHub team name (#1039) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ef957b7c5..71ed0fd3d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @auth0/dx-customer-dev-tools-engineer +* @auth0/project-dx-sdks-engineer-codeowner From e8114f00b405e65efbe555c49e109598e42c25ff Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Fri, 2 Aug 2024 11:18:21 +0530 Subject: [PATCH 13/21] Converted sensitive value to env vars --- internal/cli/login_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/cli/login_test.go b/internal/cli/login_test.go index 870bb4cda..8b93ab99d 100644 --- a/internal/cli/login_test.go +++ b/internal/cli/login_test.go @@ -2,6 +2,7 @@ package cli import ( "bytes" + "os" "testing" "github.com/auth0/auth0-cli/internal/display" @@ -67,8 +68,12 @@ func TestLoginCommand(t *testing.T) { noInput: true, } + domain := os.Getenv("AUTH0_DOMAIN") + clientID := os.Getenv("AUTH0_CLIENT_ID") + clientSecret := os.Getenv("AUTH0_CLIENT_SECRET") + cmd := loginCmd(cli) - cmd.SetArgs([]string{"--client-id", "t3dbMFeTokYBguVu1Ty88gqntUXELSn9", "--client-secret", "3OAzE7j2HTnGOPeCRFX3Hg-0sipaEnodzQK8xpwsRiTkqdjjwEFT04rgCp4PZL4Z", "--domain", "duedares.us.auth0.com"}) + cmd.SetArgs([]string{"--client-id", clientID, "--client-secret", clientSecret, "--domain", domain}) err := cmd.Execute() assert.NoError(t, err) assert.Contains(t, message.String(), "Successfully logged in.") From c686779cd339cd66bed026fb09f05004220071a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:08:31 +0530 Subject: [PATCH 14/21] Bump github.com/schollz/progressbar/v3 from 3.14.4 to 3.14.5 (#1043) Bumps [github.com/schollz/progressbar/v3](https://github.com/schollz/progressbar) from 3.14.4 to 3.14.5. - [Release notes](https://github.com/schollz/progressbar/releases) - [Commits](https://github.com/schollz/progressbar/compare/v3.14.4...v3.14.5) --- updated-dependencies: - dependency-name: github.com/schollz/progressbar/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3e8ae5aae..030301cd4 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 github.com/pkg/errors v0.9.1 - github.com/schollz/progressbar/v3 v3.14.4 + github.com/schollz/progressbar/v3 v3.14.5 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 34a2d0b8c..5c150f701 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/schollz/progressbar/v3 v3.14.4 h1:W9ZrDSJk7eqmQhd3uxFNNcTr0QL+xuGNI9dEMrw0r74= -github.com/schollz/progressbar/v3 v3.14.4/go.mod h1:aT3UQ7yGm+2ZjeXPqsjTenwL3ddUiuZ0kfQ/2tHlyNI= +github.com/schollz/progressbar/v3 v3.14.5 h1:97RrSxbBASxQuZN9yemnyGrFZ/swnG6IrEe2R0BseX8= +github.com/schollz/progressbar/v3 v3.14.5/go.mod h1:Nrzpuw3Nl0srLY0VlTvC4V6RL50pcEymjy6qyJAaLa0= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= @@ -277,12 +277,10 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 00ecd53a5628e4935fb34e74134bbe5cb316667d Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Fri, 2 Aug 2024 19:10:47 +0530 Subject: [PATCH 15/21] Removed a positive case --- internal/cli/login_test.go | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/internal/cli/login_test.go b/internal/cli/login_test.go index 8b93ab99d..fbae2c24b 100644 --- a/internal/cli/login_test.go +++ b/internal/cli/login_test.go @@ -1,12 +1,8 @@ package cli import ( - "bytes" - "os" "testing" - "github.com/auth0/auth0-cli/internal/display" - "github.com/stretchr/testify/assert" ) @@ -56,26 +52,4 @@ func TestLoginCommand(t *testing.T) { err := cmd.Execute() assert.EqualError(t, err, "flags client-id, client-secret and domain are required together") }) - - t.Run("Positive Test: All three params are passed and Machine Flow is executed", func(t *testing.T) { - message := &bytes.Buffer{} - result := &bytes.Buffer{} - cli := &cli{ - renderer: &display.Renderer{ - MessageWriter: message, - ResultWriter: result, - }, - noInput: true, - } - - domain := os.Getenv("AUTH0_DOMAIN") - clientID := os.Getenv("AUTH0_CLIENT_ID") - clientSecret := os.Getenv("AUTH0_CLIENT_SECRET") - - cmd := loginCmd(cli) - cmd.SetArgs([]string{"--client-id", clientID, "--client-secret", clientSecret, "--domain", domain}) - err := cmd.Execute() - assert.NoError(t, err) - assert.Contains(t, message.String(), "Successfully logged in.") - }) } From 0859d7d7e07ba2eb1a5463b36547eafe87b93a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:29:12 +0530 Subject: [PATCH 16/21] Bump rexml from 3.3.2 to 3.3.3 in /docs (#1044) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index b6ba01fbd..acde4f878 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -242,7 +242,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.2) + rexml (3.3.3) strscan rouge (3.30.0) rubyzip (2.3.2) From 8ae93a5c17cecd45368d3e333dc4a5d7b2ce2f27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:29:49 +0530 Subject: [PATCH 17/21] Bump github.com/hashicorp/hc-install from 0.7.0 to 0.8.0 (#1045) Bumps [github.com/hashicorp/hc-install](https://github.com/hashicorp/hc-install) from 0.7.0 to 0.8.0. - [Release notes](https://github.com/hashicorp/hc-install/releases) - [Commits](https://github.com/hashicorp/hc-install/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/hc-install dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 5 +++-- go.sum | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 030301cd4..b8249ce09 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/hashicorp/go-version v1.7.0 - github.com/hashicorp/hc-install v0.7.0 + github.com/hashicorp/hc-install v0.8.0 github.com/hashicorp/terraform-exec v0.21.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/lestrrat-go/jwx v1.2.30 @@ -64,6 +64,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/css v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -92,7 +93,7 @@ require ( github.com/yuin/goldmark-emoji v1.0.2 // indirect github.com/zclconf/go-cty v1.14.4 // indirect golang.org/x/crypto v0.25.0 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.19.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 5c150f701..73a73fd95 100644 --- a/go.sum +++ b/go.sum @@ -98,10 +98,14 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.7.0 h1:Uu9edVqjKQxxuD28mR5TikkKDd/p55S8vzPC1659aBk= -github.com/hashicorp/hc-install v0.7.0/go.mod h1:ELmmzZlGnEcqoUMKUuykHaPCIR1sYLYX+KSggWSKZuA= +github.com/hashicorp/hc-install v0.8.0 h1:LdpZeXkZYMQhoKPCecJHlKvUkQFixN/nvyR1CdfOLjI= +github.com/hashicorp/hc-install v0.8.0/go.mod h1:+MwJYjDfCruSD/udvBmRB22Nlkwwkwf5sAB6uTIhSaU= github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= @@ -247,8 +251,8 @@ golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAb golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= From 00e00adc6ebe9f9816cf80e7f8cf184f5c59fe72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:38:22 +0530 Subject: [PATCH 18/21] Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++++ go.sum | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/go.mod b/go.mod index b8249ce09..8a3c19722 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,11 @@ require ( github.com/yuin/goldmark-emoji v1.0.2 // indirect github.com/zclconf/go-cty v1.14.4 // indirect golang.org/x/crypto v0.25.0 // indirect +<<<<<<< HEAD golang.org/x/mod v0.19.0 // indirect +======= + golang.org/x/mod v0.17.0 // indirect +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 73a73fd95..2a4a951ce 100644 --- a/go.sum +++ b/go.sum @@ -245,6 +245,11 @@ github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgr golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +<<<<<<< HEAD +======= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -259,6 +264,12 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +<<<<<<< HEAD +======= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -281,10 +292,25 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +<<<<<<< HEAD +======= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +<<<<<<< HEAD +======= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 8bfcd9f19130699129afa5b2e7f969a82799b21a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:38:22 +0530 Subject: [PATCH 19/21] Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++++ go.sum | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/go.mod b/go.mod index 8a3c19722..33afc6885 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,11 @@ require ( golang.org/x/mod v0.19.0 // indirect ======= golang.org/x/mod v0.17.0 // indirect +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 2a4a951ce..832aabc87 100644 --- a/go.sum +++ b/go.sum @@ -249,7 +249,11 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y ======= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -269,7 +273,11 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -298,7 +306,11 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -310,7 +322,11 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 2c3764c967cf4b03283145ba24512a58a1136212 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:38:22 +0530 Subject: [PATCH 20/21] Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 7 +++++++ go.sum | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/go.mod b/go.mod index 33afc6885..ca5eed442 100644 --- a/go.mod +++ b/go.mod @@ -98,10 +98,17 @@ require ( ======= golang.org/x/mod v0.17.0 // indirect <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 832aabc87..a27eaec4b 100644 --- a/go.sum +++ b/go.sum @@ -250,10 +250,17 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -274,10 +281,17 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -307,10 +321,17 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -323,10 +344,17 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From ddbd3f723b084ee73885d4e027b983535a9a343f Mon Sep 17 00:00:00 2001 From: Rajat Bajaj Date: Tue, 6 Aug 2024 03:13:17 +0530 Subject: [PATCH 21/21] rebased branch with main --- go.mod | 15 ------------- go.sum | 70 ---------------------------------------------------------- 2 files changed, 85 deletions(-) diff --git a/go.mod b/go.mod index ca5eed442..b8249ce09 100644 --- a/go.mod +++ b/go.mod @@ -93,22 +93,7 @@ require ( github.com/yuin/goldmark-emoji v1.0.2 // indirect github.com/zclconf/go-cty v1.14.4 // indirect golang.org/x/crypto v0.25.0 // indirect -<<<<<<< HEAD golang.org/x/mod v0.19.0 // indirect -======= - golang.org/x/mod v0.17.0 // indirect -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index a27eaec4b..73a73fd95 100644 --- a/go.sum +++ b/go.sum @@ -245,22 +245,6 @@ github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgr golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -<<<<<<< HEAD -======= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -275,23 +259,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -<<<<<<< HEAD -======= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -314,47 +281,10 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -<<<<<<< HEAD -======= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -<<<<<<< HEAD -======= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) -======= ->>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ->>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=