Merge pull request #1 from brevdev/implement-auth-cmd

auth: add auth commands

Author: ishandhanani

.gitignore

@@ -0,0 +1 @@
+nvcf

Makefile

@@ -12,7 +12,7 @@ GOFILES=$(shell find . -name '*.go' -not -path "./vendor/*")
 # Linting
 GOLINT=golangci-lint
 
-.PHONY: all build clean test vet lint fmt quickbuild
+.PHONY: all build clean test vet lint fmt q
 
 all: build
 
@@ -48,6 +48,6 @@ build-all:
 	GOOS=darwin GOARCH=amd64 $(GOBUILD) -o $(BINARY_NAME)-darwin-amd64
 	GOOS=windows GOARCH=amd64 $(GOBUILD) -o $(BINARY_NAME)-windows-amd64.exe
 
-quickbuild:
+q:
 	make clean
 	make build

cmd/auth.go

@@ -1,6 +1,9 @@
 package cmd
 
 import (
+	"errors"
+	"fmt"
+	"os"
 	"os/exec"
 	"strings"
 
@@ -13,11 +16,21 @@ func AuthCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "auth",
 		Short: "Manage authentication for the CLI",
+		Long:  `Authenticate with NVIDIA Cloud and configure the CLI to use your API key.`,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			config.Init()
+			// Allow all 'auth' subcommands to run without authentication
+			if cmd.Parent().Name() != "auth" && !config.IsAuthenticated() {
+				fmt.Println("You are not authenticated. Please run 'nvcf auth login' first.")
+				os.Exit(1)
+			}
+		},
 	}
 
 	cmd.AddCommand(authLoginCmd())
-	// cmd.AddCommand(authLogoutCmd())
-	// cmd.AddCommand(authStatusCmd())
+	cmd.AddCommand(authLogoutCmd())
+	cmd.AddCommand(authStatusCmd())
+	cmd.AddCommand(authConfigureDockerCmd())
 
 	return cmd
 }
@@ -48,7 +61,12 @@ func authConfigureDockerCmd() *cobra.Command {
 				output.Error(cmd, "NGC API key not found. Please run 'nvcf auth login' first.", nil)
 				return
 			}
-			// TODO: check for 'docker'
+			// Check if Docker is installed
+			_, err := exec.LookPath("docker")
+			if err != nil {
+				output.Error(cmd, "Docker is not installed or not in the system PATH", err)
+				return
+			}
 			// TODO: check for existing nvcr.io config?
 			dockerCmd := exec.Command("docker", "login", "nvcr.io", "-u", "$oauthtoken", "--password-stdin")
 			dockerCmd.Stdin = strings.NewReader(apiKey)
@@ -64,4 +82,31 @@ func authConfigureDockerCmd() *cobra.Command {
 	}
 }
 
-// Implement authLogoutCmd and authStatusCmd here
+func authStatusCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "status",
+		Short: "Check the authentication status",
+		Run: func(cmd *cobra.Command, args []string) {
+			if config.IsAuthenticated() {
+				output.Success(cmd, "Authenticated")
+			} else {
+				output.Error(cmd, "Not authenticated", errors.New(":("))
+			}
+		},
+	}
+}
+
+func authLogoutCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "logout",
+		Short: "Logout from NVIDIA Cloud",
+		Run: func(cmd *cobra.Command, args []string) {
+			if !config.IsAuthenticated() {
+				output.Info(cmd, "You are currently not logged in")
+				return
+			}
+			config.ClearAPIKey()
+			output.Success(cmd, "Logged out successfully")
+		},
+	}
+}

config/config.go

@@ -13,13 +13,13 @@ type Config struct {
 var cfg Config
 
 func Init() {
-	configDir, err := os.UserConfigDir()
+	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		panic(err)
 	}
 
 	// TODO: consider more robust config loading here
-	configPath := filepath.Join(configDir, "nvcf", "config.json")
+	configPath := filepath.Join(homeDir, ".nvcf", "config.json")
 	data, err := os.ReadFile(configPath)
 	if err == nil {
 		json.Unmarshal(data, &cfg)
@@ -51,23 +51,23 @@ func IsAuthenticated() bool {
 	return cfg.APIKey != ""
 }
 
-// todo: consider reaching for more secret-specific storage.
+// save to ~/.nvcf/config.json
 func saveConfig() error {
-	configDir, err := os.UserConfigDir()
+	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		return err
 	}
 
-	configPath := filepath.Join(configDir, "nvcf", "config.json")
+	configPath := filepath.Join(homeDir, ".nvcf", "config.json")
 	data, err := json.MarshalIndent(cfg, "", "  ")
 	if err != nil {
 		return err
 	}
 
-	err = os.MkdirAll(filepath.Dir(configPath), 0755)
+	err = os.MkdirAll(filepath.Dir(configPath), 0700)
 	if err != nil {
 		return err
 	}
 
-	return os.WriteFile(configPath, data, 0644)
+	return os.WriteFile(configPath, data, 0600)
 }

main.go

@@ -26,7 +26,7 @@ func main() {
 	// rootCmd.AddCommand(cmd.DeploymentCmd())
 	// rootCmd.AddCommand(cmd.InvokeCmd())
 	// rootCmd.AddCommand(cmd.AssetCmd())
-	// rootCmd.AddCommand(cmd.AuthCmd())
+	rootCmd.AddCommand(cmd.AuthCmd())
 	// rootCmd.AddCommand(cmd.QueueCmd())
 	// rootCmd.AddCommand(cmd.ClusterGroupCmd())
 	// rootCmd.AddCommand(cmd.ConfigCmd())