Merge pull request #64 from bunnyshell/environ-groups

Environ groups

.github/workflows/audit.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
 
       - name: Download dependencies
         run: go mod download

.github/workflows/release.yaml

@@ -29,7 +29,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3

cmd/root.go

@@ -19,6 +19,7 @@ import (
 	"bunnyshell.com/cli/cmd/template"
 	"bunnyshell.com/cli/cmd/utils"
 	"bunnyshell.com/cli/cmd/variable"
+	"bunnyshell.com/cli/cmd/variable_group"
 	"bunnyshell.com/cli/cmd/version"
 	"bunnyshell.com/cli/pkg/build"
 	"bunnyshell.com/cli/pkg/config"
@@ -96,6 +97,7 @@ func init() {
 			project_variable.GetMainCommand(),
 			registry_integration.GetMainCommand(),
 			variable.GetMainCommand(),
+			variable_group.GetMainCommand(),
 			k8sIntegration.GetMainCommand(),
 			pipeline.GetMainCommand(),
 			secret.GetMainCommand(),

cmd/variable_group/action/create.go

@@ -0,0 +1,81 @@
+package action
+
+import (
+	"io"
+	"os"
+
+	"bunnyshell.com/cli/pkg/api/variable_group"
+	"bunnyshell.com/cli/pkg/config"
+	"bunnyshell.com/cli/pkg/lib"
+	"bunnyshell.com/cli/pkg/util"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	options := config.GetOptions()
+	settings := config.GetSettings()
+
+	createOptions := variable_group.NewCreateOptions()
+
+	command := &cobra.Command{
+		Use: "create",
+
+		ValidArgsFunction: cobra.NoFileCompletions,
+
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			hasStdin, err := util.IsStdinPresent()
+			if err != nil {
+				return err
+			}
+
+			flags := cmd.Flags()
+			if !flags.Changed("value") && !hasStdin {
+				return errMissingValue
+			}
+
+			if flags.Changed("value") && hasStdin {
+				return errMultipleValueInputs
+			}
+
+			return nil
+		},
+
+		RunE: func(cmd *cobra.Command, args []string) error {
+			createOptions.Environment = settings.Profile.Context.Environment
+
+			hasStdin, err := util.IsStdinPresent()
+			if err != nil {
+				return err
+			}
+
+			if hasStdin {
+				buf, err := io.ReadAll(os.Stdin)
+				if err != nil {
+					return err
+				}
+
+				createOptions.Value = string(buf)
+			}
+
+			model, err := variable_group.Create(createOptions)
+			if err != nil {
+				return lib.FormatCommandError(cmd, err)
+			}
+
+			return lib.FormatCommandData(cmd, model)
+		},
+	}
+
+	flags := command.Flags()
+
+	flags.AddFlag(options.Environment.AddFlagWithExtraHelp(
+		"environment",
+		"Environment for the variable",
+		"Environments contain multiple variables",
+		util.FlagRequired,
+	))
+
+	createOptions.UpdateFlagSet(flags)
+
+	mainCmd.AddCommand(command)
+}

cmd/variable_group/action/delete.go

@@ -0,0 +1,34 @@
+package action
+
+import (
+	"bunnyshell.com/cli/pkg/api/variable_group"
+	"bunnyshell.com/cli/pkg/lib"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	deleteOptions := variable_group.NewDeleteOptions()
+
+	command := &cobra.Command{
+		Use: "delete",
+
+		ValidArgsFunction: cobra.NoFileCompletions,
+
+		RunE: func(cmd *cobra.Command, args []string) error {
+			err := variable_group.Delete(deleteOptions)
+			if err != nil {
+				return lib.FormatCommandError(cmd, err)
+			}
+
+			cmd.Printf("\nGrouped environment variable %s successfully deleted\n", deleteOptions.ID)
+
+			return nil
+		},
+	}
+
+	flags := command.Flags()
+
+	flags.AddFlag(GetIDOption(&deleteOptions.ID).GetRequiredFlag("id"))
+
+	mainCmd.AddCommand(command)
+}

cmd/variable_group/action/edit.go

@@ -0,0 +1,70 @@
+package action
+
+import (
+	"io"
+	"os"
+
+	"bunnyshell.com/cli/pkg/api/variable_group"
+	"bunnyshell.com/cli/pkg/lib"
+	"bunnyshell.com/cli/pkg/util"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	editOptions := variable_group.NewEditOptions("")
+
+	command := &cobra.Command{
+		Use: "edit",
+
+		ValidArgsFunction: cobra.NoFileCompletions,
+
+		PreRunE: func(cmd *cobra.Command, _ []string) error {
+			hasStdin, err := util.IsStdinPresent()
+			if err != nil {
+				return err
+			}
+
+			flags := cmd.Flags()
+			if flags.Changed("value") && hasStdin {
+				return errMultipleValueInputs
+			}
+
+			return nil
+		},
+
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			flags := cmd.Flags()
+			if flags.Changed("value") {
+				editOptions.EnvironItemEditAction.SetValue(flags.Lookup("value").Value.String())
+			}
+
+			hasStdin, err := util.IsStdinPresent()
+			if err != nil {
+				return err
+			}
+
+			if hasStdin {
+				buf, err := io.ReadAll(os.Stdin)
+				if err != nil {
+					return err
+				}
+
+				editOptions.EnvironItemEditAction.SetValue(string(buf))
+			}
+
+			model, err := variable_group.Edit(editOptions)
+			if err != nil {
+				return lib.FormatCommandError(cmd, err)
+			}
+
+			return lib.FormatCommandData(cmd, model)
+		},
+	}
+
+	flags := command.Flags()
+
+	flags.AddFlag(GetIDOption(&editOptions.ID).GetRequiredFlag("id"))
+	editOptions.UpdateFlagSet(flags)
+
+	mainCmd.AddCommand(command)
+}

