local cli

Author: drewmalin

pkg/auth/auth.go

@@ -223,7 +223,7 @@ func defaultAuthFunc(url, code string) {
 	}
 	urlType := color.New(color.FgCyan, color.Bold).SprintFunc()
 	fmt.Println("Browser link: " + urlType(url) + "\n")
-	fmt.Println("Alternatively, get CLI Command (\"Login via CLI\"): ", urlType(fmt.Sprintf("%s/profile?login=cli", config.ConsoleBaseURL)))
+	fmt.Println("Alternatively, get CLI Command (\"Login via CLI\"): ", urlType(fmt.Sprintf("%s/profile?login=cli", config.GlobalConfig.GetConsoleBaseURL())))
 	fmt.Print("\n")
 	caretType := color.New(color.FgGreen, color.Bold).SprintFunc()
 	enterType := color.New(color.FgGreen, color.Bold).SprintFunc()
@@ -245,7 +245,7 @@ func defaultAuthFunc(url, code string) {
 func skipBrowserAuthFunc(url, _ string) {
 	urlType := color.New(color.FgCyan, color.Bold).SprintFunc()
 	fmt.Println("Please copy", urlType(url), "and paste it in your browser.")
-	fmt.Println("Alternatively, get CLI Command (\"Login via CLI\"): ", urlType(fmt.Sprintf("%s/profile?login=cli", config.ConsoleBaseURL)))
+	fmt.Println("Alternatively, get CLI Command (\"Login via CLI\"): ", urlType(fmt.Sprintf("%s/profile?login=cli", config.GlobalConfig.GetConsoleBaseURL())))
 	fmt.Println("Waiting for login to complete in browser... Ctrl+C to use CLI command instead.")
 }
 
@@ -402,10 +402,10 @@ func StandardLogin(authProvider string, email string, tokens *entity.AuthTokens)
 
 	kasAuthenticator := NewKasAuthenticator(
 		email,
-		"https://api.ngc.nvidia.com",
+		config.GlobalConfig.GetBrevAuthURL(),
 		"https://login.nvidia.com",
 		shouldPromptEmail,
-		"https://brev.nvidia.com",
+		config.GlobalConfig.GetConsoleBaseURL(),
 	)
 
 	// Create the auth0 authenticator as an alternative
@@ -446,9 +446,9 @@ func StandardLogin(authProvider string, email string, tokens *entity.AuthTokens)
 		}
 	}
 
-	if authenticator.GetCredentialProvider() == CredentialProviderKAS {
-		config.ConsoleBaseURL = "https://brev.nvidia.com"
-	}
+	// if authenticator.GetCre[dentialProvider() == CredentialProviderKAS {
+	// 	config.ConsoleBaseURL = "https://brev.nvidia.com"
+	// }]
 
 	return authenticator
 }

pkg/cmd/hello/steps.go

@@ -41,7 +41,7 @@ func GetTextBasedONStatus(status string, t *terminal.Terminal) string {
 		s += "\n\nRun " + t.Yellow("brev hello") + " to resume this walk through when your instance is ready\n"
 	default:
 		s += t.Red("Please create a running instance for this walk through. ")
-		s += "\n\tYou can do that here: " + t.Yellow(fmt.Sprintf("%s/environments/new", config.ConsoleBaseURL))
+		s += "\n\tYou can do that here: " + t.Yellow(fmt.Sprintf("%s/environments/new", config.GlobalConfig.GetConsoleBaseURL()))
 		s += "\n\nRun " + t.Yellow("brev hello") + " to resume this walk through when your instance is ready\n"
 	}
 	return s
