fix merge issues

Author: burmudar

cmd/src/login.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"os"
 
 	"github.com/sourcegraph/src-cli/internal/api"
 	"github.com/sourcegraph/src-cli/internal/clicompat"
@@ -42,10 +43,14 @@ var loginCommand = clicompat.Wrap(&cli.Command{
 	HideVersion: true,
 	Flags:       clicompat.WithAPIFlags(),
 	Action: func(ctx context.Context, cmd *cli.Command) error {
-		var loginEndpointURL *url.URL
+		if cfg.configFilePath != "" {
+			fmt.Fprintln(os.Stderr)
+			fmt.Fprintf(os.Stderr, "⚠️  Warning: Configuring src with a JSON file is deprecated. Please migrate to using the env vars SRC_ENDPOINT, SRC_ACCESS_TOKEN, and SRC_PROXY instead, and then remove %s. See https://github.com/sourcegraph/src-cli#readme for more information.\n", cfg.configFilePath)
+		}
+
 		if cmd.Args().Present() {
 			arg := cmd.Args().First()
-			u, err := parseEndpoint(arg)
+			loginEndpointURL, err := parseEndpoint(arg)
 			if err != nil {
 				return cmderrors.Usage(fmt.Sprintf("invalid endpoint URL: %s", arg))
 			}
@@ -76,13 +81,6 @@ var loginCommand = clicompat.Wrap(&cli.Command{
 			out:         os.Stdout,
 			apiFlags:    apiFlags,
 			oauthClient: oauth.NewClient(oauth.DefaultClientID),
-		return loginCmd(context.Background(), loginParams{
-			cfg:              cfg,
-			client:           client,
-			out:              os.Stdout,
-			apiFlags:         apiFlags,
-			oauthClient:      oauth.NewClient(oauth.DefaultClientID),
-			loginEndpointURL: loginEndpointURL,
 		})
 	},
 })

cmd/src/login_test.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/sourcegraph/src-cli/internal/cmderrors"
 	"github.com/sourcegraph/src-cli/internal/oauth"
-	"github.com/urfave/cli/v3"
 )
 
 func mustParseURL(t *testing.T, raw string) *url.URL {
@@ -140,37 +139,6 @@ func TestLogin(t *testing.T) {
 	})
 }
 
-func TestLoginCommand(t *testing.T) {
-	prevCfg := cfg
-	defer func() { cfg = prevCfg }()
-
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, `{"data":{"currentUser":{"username":"alice"}}}`)
-	}))
-	defer s.Close()
-
-	cfg = &config{
-		endpointURL: mustParseURL(t, s.URL),
-		accessToken: "x",
-	}
-
-	var out bytes.Buffer
-	cmd := *loginCommand
-	cmd.Writer = &out
-	cmd.ErrWriter = &out
-	cmd.ExitErrHandler = func(context.Context, *cli.Command, error) {}
-
-	err := cmd.Run(context.Background(), []string{"login", s.URL})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	want := "\n✔︎ Authenticated as alice on " + s.URL + "\n\n\n💡 Tip: To use this endpoint in your shell, run:\n\n   export SRC_ENDPOINT=" + s.URL + "\n\n"
-	if out.String() != want {
-		t.Fatalf("output = %q, want %q", out.String(), want)
-	}
-}
-
 type fakeOAuthClient struct {
 	startErr    error
 	startCalled *bool