cmd/variable_group/action/root.go

@@ -0,0 +1,34 @@
+package action
+
+import (
+	"errors"
+	"fmt"
+
+	"bunnyshell.com/cli/pkg/build"
+	"bunnyshell.com/cli/pkg/config/option"
+	"github.com/spf13/cobra"
+)
+
+var (
+	errMissingValue        = errors.New("the plain value must be provided")
+	errMultipleValueInputs = errors.New("the value must be provided either by argument or by stdin, not both")
+)
+
+var mainCmd = &cobra.Command{}
+
+func GetMainCommand() *cobra.Command {
+	return mainCmd
+}
+
+func GetIDOption(value *string) *option.String {
+	help := fmt.Sprintf(
+		`Find available environment variables with "%s variables list"`,
+		build.Name,
+	)
+
+	idOption := option.NewStringOption(value)
+
+	idOption.AddFlagWithExtraHelp("id", "Environment Variable Id", help)
+
+	return idOption
+}

cmd/variable_group/list.go

@@ -0,0 +1,39 @@
+package variable_group
+
+import (
+	"bunnyshell.com/cli/pkg/api/variable_group"
+	"bunnyshell.com/cli/pkg/config"
+	"bunnyshell.com/cli/pkg/lib"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	options := config.GetOptions()
+	settings := config.GetSettings()
+
+	listOptions := variable_group.NewListOptions()
+
+	command := &cobra.Command{
+		Use: "list",
+
+		ValidArgsFunction: cobra.NoFileCompletions,
+
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			listOptions.Organization = settings.Profile.Context.Organization
+			listOptions.Environment = settings.Profile.Context.Environment
+
+			return lib.ShowCollection(cmd, listOptions, func() (lib.ModelWithPagination, error) {
+				return variable_group.List(listOptions)
+			})
+		},
+	}
+
+	flags := command.Flags()
+
+	flags.AddFlag(options.Organization.GetFlag("organization"))
+	flags.AddFlag(options.Environment.GetFlag("environment"))
+
+	listOptions.UpdateFlagSet(flags)
+
+	mainCmd.AddCommand(command)
+}

cmd/variable_group/root.go

@@ -0,0 +1,33 @@
+package variable_group
+
+import (
+	"bunnyshell.com/cli/cmd/variable_group/action"
+	"bunnyshell.com/cli/pkg/config"
+	"bunnyshell.com/cli/pkg/util"
+	"github.com/spf13/cobra"
+)
+
+var mainCmd = &cobra.Command{
+	Use:     "variables-groups",
+	Aliases: []string{"variables-group", "var-groups", "var-group", "var-g"},
+
+	Short: "Grouped Environment Variables",
+	Long:  "Bunnyshell Environment Variables in Groups",
+}
+
+func init() {
+	config.MainManager.CommandWithAPI(mainCmd)
+
+	util.AddGroupedCommands(
+		mainCmd,
+		cobra.Group{
+			ID:    "actions",
+			Title: "Commands for Environment Variables:",
+		},
+		action.GetMainCommand().Commands(),
+	)
+}
+
+func GetMainCommand() *cobra.Command {
+	return mainCmd
+}

cmd/variable_group/show.go

@@ -0,0 +1,33 @@
+package variable_group
+
+import (
+	"bunnyshell.com/cli/cmd/variable/action"
+	"bunnyshell.com/cli/pkg/api/variable_group"
+	"bunnyshell.com/cli/pkg/lib"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	itemOptions := variable_group.NewItemOptions("")
+
+	command := &cobra.Command{
+		Use: "show",
+
+		ValidArgsFunction: cobra.NoFileCompletions,
+
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			model, err := variable_group.Get(itemOptions)
+			if err != nil {
+				return lib.FormatCommandError(cmd, err)
+			}
+
+			return lib.FormatCommandData(cmd, model)
+		},
+	}
+
+	flags := command.Flags()
+
+	flags.AddFlag(action.GetIDOption(&itemOptions.ID).GetRequiredFlag("id"))
+
+	mainCmd.AddCommand(command)
+}

go.mod

@@ -1,14 +1,14 @@
 module bunnyshell.com/cli
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.3
+toolchain go1.23.2
 
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
 
 require (
 	bunnyshell.com/dev v0.6.0
-	bunnyshell.com/sdk v0.19.2
+	bunnyshell.com/sdk v0.20.0
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/avast/retry-go/v4 v4.6.0

go.sum

@@ -1,7 +1,7 @@
 bunnyshell.com/dev v0.6.0 h1:JywvLrzxYKgnxegPByh+ET7CwFme6JVeJpWzRuqQTWc=
 bunnyshell.com/dev v0.6.0/go.mod h1:+Xk46UXX9AW0nHrFMdO/IwpUPfALrck1/qI+LIXsDmE=
-bunnyshell.com/sdk v0.19.2 h1:HcwwD4Pv8itkHtZCxowQMIx+9bIzQedTnlZ9WpBwaTQ=
-bunnyshell.com/sdk v0.19.2/go.mod h1:RfgfUzZ4WHZGCkToUfu2/hoQS6XsQc8IdPTVAlpS138=
+bunnyshell.com/sdk v0.20.0 h1:xcoDn0x1JqexMy5vYGqTBK4DGdY3juc+5DU7vb1yFeA=
+bunnyshell.com/sdk v0.20.0/go.mod h1:RfgfUzZ4WHZGCkToUfu2/hoQS6XsQc8IdPTVAlpS138=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=