@@ -62,7 +62,7 @@ func GetDevEnvOrStall(t *terminal.Terminal, workspaces []entity.Workspace) *enti
 
 	if noneFound {
 		s := t.Red("Please create a running instance for this walk through. ")
-		s += "\n\tYou can do that here: " + t.Yellow(fmt.Sprintf("%s/environments/new", config.ConsoleBaseURL))
+		s += "\n\tYou can do that here: " + t.Yellow(fmt.Sprintf("%s/environments/new", config.GlobalConfig.GetConsoleBaseURL()))
 		s += "\n\nRun: " + t.Yellow("brev hello") + " to resume this walk through when your instance is ready\n"
 		TypeItToMe(s)
 		return nil
@@ -103,7 +103,7 @@ func printBrevOpen(t *terminal.Terminal, firstWorkspace entity.Workspace) {
 
 func printCompletedOnboarding(t *terminal.Terminal) {
 	s := "\n\nI think I'm done here. Now you know how to open an instance and start coding."
-	s += "\n\nUse the console " + t.Yellow(fmt.Sprintf("(%s)", config.ConsoleBaseURL)) + " to create a new instance or share it with people"
+	s += "\n\nUse the console " + t.Yellow(fmt.Sprintf("(%s)", config.GlobalConfig.GetConsoleBaseURL())) + " to create a new instance or share it with people"
 	s += "\nand use this CLI to code the way you would normally 🤙"
 	s += "\n\nCheck out the docs at " + t.Yellow("https://brev.dev") + " and let us know if we can help!\n"
 	s += "\n\nIn case you missed it, my cell is " + t.Yellow("(415) 237-2247") + "\n\t-Nader\n"

pkg/cmd/invite/invite.go

@@ -98,7 +98,7 @@ func RunInvite(t *terminal.Terminal, inviteStore InviteStore, orgflag string) er
 
 	t.Vprintf("Share this link to add someone to %s. It will expire in 7 days.", t.Green(org.Name))
 	t.Vprintf("\n\n  %s", t.Green("▸"))
-	t.Vprintf("    %s", t.White("%s/invite?token=%s\n\n", config.ConsoleBaseURL, token))
+	t.Vprintf("    %s", t.White("%s/invite?token=%s\n\n", config.GlobalConfig.GetConsoleBaseURL(), token))
 
 	return nil
 }

pkg/cmd/ls/ls.go

@@ -236,7 +236,7 @@ func (ls Ls) RunOrgs() error {
 		return breverrors.WrapAndTrace(err)
 	}
 	if len(orgs) == 0 {
-		ls.terminal.Vprint(ls.terminal.Yellow(fmt.Sprintf("You don't have any orgs. Create one! %s", config.ConsoleBaseURL)))
+		ls.terminal.Vprint(ls.terminal.Yellow(fmt.Sprintf("You don't have any orgs. Create one! %s", config.GlobalConfig.GetConsoleBaseURL())))
 		return nil
 	}
 

pkg/cmd/org/org.go

@@ -75,7 +75,7 @@ func RunOrgs(t *terminal.Terminal, store OrgCmdStore) error {
 		return breverrors.WrapAndTrace(err)
 	}
 	if len(orgs) == 0 {
-		t.Vprint(t.Yellow(fmt.Sprintf("You don't have any orgs. Create one! %s", config.ConsoleBaseURL)))
+		t.Vprint(t.Yellow(fmt.Sprintf("You don't have any orgs. Create one! %s", config.GlobalConfig.GetConsoleBaseURL())))
 		return nil
 	}
 

pkg/cmd/profile/profile.go

@@ -55,7 +55,7 @@ func NewCmdProfile(t *terminal.Terminal, loginProfileStore ProfileStore, noLogin
 }
 
 func goToProfileInConsole() {
-	url := fmt.Sprintf("%s/profile", config.ConsoleBaseURL)
+	url := fmt.Sprintf("%s/profile", config.GlobalConfig.GetConsoleBaseURL())
 	caretType := color.New(color.FgGreen, color.Bold).SprintFunc()
 	enterType := color.New(color.FgGreen, color.Bold).SprintFunc()
 	urlType := color.New(color.FgWhite, color.Bold).SprintFunc()

pkg/config/config.go

@@ -8,6 +8,8 @@ type EnvVarName string // should be caps with underscore
 
 const (
 	brevAPIURL               EnvVarName = "BREV_API_URL"
+	brevAuthURL              EnvVarName = "BREV_AUTH_URL"
+	consoleBaseURL           EnvVarName = "BREV_CONSOLE_BASE_URL"
 	coordURL                 EnvVarName = "BREV_COORD_URL"
 	version                  EnvVarName = "VERSION"
 	clusterID                EnvVarName = "DEFAULT_CLUSTER_ID"
@@ -18,8 +20,6 @@ const (
 	ollamaAPIURL             EnvVarName = "OLLAMA_API_URL"
 )
 
-var ConsoleBaseURL = "https://brev.nvidia.com"
-
 type ConstantsConfig struct{}
 
 func NewConstants() *ConstantsConfig {
@@ -30,6 +30,14 @@ func (c ConstantsConfig) GetBrevAPIURl() string {
 	return getEnvOrDefault(brevAPIURL, "https://brevapi.us-west-2-prod.control-plane.brev.dev")
 }
 
+func (c ConstantsConfig) GetBrevAuthURL() string {
+	return getEnvOrDefault(brevAuthURL, "https://api.ngc.nvidia.com")
+}
+
+func (c ConstantsConfig) GetConsoleBaseURL() string {
+	return getEnvOrDefault(consoleBaseURL, "https://brev.nvidia.com")
+}
+
 func (c ConstantsConfig) GetOllamaAPIURL() string {
 	return getEnvOrDefault(ollamaAPIURL, "https://registry.ollama.ai")
 }