nsc: do rely on version cache to notify new version

Part of: NSL-2176
namespacelabs · Nov 17, 2023 · 961d93d · 961d93d
1 parent fc152af
commit 961d93d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/nsc/main.go b/cmd/nsc/main.go
@@ -32,7 +32,7 @@ func main() {
 	// Consider adding auto updates if we frequently change nsc.
 	fncobra.DoMain(fncobra.MainOpts{
 		Name:                 "nsc",
-		AutoUpdate:           true,
+		NotifyOnNewVersion:   true,
 		ConsoleInhibitReport: true,
 		FormatErr:            formatErr,
 		ConsoleRenderer:      renderLine,

diff --git a/internal/cli/fncobra/do.go b/internal/cli/fncobra/do.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"namespacelabs.dev/foundation/internal/cli/nsboot"
 	"namespacelabs.dev/foundation/internal/cli/version"
 	"namespacelabs.dev/foundation/internal/cli/versioncheck"
 	"namespacelabs.dev/foundation/internal/compute"
@@ -53,7 +52,7 @@ func DeferCheckVersion(ctx context.Context, command string) {
 			return nil
 		}
 
-		if nsboot.NewerVersion(command, status) {
+		if status.NewVersion {
 			compute.On(ctx).Cleanup(tasks.Action(command+".check-updated.notify").LogLevel(1), func(ctx context.Context) error {
 				fmt.Fprintf(console.Stdout(ctx), "\n\n  A new version of %s is available (%s).\n\n", command, status.Version)
 				return nil

diff --git a/internal/cli/fncobra/main.go b/internal/cli/fncobra/main.go
@@ -53,6 +53,7 @@ var (
 type MainOpts struct {
 	Name                 string
 	AutoUpdate           bool
+	NotifyOnNewVersion   bool
 	FormatErr            FormatErrorFunc
 	ConsoleInhibitReport bool
 	ConsoleRenderer      consolesink.RendererFunc
@@ -96,8 +97,8 @@ func doMain(opts MainOpts) (colors.Style, error) {
 	rootCtx, style, flushLogs := setupContext(context.Background(), opts.ConsoleInhibitReport, opts.ConsoleRenderer)
 
 	// Before moving forward, we check if there's a more up-to-date ns we should fork to.
-	if opts.AutoUpdate {
-		maybeRunLatest(rootCtx, style, flushLogs, opts.Name, opts.Name == "ns")
+	if opts.AutoUpdate && opts.Name == "ns" { // Applies only to ns, not nsc and docker-credential-helper
+		maybeRunLatest(rootCtx, style, flushLogs, opts.Name, true)
 	}
 
 	var cleanupTracer func()
@@ -123,7 +124,7 @@ func doMain(opts MainOpts) (colors.Style, error) {
 		ctx := cmd.Context()
 
 		// This is a bit of an hack. But don't run version checks when doing an update.
-		if opts.AutoUpdate && !slices.Contains(cmd.Aliases, "update-ns") {
+		if opts.NotifyOnNewVersion && !slices.Contains(cmd.Aliases, "update-ns") {
 			DeferCheckVersion(ctx, opts.Name)
 		}