Feature: Organizations support

cmd/add.go

@@ -29,6 +29,8 @@ func init() {
 	addCmd.AddCommand(addProjectToGroupCmd)
 	addCmd.AddCommand(addNotificationCmd)
 	addCmd.AddCommand(addUserCmd)
+	addCmd.AddCommand(addGroupToOrganizationCmd)
+	addCmd.AddCommand(addOrganizationCmd)
 	addCmd.AddCommand(addUserToGroupCmd)
 	addCmd.AddCommand(addUserSSHKeyCmd)
 	addCmd.AddCommand(addVariableCmd)

cmd/delete.go

@@ -34,4 +34,5 @@ func init() {
 	deleteCmd.AddCommand(deleteUserFromGroupCmd)
 	deleteCmd.AddCommand(deleteVariableCmd)
 	deleteCmd.AddCommand(deleteDeployTargetConfigCmd)
+	deleteCmd.AddCommand(deleteOrganizationCmd)
 }

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

cmd/get.go

@@ -1,14 +1,17 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
-	"os"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/uselagoon/lagoon-cli/pkg/api"
 	"github.com/uselagoon/lagoon-cli/pkg/output"
+	l "github.com/uselagoon/machinery/api/lagoon"
+	lclient "github.com/uselagoon/machinery/api/lagoon/client"
+	"os"
+	"strconv"
 )
 
 // GetFlags .
@@ -166,10 +169,66 @@ var getToken = &cobra.Command{
 	},
 }
 
+var getOrganizationCmd = &cobra.Command{
+	Use:     "organization",
+	Aliases: []string{"o"},
+	Short:   "Get details about an organization",
+	PreRunE: func(_ *cobra.Command, _ []string) error {
+		return validateTokenE(cmdLagoon)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		debug, err := cmd.Flags().GetBool("debug")
+		if err != nil {
+			return err
+		}
+		organizationName, err := cmd.Flags().GetString("name")
+		if err != nil {
+			return err
+		}
+		if organizationName == "" {
+			return fmt.Errorf("missing arguments: Organization is not defined")
+		}
+
+		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)
+
+		if organization.Name == "" {
+			output.RenderInfo(fmt.Sprintf("No organization found for '%s'", organizationName), outputOptions)
+			os.Exit(0)
+		}
+
+		data := []output.Data{}
+		data = append(data, []string{
+			strconv.Itoa(int(organization.ID)),
+			organization.Name,
+			organization.Description,
+			strconv.Itoa(int(organization.QuotaProject)),
+			strconv.Itoa(int(organization.QuotaGroup)),
+			strconv.Itoa(int(organization.QuotaNotification)),
+		})
+
+		dataMain := output.Table{
+			Header: []string{"ID", "Name", "Description", "quotaProject", "quotaGroup", "quotaNotification"},
+			Data:   data,
+		}
+
+		output.RenderOutput(dataMain, outputOptions)
+		return nil
+	},
+}
+
 func init() {
 	getCmd.AddCommand(getAllUserKeysCmd)
 	getCmd.AddCommand(getDeploymentCmd)
 	getCmd.AddCommand(getEnvironmentCmd)
+	getCmd.AddCommand(getOrganizationCmd)
 	getCmd.AddCommand(getProjectCmd)
 	getCmd.AddCommand(getProjectKeyCmd)
 	getCmd.AddCommand(getUserKeysCmd)
@@ -179,4 +238,5 @@ func init() {
 	getTaskByID.Flags().BoolP("logs", "L", false, "Show the task logs if available")
 	getProjectKeyCmd.Flags().BoolVarP(&revealValue, "reveal", "", false, "Reveal the variable values")
 	getDeploymentCmd.Flags().StringVarP(&remoteID, "remoteid", "R", "", "The remote ID of the deployment")
+	getOrganizationCmd.Flags().StringP("organization", "O", "", "Name of the organization")
 }

cmd/groups.go

@@ -1,8 +1,12 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
+	l "github.com/uselagoon/machinery/api/lagoon"
+	lclient "github.com/uselagoon/machinery/api/lagoon/client"
+	s "github.com/uselagoon/machinery/api/schema"
 	"os"
 	"strings"
 
@@ -228,6 +232,62 @@ var deleteGroupCmd = &cobra.Command{
 	},
 }
 
+var addGroupToOrganizationCmd = &cobra.Command{
+	Use:     "organization-group",
+	Aliases: []string{"og", "orggroup"},
+	Short:   "Add a group 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)
+		orgOwner, err := cmd.Flags().GetBool("orgOwner")
+		organizationName, err := cmd.Flags().GetString("organization")
+		if organizationName == "" {
+			fmt.Println("Missing arguments: Organization name is not defined")
+			cmd.Help()
+			os.Exit(1)
+		}
+		groupName, err := cmd.Flags().GetString("group")
+		if groupName == "" {
+			fmt.Println("Missing arguments: Group name is not defined")
+			cmd.Help()
+			os.Exit(1)
+		}
+
+		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)
+
+		groupInput := s.AddGroupToOrganizationInput{
+			Name:         groupName,
+			Organization: organization.ID,
+			AddOrgOwner:  orgOwner,
+		}
+		group := s.OrgGroup{}
+		err = lc.AddGroupToOrganization(context.TODO(), &groupInput, &group)
+		handleError(err)
+
+		resultData := output.Result{
+			Result: "success",
+			ResultData: map[string]interface{}{
+				"Group Name":        group.Name,
+				"Organization Name": organizationName,
+			},
+		}
+		output.RenderResult(resultData, outputOptions)
+		return nil
+	},
+}
+
 func init() {
 	addGroupCmd.Flags().StringVarP(&groupName, "name", "N", "", "Name of the group")
 	addUserToGroupCmd.Flags().StringVarP(&groupName, "name", "N", "", "Name of the group")
@@ -238,4 +298,7 @@ func init() {
 	deleteUserFromGroupCmd.Flags().StringVarP(&userEmail, "email", "E", "", "Email address of the user")
 	deleteProjectFromGroupCmd.Flags().StringVarP(&groupName, "name", "N", "", "Name of the group")
 	deleteGroupCmd.Flags().StringVarP(&groupName, "name", "N", "", "Name of the group")
+	addGroupToOrganizationCmd.Flags().StringP("organization", "O", "", "Name of the organization")
+	addGroupToOrganizationCmd.Flags().StringP("group", "G", "", "Name of the group")
+	addGroupToOrganizationCmd.Flags().Bool("orgOwner", false, "Flag to add the user to the group as an owner")
 }