Add Push Command (#1)

* add reading of secrets from user-secrets list

* add tests for reading secrets buffer and parsing to secrets

* add api to create resource in a folder

* fix issue with password being set as the key when creating resource

* update folder searching to get folders by exact name to fix issues with false positives

* add ability to update secrets in folder

* add env file support for pushing

* add foldername arg to the usage

* add a secrets fetcher interface that is used to fetch secrets from dotnet or a env file

* add CommandContext to quickly spin up and get information about the command being ran

* refactor secrets into different package

* update readme with updated documentation

---------

Co-authored-by: Chad Smith <smith.chad12@gmail.com>

Author: chadsmith12

README.md

@@ -1,11 +1,11 @@
 
 # Overview
 
-Dotsec is a command-line interface (CLI) tool written in Go to simplify the process of downloading secrets from Passbolt during development for your project. It is designed to streamline the sharing of secrets within your team, supporting either `dotnet user-secrets` or a `.env` file as the storage mechanism.
+Dotsec is a command-line interface (CLI) tool written in Go to simplify the process of downloading secrets from a password/secretmanager during development for your project. It is designed to streamline the sharing of secrets within your team, supporting either `dotnet user-secrets` or a `.env` file as the storage mechanism.
 
 ## Installation
 
-You can install Dotsec by downloading the latest release from the [Releases](https://github.com/chadsmith12/dotsec/releases) or by building it from source. Make sure to add the Dotsec binary to your system's PATH for easy access.
+You can install Dotsec by downloading the latest release from the [Releases](https://github.com/chadsmith12/dotsec/releases) or by building it from source. Make sure to add the `dotsec` binary to your system's PATH for easy access.
 
 ```shell
 # Install Dotsec from source
@@ -15,35 +15,60 @@ go build
 mv dotsec /usr/local/bin/ # Move to a directory in your PATH
 ```
 
+## Supported Secret/Password Managers
+
+Currently `dotsec` only supports Passbolt, though it could be expanded in the future to support other secret/password managers.
+
 ## Configuration
 
-Before using Dotsec, you need to configure it by providing the Passbolt server details, your private key file, and an optional password. You can configure Dotsec using the following command:
+Before using `dotsec`, you need to configure it by providing the Passbolt server details, your private key file, and an optional password. You can configure `dotsec` using the following command:
 
 ```shell
 dotsec configure
 ```
 
-This command will prompt you for the Passbolt server URL, private key file path, and password. If you leave the password blank, Dotsec will prompt you for it each time it is required.
+This command will prompt you for the Passbolt server URL, private key file path, and password. If you leave the password blank, `dotsec` will prompt you for it each time it is required.
 
 ## Basic Usage
 
-The basic usage of Dotsec involves using the `pull` command to retrieve secrets and save them to either a `dotnet user-secrets` file or a `.env` file. Here's a simple example:
+`dotsec` has two main commands/usages that you will use to manager your secrets for development. When interacting with Passbolt your secrets must be stored in a folder.
+
+* `pull` - This command will retrieve secrets from your secret/password manager and save them to the current secret type you're using (`dotsec user-secrets` or a `.env` file).
+* `push` - This command will push secrets from your secret type (`dotnet user-secrets` or `.env` file) to the secret/password manager. Use it to add/update secrets in your secret manager.
+
+### Basic `pull`
+
+The basic usage of `dotsec` involves using the `pull` command to retrieve secrets and save them to either a `dotnet user-secrets` file or a `.env` file. Here's a simple example:
 
 ```shell
 dotsec pull "mysecrets"
 ```
 
-This command pulls secrets from the "mysecrets" folder from Passbolt and then runs `dotnet user-secrets set` for each secret found.
+This command pulls secrets from the "mysecrets" folder from Passbolt and then runs `dotnet user-secrets set` for each secret found. Not supplying a flag for the type will default to `dotnet user-secrets`
+
+### Basic `push`
+
+The basic usage of `dotsec` and the `push` command allows you to quickly push up newly created or updated secrets to your secret manager. Just like the `pull` command it will default to `dotnet user-secrets`.
+
+```shell
+dotsec push "mysecrets"
+```
 
 ## Advanced Usage
 
 ### Pull Command
 
-The `pull` command retrieves secrets from Passbolt and saves them to the env type. It accepts the following arguments and flags:
+The `pull` command retrieves secrets from Passbolt and saves them to the env type. It takes the folder name in your secret manager as the first argument:
+
+- `folder name` (required): The name of the Passbolt folder containing the secrets you want to retrieve.
+
+### Push Command
+
+The `push` command create or updates secrets inside of your secret manager from your current secrets type. It takes the folder name in your secret manager as the first argument:
 
 - `folder name` (required): The name of the Passbolt folder containing the secrets you want to retrieve.
 
-Flags:
+Both the `pull` and `push` commands take the following flags:
 
 - `--project (-p)` (optional): The path to the dotnet project where you want to sync the secrets. Defaults to the current directory. This flag is only valid with `--type dotnet`.
 
@@ -69,4 +94,10 @@ dotsec pull "mysecrets" --file .env.development --type env
 
 This command retrieves secrets from the "mysecrets" folder in Passbolt and saves them to the custom `.env` file named ".env.development" in the current directory.
 
+#### Push secrets from a dotnet project:
+
+```shell
+dotsec push "mysecrets" --project /path/to/dotnet/project --type dotnet
+```
 
+This command will update the secrets inside of the "mysecrets" folder from the secrets that the dotnet project, in the project directory specified.

cmd/pull.go

@@ -6,16 +6,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/chadsmith12/dotsec/dotnet"
-	"github.com/chadsmith12/dotsec/env"
-	"github.com/chadsmith12/dotsec/input"
-	"github.com/chadsmith12/dotsec/passbolt"
+	"github.com/chadsmith12/dotsec/cmdcontext"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
-var validEnvironments = []string {"dotnet", "env"}
-
 // pullCmd represents the sync command
 var pullCmd = &cobra.Command{
 	Use:   "pull",
@@ -51,75 +45,13 @@ func pullRun(cmd *cobra.Command, args []string) {
 	folderName := args[0]
 	ctx, cancel := context.WithTimeout(context.Background(), 30 * time.Second)
 	defer cancel()
-	server, keyFile, password := getConfiguration()
-	keyData, err := os.ReadFile(keyFile)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to read key file: ", err)
-		os.Exit(1)
-	}
+	cmdContext := cmdcontext.NewCommandContext(cmd)
 
-	client, err := passbolt.NewClient(ctx, server, string(keyData), password)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to create api client: ", err)
-		os.Exit(1)
-	}
-
-	err = client.Login()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Failed to login to Passbolt: ", err)
-		os.Exit(1)
-	}
-
-	secrets, err := client.GetSecretsByFolder(folderName);
+	secrets, err := cmdContext.UserClient(ctx).GetSecretsByFolder(folderName);
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Failed to retrieve folder: ", err)
 		os.Exit(1)
 	}
 
-	envType, _ := cmd.Flags().GetString("type")
-	setSecrectsForType(cmd, envType, secrets)	
-}
-
-func setSecrectsForType(cmd *cobra.Command, envType string, secrets []passbolt.SecretData ) {
-	if envType == "dotnet" {
-		project, _ := cmd.Flags().GetString("project")
-		if err := dotnet.InitSecrets(project); err != nil {
-			os.Exit(1)
-		}
-		for _, secret := range secrets {
-			dotnet.SetSecret(project, secret.Key, secret.Value)
-		}
-	} else if (envType == "env") {
-		envFile, _ := cmd.Flags().GetString("file")
-		err := env.SetSecrets(envFile, secrets)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Failed to set secrets: ", err)
-			os.Exit(1)
-		}
-	} else {
-		fmt.Println("Invalid type detected. The current valid environments supported are dotnet, and env.")
-		os.Exit(1)
-	}
-}
-
-func getConfiguration() (string, string, string) {
-	server:= viper.GetViper().GetString("server")
-	if server == "" {
-		fmt.Fprint(os.Stderr, "Server is not configured. Run the configure command, use the --server flag, or environment variable to set the server\n")
-		os.Exit(1)
-	}
-
-	privateKey := viper.GetViper().GetString("privateKey")
-	if privateKey == "" {
-		fmt.Fprint(os.Stderr, "privateKey is not configured. Run the configure command, use the --privateKey flag, or environment variable to set it to a valid private key file to load.\n")
-		os.Exit(1)
-	}
-
-	password := viper.GetViper().GetString("password")
-	if password == "" {
-		password, _ = input.PromptUser("Master Password: ", true)
-		fmt.Printf("\n")
-	}
-
-	return server, privateKey, password
+	cmdContext.SecretsSetter().SetSecrets(secrets)
 }

