Add upgrade flag + replace log

cmd/snd-cli/main.go

@@ -3,15 +3,14 @@ package main
 import (
 	"fmt"
 	"os"
+	snd_cli_go "snd-cli"
 	"snd-cli/pkg/cmd/root"
 )
 
-var version = "v0.0.0"
-
 func main() {
 	rootCmd, _ := root.NewCmdRoot()
-	rootCmd.Version = version
-	rootCmd.SetVersionTemplate(fmt.Sprintf("snd-cli version %s", version))
+	rootCmd.Version = snd_cli_go.Version
+	rootCmd.SetVersionTemplate(fmt.Sprintf("snd-cli version %s", snd_cli_go.Version))
 	err := rootCmd.Execute()
 	if err != nil {
 		fmt.Println("Error: ", err)

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/google/uuid v1.5.0 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/SneaksAndData/esd-services-api-client-go v0.0.2 h1:MM/L0TiXSfIfcyrnbZ
 github.com/SneaksAndData/esd-services-api-client-go v0.0.2/go.mod h1:StEYmGCRQ8IWA+UDcoMOTw/MpYmlFAfTTS15yeXy5Q4=
 github.com/SneaksAndData/esd-services-api-client-go v0.0.3 h1:CPD5sgpVvhObgEMX/h989QkcsFGd9x8b/wUaks3bw2c=
 github.com/SneaksAndData/esd-services-api-client-go v0.0.3/go.mod h1:StEYmGCRQ8IWA+UDcoMOTw/MpYmlFAfTTS15yeXy5Q4=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 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=

pkg/cmd/auth/auth.go

@@ -3,7 +3,6 @@ package auth
 import (
 	"fmt"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmd/util/token"
 	"snd-cli/pkg/cmdutil"
 )
@@ -19,7 +18,7 @@ func NewCmdAuth(authServiceFactory *cmdutil.AuthServiceFactory) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, provider)
 			if err != nil {
-				log.Fatalf("Failed to initialize auth service: %v", err)
+				return fmt.Errorf("failed to initialize auth service: %w", err)
 			}
 			return loginRun(authService)
 		},
@@ -32,10 +31,13 @@ func NewCmdAuth(authServiceFactory *cmdutil.AuthServiceFactory) *cobra.Command {
 }
 
 func loginRun(authService token.AuthService) error {
-	tokenProvider := token.NewProvider(authService)
+	tokenProvider, err := token.NewProvider(authService)
+	if err != nil {
+		return fmt.Errorf("unable to create token provider: %w", err)
+	}
 	cachedToken, err := tokenProvider.GetToken() // Fetch and cache the token.
 	if err != nil {
-		log.Fatalf("Unable to get the token: %v", err)
+		return fmt.Errorf("unable to get the token: %w", err)
 	}
 	fmt.Println("Login successful.")
 	fmt.Println("Token:", cachedToken)

pkg/cmd/claim/add.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/claim"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 	"strings"
 )
