chore: merge main and fix conflicts

cmd/add.go

@@ -22,13 +22,23 @@ var addNotificationCmd = &cobra.Command{
 	},
 }
 
+var addOrganizationCmd = &cobra.Command{
+	Use:     "organization",
+	Aliases: []string{"o"},
+	Short:   "Add an organization, or add a group/project to an organization",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		validateToken(lagoonCLIConfig.Current) // get a new token if the current one is invalid
+	},
+}
+
 func init() {
 	addCmd.AddCommand(addDeployTargetCmd)
 	addCmd.AddCommand(addGroupCmd)
 	addCmd.AddCommand(addProjectCmd)
 	addCmd.AddCommand(addProjectToGroupCmd)
 	addCmd.AddCommand(addNotificationCmd)
 	addCmd.AddCommand(addUserCmd)
+	addCmd.AddCommand(addOrganizationCmd)
 	addCmd.AddCommand(addUserToGroupCmd)
 	addCmd.AddCommand(addUserSSHKeyCmd)
 	addCmd.AddCommand(addVariableCmd)

cmd/delete.go

@@ -22,6 +22,15 @@ var deleteNotificationCmd = &cobra.Command{
 	},
 }
 
+var deleteOrganizationCmd = &cobra.Command{
+	Use:     "organization",
+	Aliases: []string{"o"},
+	Short:   "Add an organization, or add a group/project to an organization",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		validateToken(lagoonCLIConfig.Current) // get a new token if the current one is invalid
+	},
+}
+
 func init() {
 	deleteCmd.AddCommand(deleteEnvCmd)
 	deleteCmd.AddCommand(deleteGroupCmd)
@@ -34,4 +43,5 @@ func init() {
 	deleteCmd.AddCommand(deleteUserFromGroupCmd)
 	deleteCmd.AddCommand(deleteVariableCmd)
 	deleteCmd.AddCommand(deleteDeployTargetConfigCmd)
+	deleteCmd.AddCommand(deleteOrganizationCmd)
 }

cmd/deploytarget.go

@@ -3,12 +3,15 @@ package cmd
 import (
 	"context"
 	"fmt"
-
 	"github.com/spf13/cobra"
 	"github.com/uselagoon/lagoon-cli/internal/lagoon"
 	"github.com/uselagoon/lagoon-cli/internal/lagoon/client"
 	"github.com/uselagoon/lagoon-cli/internal/schema"
 	"github.com/uselagoon/lagoon-cli/pkg/output"
+	l "github.com/uselagoon/machinery/api/lagoon"
+	lclient "github.com/uselagoon/machinery/api/lagoon/client"
+	s "github.com/uselagoon/machinery/api/schema"
+	"strconv"
 )
 
 var addDeployTargetCmd = &cobra.Command{
@@ -319,6 +322,121 @@ var deleteDeployTargetCmd = &cobra.Command{
 	},
 }
 
+var addDeployTargetToOrganizationCmd = &cobra.Command{
+	Use:     "deploytarget",
+	Aliases: []string{"dt"},
+	Short:   "Add a deploy target to an Organization",
+	PreRunE: func(_ *cobra.Command, _ []string) error {
+		return validateTokenE(lagoonCLIConfig.Current)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		debug, err := cmd.Flags().GetBool("debug")
+		handleError(err)
+
+		organizationName, err := cmd.Flags().GetString("name")
+		if err != nil {
+			return err
+		}
+		if err := requiredInputCheck("Organization name", organizationName); err != nil {
+			return err
+		}
+		deployTarget, err := cmd.Flags().GetUint("deploy-target")
+		if err != nil {
+			return err
+		}
+		if err := requiredInputCheck("Deploy Target", strconv.Itoa(int(deployTarget))); err != nil {
+			return err
+		}
+
+		current := lagoonCLIConfig.Current
+		token := lagoonCLIConfig.Lagoons[current].Token
+		lc := lclient.New(
+			lagoonCLIConfig.Lagoons[current].GraphQL,
+			lagoonCLIVersion,
+			&token,
+			debug)
+
+		organization, err := l.GetOrganizationByName(context.TODO(), organizationName, lc)
+		handleError(err)
+
+		deployTargetInput := s.AddDeployTargetToOrganizationInput{
+			DeployTarget: deployTarget,
+			Organization: organization.ID,
+		}
+
+		deployTargetResponse, err := l.AddDeployTargetToOrganization(context.TODO(), &deployTargetInput, lc)
+		handleError(err)
+
+		resultData := output.Result{
+			Result: "success",
+			ResultData: map[string]interface{}{
+				"Deploy Target":     deployTargetResponse.Name,
+				"Organization Name": organizationName,
+			},
+		}
+		output.RenderResult(resultData, outputOptions)
+		return nil
+	},
+}
+
+var RemoveDeployTargetFromOrganizationCmd = &cobra.Command{
+	Use:     "deploytarget",
+	Aliases: []string{"dt"},
+	Short:   "Remove a deploy target from an Organization",
+	PreRunE: func(_ *cobra.Command, _ []string) error {
+		return validateTokenE(lagoonCLIConfig.Current)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		debug, err := cmd.Flags().GetBool("debug")
+		handleError(err)
+
+		organizationName, err := cmd.Flags().GetString("name")
+		if err != nil {
+			return err
+		}
+		if err := requiredInputCheck("Organization name", organizationName); err != nil {
+			return err
+		}
+		deployTarget, err := cmd.Flags().GetUint("deploy-target")
+		if err != nil {
+			return err
+		}
+		if err := requiredInputCheck("Deploy Target", strconv.Itoa(int(deployTarget))); err != nil {
+			return err
+		}
+
+		current := lagoonCLIConfig.Current
+		token := lagoonCLIConfig.Lagoons[current].Token
+		lc := lclient.New(
+			lagoonCLIConfig.Lagoons[current].GraphQL,
+			lagoonCLIVersion,
+			&token,
+			debug)
+
+		organization, err := l.GetOrganizationByName(context.TODO(), organizationName, lc)
+		handleError(err)
+
+		deployTargetInput := s.RemoveDeployTargetFromOrganizationInput{
+			DeployTarget: deployTarget,
+			Organization: organization.ID,
+		}
+
+		if yesNo(fmt.Sprintf("You are attempting to remove deploy target '%d' from organization '%s', are you sure?", deployTarget, organization.Name)) {
+			_, err := l.RemoveDeployTargetFromOrganization(context.TODO(), &deployTargetInput, lc)
+			handleError(err)
+			resultData := output.Result{
+				Result: "success",
+				ResultData: map[string]interface{}{
+					"Deploy Target":     deployTarget,
+					"Organization Name": organizationName,
+				},
+			}
+			output.RenderResult(resultData, outputOptions)
+		}
+		return nil
+	},
+}
+
 func init() {
 	addDeployTargetCmd.Flags().UintP("id", "", 0, "ID of the DeployTarget")
 	addDeployTargetCmd.Flags().StringP("name", "", "", "Name of DeployTarget")
@@ -332,9 +450,15 @@ func init() {
 	addDeployTargetCmd.Flags().StringP("ssh-port", "", "", "DeployTarget ssh port")
 	addDeployTargetCmd.Flags().StringP("build-image", "", "", "DeployTarget build image to use (if different to the default)")
 
+	addDeployTargetToOrganizationCmd.Flags().StringP("name", "O", "", "Name of Organization")
+	addDeployTargetToOrganizationCmd.Flags().UintP("deploy-target", "D", 0, "ID of DeployTarget")
+
 	deleteDeployTargetCmd.Flags().UintP("id", "", 0, "ID of the DeployTarget")
 	deleteDeployTargetCmd.Flags().StringP("name", "", "", "Name of DeployTarget")
 
+	RemoveDeployTargetFromOrganizationCmd.Flags().StringP("name", "O", "", "Name of Organization")
+	RemoveDeployTargetFromOrganizationCmd.Flags().UintP("deploy-target", "D", 0, "ID of DeployTarget")
+
 	updateDeployTargetCmd.Flags().UintP("id", "", 0, "ID of the DeployTarget")
 	updateDeployTargetCmd.Flags().StringP("console-url", "", "", "DeployTarget console URL")
 	updateDeployTargetCmd.Flags().StringP("token", "", "", "DeployTarget token")

cmd/environment.go

@@ -124,7 +124,7 @@ var updateEnvironmentCmd = &cobra.Command{
 			Route:                nullStrCheck(route),
 			Routes:               nullStrCheck(routes),
 			DeployTitle:          nullStrCheck(deployTitle),
-			Openshift:            nullIntCheck(openShift),
+			Openshift:            nullUintCheck(openShift),
 		}
 		if environmentAutoIdleProvided {
 			environmentFlags.AutoIdle = &environmentAutoIdle
@@ -158,20 +158,6 @@ var updateEnvironmentCmd = &cobra.Command{
 	},
 }
 
-func nullStrCheck(s string) *string {
-	if s == "" {
-		return nil
-	}
-	return &s
-}
-
-func nullIntCheck(i uint) *uint {
-	if i == 0 {
-		return nil
-	}
-	return &i
-}
-
 func checkFlags(f *pflag.Flag) {
 	if f.Name == "auto-idle" {
 		environmentAutoIdleProvided = true