cmd/push.go

@@ -0,0 +1,80 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/chadsmith12/dotsec/cmdcontext"
+	"github.com/chadsmith12/dotsec/passbolt"
+	"github.com/chadsmith12/dotsec/secrets"
+	"github.com/passbolt/go-passbolt/api"
+	"github.com/spf13/cobra"
+)
+
+// pushCmd represents the push command
+var pushCmd = &cobra.Command{
+	Use:   "push foldername",
+	Short: "Pushes alll the secrets into your file to the secret manager",
+	Long: `Pushes the secrets from the folder specified and saves them to your secret manager folder. There are two types: dotnet or env.
+		dotnet - Uses dotnet user-secrets to set the secrets in your dotnet projects secrets.json file.
+		env - Saves the secrets to the .env file. 
+
+		If you do not specify the --project flag, then it will attempt to use your current working directory.
+		You can specify the project directory for the secrets to try to be read `,
+	Example: "dotsec push FolderName --project ./api",
+	Run: pushRun,
+}
+
+func init() {
+	rootCmd.AddCommand(pushCmd)
+	pushCmd.Flags().StringP("project", "p", "", "The path to the dotnet project to sync the secrets to. Default to the current directory. Only valid with --type dotnet.")
+	pushCmd.Flags().StringP("file", "f", ".env", "The env file you want to save the secrets to. Default to .env in the current directory. Only valid with --type env.")
+	pushCmd.Flags().String("type", "dotnet", "The type of secrets file you want to use. dotnet to use dotnet user-secrets or env to use a .env file.")
+}
+
+func pushRun(cmd *cobra.Command, args []string) {
+	if len(args) == 0 {
+		fmt.Println("Specify a folder to download secrets from")
+		os.Exit(1)
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	cmdCtx := cmdcontext.NewCommandContext(cmd)
+	client := cmdCtx.UserClient(ctx) 
+	folderName := args[0]
+	folder, err := client.GetFolderWithResources(folderName)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error - Using folder: %s - %v\n", folderName, err)
+		os.Exit(1)
+	}
+
+	secretsData, err := cmdCtx.SecretsFetcher().FetchSecrets() 
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error - Fetching Secrets: %v\n", err)
+	}
+	pushSecrets(secretsData, client, folder)
+}
+
+func pushSecrets(secretsData []secrets.SecretData, client *passbolt.PassboltApi, folder api.Folder) {
+	for _, value := range secretsData {
+		if id, ok := containsSecret(folder, value.Key); ok {
+			client.UpdateSecret(id, value)
+		} else {
+			client.CreateSecretInFolder(folder.ID, value)
+		}
+	}
+}
+
+func containsSecret(folder api.Folder, key string) (string, bool) {
+	for _, resource := range folder.ChildrenResources {
+		if resource.Name == key {
+			return resource.ID, true
+		}
+	}
+
+	return "", false
+}
+

cmd/root.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (

cmd/test.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (