Merge branch 'main' into BREV-2572/Vulnerability-remediation

shivamj-del · web-flow · commit 88c7736ee82a · 2026-01-29T15:07:53.000+05:30
diff --git a/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml b/.github/workflows/Test_CanClonePublicRepoWithoutAuthorizeddKeysAllFormats.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ChangePwd.yml b/.github/workflows/Test_ChangePwd.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml b/.github/workflows/Test_CustomBranchCustomSetupCustomFolder.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true     
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoProjectBrev.yml b/.github/workflows/Test_NoProjectBrev.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoUserBrevNoProj.yml b/.github/workflows/Test_NoUserBrevNoProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_NoUserBrevProj.yml b/.github/workflows/Test_NoUserBrevProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProjectRepoNoBrev.yml b/.github/workflows/Test_ProjectRepoNoBrev.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupFileChange.yml b/.github/workflows/Test_ProvidedSetupFileChange.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupRanNoProj.yml b/.github/workflows/Test_ProvidedSetupRanNoProj.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_ProvidedSetupUpdated.yml b/.github/workflows/Test_ProvidedSetupUpdated.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true     
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UnauthenticatedSSHKey.yml b/.github/workflows/Test_UnauthenticatedSSHKey.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV0.yml b/.github/workflows/Test_UserBrevProjectBrevV0.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV1All.yml b/.github/workflows/Test_UserBrevProjectBrevV1All.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml b/.github/workflows/Test_UserBrevProjectBrevV1Minimal.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_VscodeExtension.yml b/.github/workflows/Test_VscodeExtension.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/Test_httpGit.yml b/.github/workflows/Test_httpGit.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true      
       - name: expire test cache
         run: go clean -testcache
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
 
       - name: Build
diff --git a/.github/workflows/cli-output-compatibility.yml b/.github/workflows/cli-output-compatibility.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
 
       - name: Install dependencies
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
 
 
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: Build
         run: make ci
@@ -62,7 +62,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: Release test
         run: make build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: install
         run: make install-tools
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: Release
         run: make ci smoke-test release
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: install
         run: make install-tools
diff --git a/.github/workflows/vet.yml b/.github/workflows/vet.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.6'
+          go-version: '1.24.0'
           cache: true
       - name: install
         run: make install-tools
diff --git a/Makefile b/Makefile
@@ -7,6 +7,27 @@ fast-build: ## go build -o brev
 	echo ${VERSION}
 	CGO_ENABLED=0 go build -o brev -ldflags "-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${VERSION}"
 
+.PHONY: local
+local: ## build with env wrapper (use: make local env=dev0|dev1|dev2|stg, or make local for defaults)
+	$(call print-target)
+ifdef env
+	@echo "Building with env=$(env) wrapper..."
+	@echo ${VERSION}
+	CGO_ENABLED=0 go build -o brev -ldflags "-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${VERSION}"
+	@echo '#!/bin/sh' > brev
+	@echo '# Auto-generated wrapper with environment overrides' >> brev
+	@echo 'export BREV_CONSOLE_URL="https://localhost.nvidia.com:3000"' >> brev
+	@echo 'export BREV_AUTH_URL="https://api.stg.ngc.nvidia.com"' >> brev
+	@echo 'export BREV_AUTH_ISSUER_URL="https://stg.login.nvidia.com"' >> brev
+	@echo 'export BREV_API_URL="https://bd.$(env).brev.nvidia.com"' >> brev
+	@echo 'export BREV_GRPC_URL="api.$(env).brev.nvidia.com:443"' >> brev
+	@echo 'exec "$$(cd "$$(dirname "$$0")" && pwd)/brev" "$$@"' >> brev
+	@chmod +x brev
+else
+	@echo "Building without environment overrides (using config.go defaults)..."
+	$(MAKE) fast-build
+endif
+
 .PHONY: install-dev
 install-dev: fast-build ## go install
 	cp brev $(shell go env GOPATH)/bin/
@@ -278,3 +299,13 @@ new-cmd:
 .PHONY: develop-with-nix
 develop-with-nix:
 	nix develop .