@@ -18,11 +17,11 @@ func NewCmdAddClaim(authServiceFactory *cmdutil.AuthServiceFactory, serviceFacto
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("claim", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			if err != nil {
 				return err

pkg/cmd/claim/get.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/claim"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 	"strings"
 )
@@ -16,11 +15,11 @@ func NewCmdGetClaim(authServiceFactory *cmdutil.AuthServiceFactory, serviceFacto
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("claim", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			if err != nil {
 				return err

pkg/cmd/claim/remove.go

@@ -18,7 +18,7 @@ func NewCmdRemoveClaim(authServiceFactory *cmdutil.AuthServiceFactory, serviceFa
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("claim", env, authService)
 			if err != nil {

pkg/cmd/claim/user.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/claim"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -28,11 +27,11 @@ func NewCmdAddUser(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactor
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("claim", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			resp, err := addUserRun(service.(*claim.Service), userId, claimProvider)
 			if err == nil {
@@ -61,11 +60,11 @@ func NewCmdRemoveUser(authServiceFactory *cmdutil.AuthServiceFactory, serviceFac
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("claim", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			if err != nil {
 				return err

pkg/cmd/ml/get.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	algorithmClient "github.com/SneaksAndData/esd-services-api-client-go/algorithm"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 	"strings"
 )
@@ -18,11 +17,11 @@ func NewCmdGet(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactory cm
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("algorithm", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			resp, err := getRun(service.(*algorithmClient.Service), id, algorithm)
 			if err == nil {

pkg/cmd/ml/run.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	algorithmClient "github.com/SneaksAndData/esd-services-api-client-go/algorithm"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmd/util/file"
 	"snd-cli/pkg/cmdutil"
 )
@@ -18,11 +17,11 @@ func NewCmdRun(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactory cm
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("algorithm", env, authService)
 			if err != nil {
-				log.Fatalf(err.Error())
+				return err
 			}
 			payloadPath := file.File{FilePath: payload}
 			resp, err := runRun(service.(*algorithmClient.Service), payloadPath, algorithm, tag)

pkg/cmd/root/root.go

@@ -7,6 +7,8 @@ import (
 	claimCmd "snd-cli/pkg/cmd/claim"
 	mlCmd "snd-cli/pkg/cmd/ml"
 	sparkCmd "snd-cli/pkg/cmd/spark"
+	upgradeCmd "snd-cli/pkg/cmd/upgrade"
+	"snd-cli/pkg/cmd/util/version"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -21,6 +23,13 @@ func NewCmdRoot() (*cobra.Command, error) {
 		Use:   "snd <service command group> <service command> [flags]",
 		Short: "SnD CLI",
 		Long:  `SnD CLI is a tool for interacting with various internal and external services in Sneaks & Data.`,
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			err := version.CheckIfNewVersionIsAvailable()
+			if err != nil {
+				return err
+			}
+			return nil
+		},
 	}
 
 	cmd.AddGroup(&cobra.Group{
@@ -53,5 +62,7 @@ func NewCmdRoot() (*cobra.Command, error) {
 	cmd.AddCommand(claimCmd.NewCmdClaim(serviceFactory, authServiceFactory))
 	cmd.AddCommand(mlCmd.NewCmdAlgorithm(serviceFactory, authServiceFactory))
 	cmd.AddCommand(sparkCmd.NewCmdSpark(serviceFactory, authServiceFactory))
+
+	cmd.AddCommand(upgradeCmd.NewCmdUpgrade())
 	return cmd, nil
 }

pkg/cmd/spark/configuration.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -17,7 +16,7 @@ func NewCmdConfiguration(authServiceFactory *cmdutil.AuthServiceFactory, service
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {

pkg/cmd/spark/encrypt.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -17,7 +16,7 @@ func NewCmdEncrypt(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactor
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {

pkg/cmd/spark/logs.go

@@ -3,7 +3,6 @@ package spark
 import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
-	"log"
 	"snd-cli/pkg/cmdutil"
 	"strings"
 
@@ -19,7 +18,7 @@ func NewCmdLogs(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactory c
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {

pkg/cmd/spark/requestStatus.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -15,7 +14,7 @@ func NewCmdRequestStatus(authServiceFactory *cmdutil.AuthServiceFactory, service
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {

pkg/cmd/spark/runtimeInfo.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
 	"github.com/spf13/cobra"
-	"log"
 	"snd-cli/pkg/cmdutil"
 )
 
@@ -17,11 +16,11 @@ func NewCmdRuntimeInfo(authServiceFactory *cmdutil.AuthServiceFactory, serviceFa
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			if err != nil {
 				return err

pkg/cmd/spark/submit.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/SneaksAndData/esd-services-api-client-go/spark"
 	"github.com/spf13/cobra"
-	"log"
 	"os"
 	"snd-cli/pkg/cmd/util/file"
 	"snd-cli/pkg/cmdutil"
@@ -23,11 +22,11 @@ func NewCmdSubmit(authServiceFactory *cmdutil.AuthServiceFactory, serviceFactory
 		RunE: func(cmd *cobra.Command, args []string) error {
 			authService, err := authServiceFactory.CreateAuthService(env, authProvider)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			service, err := serviceFactory.CreateService("spark", env, authService)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			if err != nil {
 				return err

pkg/cmd/upgrade/upgrade.go

@@ -0,0 +1,31 @@
+package upgrade
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"os/exec"
+)
+
+func NewCmdUpgrade() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "upgrade",
+		Short: "Upgrade the CLI to the latest version",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			s, err := upgrade()
+			if err != nil {
+				return err
+			}
+			fmt.Println(s)
+			return nil
+		},
+	}
+	return cmd
+}
+
+func upgrade() (string, error) {
+	c, err := exec.Command("/bin/sh", "../../install.sh").Output()
+	if err != nil {
+		return "", err
+	}
+	return string(c), nil
+}