feat(projects): implement all project commands (#6)

* feat(projects): implement CreateProject function

* refactor(projects): change how config and requests are handled

* fix(projects): fix test using new response format

* feat(projects): add delete command

* feat(projects): add checks for auth and init before commands

* feat(projects): implement deploy command

* refactor(projects): remove useless commands

* feat(projects): implement paastech down command

* feat(projects): implement logs command

* fix(utils): make message type agnostic in errors (string array or string)

* feat(projects): add status command

* feat(projects): add stats to status command

* fix(projects): add check for git repo on init command

* fix(projects): force env var keys to upper case

* feat(projects): add remote on init

* feat(projects): add push command

* fix(projects): change default builder for paketo

Author: noetarbouriech

cmd/account.go

@@ -6,21 +6,25 @@ import (
 
 	"github.com/paastech-cloud/cli/internal/config"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var accountCmd = &cobra.Command{
 	GroupID: "account",
 	Use:     "account",
 	Short:   "Get infos about user account",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		jwt, err := config.ExtractJWTInfos()
+		userCfg, err := config.LoadAuthConfig()
+		if err != nil {
+			return err
+		}
+
+		jwt, err := config.ExtractJWTInfos(userCfg)
 		if err != nil {
 			return err
 		}
 
 		fmt.Println("👤 You are logged in as: " + jwt.Username)
-		fmt.Println("🌐 Server: " + viper.GetString("server"))
+		fmt.Println("🌐 Server: " + userCfg.GetString("server"))
 		timeDiff := jwt.ExpirationTime.Sub(time.Now())
 		if timeDiff > 0 {
 			fmt.Println(

cmd/delete.go

@@ -2,11 +2,10 @@ package cmd
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
 	"os"
 
-	"github.com/go-git/go-git/v5"
+	"github.com/paastech-cloud/cli/internal/config"
 	"github.com/paastech-cloud/cli/pkg/project"
 	"github.com/paastech-cloud/cli/pkg/utils"
 	"github.com/spf13/cobra"
@@ -19,16 +18,34 @@ var deleteCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		fmt.Println("Deleting this project from PaasTech")
 
-		// check if git repo exists
-		git, err := git.PlainOpen(".")
+		userCfg, err := config.LoadAuthConfig()
 		if err != nil {
-			return errors.New("no git repository found in current directory")
+			return err
+		}
+
+		projCfg, err := config.LoadProjectConfig()
+		if err != nil {
+			return err
 		}
 
 		// confirmation
 		stdin := bufio.NewReader(os.Stdin)
 		if utils.ConfirmationPrompt(stdin) {
-			return project.DeleteProject(git)
+			var project project.Project
+			projCfg.UnmarshalKey("project", &project)
+
+			err := project.Delete(userCfg.GetString("server"), userCfg.GetString("jwt"))
+			if err != nil {
+				return err
+			}
+
+			os.Remove("paastech.yaml")
+			if err != nil {
+				return err
+			}
+
+			fmt.Println("Project deleted successfully")
+			return nil
 		}
 
 		return nil

cmd/deploy.go

@@ -1,9 +1,11 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 
-	"github.com/paastech-cloud/cli/pkg/deployment"
+	"github.com/paastech-cloud/cli/internal/config"
+	"github.com/paastech-cloud/cli/pkg/project"
 	"github.com/spf13/cobra"
 )
 
@@ -12,8 +14,37 @@ var deployCmd = &cobra.Command{
 	Use:     "deploy",
 	Short:   "Deploy a project",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		fmt.Print("Deploying project")
-		return deployment.Deploy()
+		fmt.Println("Deploying project to PaaSTech")
+
+		userCfg, err := config.LoadAuthConfig()
+		if err != nil {
+			return err
+		}
+
+		connected, err := config.IsAuthenticated(userCfg)
+		if err != nil {
+			return err
+		}
+		if !connected {
+			return errors.New("Not logged in")
+		}
+
+		projCfg, err := config.LoadProjectConfig()
+		if err != nil {
+			return err
+		}
+
+		var project project.Project
+		projCfg.UnmarshalKey("project", &project)
+
+		err = project.Deploy(userCfg.GetString("server"), userCfg.GetString("jwt"), projCfg.GetStringMapString("env"))
+		if err != nil {
+			return err
+		}
+
+		fmt.Println("Project successfully deployed")
+
+		return nil
 	},
 }
 

cmd/destroy.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/paastech-cloud/cli/internal/config"
+	"github.com/paastech-cloud/cli/pkg/project"
+	"github.com/spf13/cobra"
+)
+
+var downCmd = &cobra.Command{
+	GroupID: "deployment",
+	Use:     "down",
+	Short:   "Stop a deployment",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		fmt.Println("Stopping deployment")
+
+		userCfg, err := config.LoadAuthConfig()
+		if err != nil {
+			return err
+		}
+
+		connected, err := config.IsAuthenticated(userCfg)
+		if err != nil {
+			return err
+		}
+		if !connected {
+			return errors.New("Not logged in")
+		}
+
+		projCfg, err := config.LoadProjectConfig()
+		if err != nil {
+			return err
+		}
+
+		var project project.Project
+		projCfg.UnmarshalKey("project", &project)
+
+		err = project.Down(userCfg.GetString("server"), userCfg.GetString("jwt"))
+		if err != nil {
+			return err
+		}
+
+		fmt.Println("Project successfully stopped")
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(downCmd)
+}

cmd/down.go

@@ -5,23 +5,79 @@ import (
 	"fmt"
 
 	"github.com/go-git/go-git/v5"
+	gitconf "github.com/go-git/go-git/v5/config"
+	"github.com/paastech-cloud/cli/internal/config"
 	"github.com/paastech-cloud/cli/pkg/project"
 	"github.com/spf13/cobra"
 )
 
 var initCmd = &cobra.Command{
 	GroupID: "project",
-	Use:     "init",
+	Use:     "init [Project Name]",
 	Short:   "Initialize a project",
+	Args:    cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		fmt.Println("Initializing a new project")
 
-		git, err := git.PlainOpen(".")
+		// Check if current directory is a git repo
+		repo, err := git.PlainOpen(".")
 		if err != nil {
-			return errors.New("no git repository found in current directory")
+			return errors.New("No git repository found in current directory")
 		}
 
-		return project.InitProject(git)
+		// Load User config
+		userCfg, err := config.LoadAuthConfig()
+		if err != nil {
+			return err
+		}
+
+		// Check if user is authenticated
+		connected, err := config.IsAuthenticated(userCfg)
+		if err != nil {
+			return err
+		}
+		if !connected {
+			return errors.New("Not logged in")
+		}
+
+		// Check if project exists
+		if config.ProjectExists() {
+			return errors.New("Project already exists")
+		}
+
+		// Create project
+		project, err := project.CreateProject(userCfg.GetString("server"), userCfg.GetString("jwt"), args[0])
+		if err != nil {
+			return err
+		}
+
+		// Create project conf
+		err = config.CreateProjectConfig()
+		if err != nil {
+			return err
+		}
+
+		// Load project config
+		projCfg, err := config.LoadProjectConfig()
+		if err != nil {
+			return err
+		}
+
+		// Write config
+		projCfg.Set("project", project)
+		projCfg.WriteConfig()
+
+		// Add remote for paastech push
+		_, err = repo.CreateRemote(&gitconf.RemoteConfig{
+			Name: "paastech",
+			URLs: []string{"ssh://git.paastech.cloud:8080/" + project.Id},
+		})
+		if err != nil {
+			return err
+		}
+
+		fmt.Println("Project " + project.Name + " created.")
+		return nil
 	},
 }
 

cmd/env.go

@@ -54,13 +54,16 @@ var loginCmd = &cobra.Command{
 		}
 
 		// Load auth config
-		err = config.LoadAuthConfig()
+		userCfg, err := config.LoadAuthConfig()
 		if err != nil {
 			return err
 		}
 
 		// Save jwt in auth conf
-		config.SetAuth(server, jwt)
+		userCfg.Set("server", server)
+		userCfg.Set("jwt", jwt)
+		userCfg.WriteConfig()
+
 		fmt.Println("✅ Login successful")
 
 		return nil

cmd/init.go

@@ -10,17 +10,19 @@ import (
 var logoutCmd = &cobra.Command{
 	GroupID: "account",
 	Use:     "logout",
-	Short:   "Log out from PaaSTech.cloud",
-	Long:    "Log out from PaaSTech.cloud",
+	Short:   "Log out from PaaSTech",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		// Load auth config
-		err := config.LoadAuthConfig()
+		userCfg, err := config.LoadAuthConfig()
 		if err != nil {
 			return err
 		}
 
 		// Save empty jwt in auth conf
-		config.SetAuth("", "")
+		userCfg.Set("server", "")
+		userCfg.Set("jwt", "")
+		userCfg.WriteConfig()
+
 		fmt.Println("🚪 Logging out")
 
 		return nil