+
+.PHONY: update-devplane-deps
+update-devplane-deps: ## update devplane dependencies (use: make update-devplane-deps commit=<hash-or-tag>, defaults to latest)
+	@COMMIT=$${commit:-latest}; \
+	echo "Updating devplane dependencies to: $$COMMIT"; \
+	go get -u github.com/brevdev/dev-plane@$$COMMIT; \
+	go get buf.build/gen/go/brevdev/devplane/grpc/go@$$COMMIT; \
+	go get buf.build/gen/go/brevdev/devplane/protocolbuffers/go@$$COMMIT; \
+	go mod tidy; \
+	echo "Successfully updated to $$COMMIT"
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
@@ -407,7 +407,7 @@ func StandardLogin(authProvider string, email string, tokens *entity.AuthTokens)
 	kasAuthenticator := NewKasAuthenticator(
 		email,
 		config.GlobalConfig.GetBrevAuthURL(),
-		"https://login.nvidia.com",
+		config.GlobalConfig.GetBrevAuthIssuerURL(),
 		shouldPromptEmail,
 		config.GlobalConfig.GetConsoleURL(),
 	)
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -32,6 +32,7 @@ import (
 	"github.com/brevdev/brev-cli/pkg/cmd/recreate"
 	"github.com/brevdev/brev-cli/pkg/cmd/redeem"
 	"github.com/brevdev/brev-cli/pkg/cmd/refresh"
+	"github.com/brevdev/brev-cli/pkg/cmd/register"
 	"github.com/brevdev/brev-cli/pkg/cmd/reset"
 	"github.com/brevdev/brev-cli/pkg/cmd/runtasks"
 	"github.com/brevdev/brev-cli/pkg/cmd/scale"
@@ -286,6 +287,7 @@ func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *stor
 	cmd.AddCommand(reset.NewCmdReset(t, loginCmdStore, noLoginCmdStore))
 	cmd.AddCommand(profile.NewCmdProfile(t, loginCmdStore, noLoginCmdStore))
 	cmd.AddCommand(refresh.NewCmdRefresh(t, loginCmdStore))
+	cmd.AddCommand(register.NewCmdRegister(t))
 	cmd.AddCommand(runtasks.NewCmdRunTasks(t, noLoginCmdStore))
 	cmd.AddCommand(proxy.NewCmdProxy(t, noLoginCmdStore))
 	cmd.AddCommand(healthcheck.NewCmdHealthcheck(t, noLoginCmdStore))
diff --git a/pkg/cmd/ls/ls.go b/pkg/cmd/ls/ls.go
@@ -318,7 +318,7 @@ func (ls Ls) displayWorkspacesAndHelp(org *entity.Organization, otherOrgs []enti
 			ls.terminal.Vprintf("%s", ls.terminal.Yellow(fmt.Sprintf("\tbrev set %s\n", getOtherOrg(otherOrgs, *org).Name)))
 		}
 	} else {
-		ls.terminal.Vprintf("You have %d instances in Org "+ls.terminal.Yellow(org.Name)+"\n", len(userWorkspaces))
+		ls.terminal.Vprintf("You have %d instances in Org %s\n", len(userWorkspaces), ls.terminal.Yellow(org.Name))
 		displayWorkspacesTable(ls.terminal, userWorkspaces)
 
 		fmt.Print("\n")
@@ -382,14 +382,14 @@ func (ls Ls) RunHosts(org *entity.Organization) error {
 func displayProjects(t *terminal.Terminal, orgName string, projects []virtualproject.VirtualProject) {
 	if len(projects) > 0 {
 		fmt.Print("\n")
-		t.Vprintf("%d other projects in Org "+t.Yellow(orgName)+"\n", len(projects))
+		t.Vprintf("%d other projects in Org %s\n", len(projects), t.Yellow(orgName))
 		displayProjectsTable(projects)
 
 		fmt.Print("\n")
 		t.Vprintf("%s", t.Green("Join a project:\n")+
 			t.Yellow(fmt.Sprintf("\tbrev start %s\n", projects[0].Name)))
 	} else {
-		t.Vprintf("no other projects in Org "+t.Yellow(orgName)+"\n", len(projects))
+		t.Vprintf("no other projects in Org %s\n", t.Yellow(orgName))
 		fmt.Print("\n")
 		t.Vprintf("%s", t.Green("Invite a teamate:\n")+
 			t.Yellow("\tbrev invite"))
diff --git a/pkg/cmd/register/register.go b/pkg/cmd/register/register.go
@@ -0,0 +1,44 @@
+// Package register provides the brev register command for DGX Spark registration
+package register
+
+import (
+	"github.com/brevdev/brev-cli/pkg/terminal"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	registerLong = `Register your DGX Spark with NVIDIA Brev
+
+Join the waitlist to be among the first to register your DGX Spark 
+for early access integration with Brev.`
+
+	registerExample = `  brev register`
+)
+
+func NewCmdRegister(t *terminal.Terminal) *cobra.Command {
+	cmd := &cobra.Command{
+		Annotations:           map[string]string{"configuration": ""},
+		Use:                   "register",
+		Aliases:               []string{"spark"},
+		DisableFlagsInUseLine: true,
+		Short:                 "Register your DGX Spark with Brev",
+		Long:                  registerLong,
+		Example:               registerExample,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			runRegister(t)
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func runRegister(t *terminal.Terminal) {
+	t.Vprint("\n")
+	t.Vprint(t.Green("Thanks so much for your interest in registering your DGX Spark with Brev!\n\n"))
+	t.Vprint("To be on the waitlist for early access to this feature, please fill out this form:\n\n")
+	t.Vprint(t.Yellow("  👉 https://forms.gle/RHCHGmZuiMQQ2faA6\n\n"))
+	t.Vprint("We will reach out to the provided email with updates and instructions on how to register soon (:\n")
+	t.Vprint("\n")
+}
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -8,7 +8,9 @@ type EnvVarName string // should be caps with underscore
 
 const (
 	brevAPIURL               EnvVarName = "BREV_API_URL"
+	brevGRPCURL              EnvVarName = "BREV_GRPC_URL"
 	brevAuthURL              EnvVarName = "BREV_AUTH_URL"
+	brevAuthIssuerURL        EnvVarName = "BREV_AUTH_ISSUER_URL"
 	brevConsoleURL           EnvVarName = "BREV_CONSOLE_URL"
 	coordURL                 EnvVarName = "BREV_COORD_URL"
 	version                  EnvVarName = "VERSION"
@@ -30,10 +32,19 @@ func (c ConstantsConfig) GetBrevAPIURl() string {
 	return getEnvOrDefault(brevAPIURL, "https://brevapi.us-west-2-prod.control-plane.brev.dev")
 }
 
+func (c ConstantsConfig) GetBrevGRPCURL() string {
+	// GRPC does not use https:// prefix
+	return getEnvOrDefault(brevGRPCURL, "api.brev.dev:443")
+}
+
 func (c ConstantsConfig) GetBrevAuthURL() string {
 	return getEnvOrDefault(brevAuthURL, "https://api.ngc.nvidia.com")
 }
 
+func (c ConstantsConfig) GetBrevAuthIssuerURL() string {
+	return getEnvOrDefault(brevAuthIssuerURL, "https://login.nvidia.com")
+}
+
 func (c ConstantsConfig) GetConsoleURL() string {
 	return getEnvOrDefault(brevConsoleURL, "https://brev.nvidia.com")
 }
