Feature: Organizations support

api/lagoon/client/_lgraphql/deploytargets/addDeployTargetToOrganization.graphql

@@ -0,0 +1,11 @@
+mutation (
+  $deployTarget: Int!,
+  $organization: Int!,){
+  addDeployTargetToOrganization(input: {
+    deployTarget: $deployTarget,
+    organization: $organization,
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/deploytargets/deployTargetsByOrganizationId.graphql

@@ -0,0 +1,17 @@
+query (
+  $id: Int!) {
+    organizationById(id: $id) {
+      deployTargets {
+        id
+        name
+        created
+        cloudRegion
+        cloudProvider
+        friendlyName
+        sshHost
+        sshPort
+        routerPattern
+        buildImage
+      }
+    }
+  }

api/lagoon/client/_lgraphql/deploytargets/deployTargetsByOrganizationName.graphql

@@ -0,0 +1,17 @@
+query (
+  $name: String!) {
+    organizationByName(name: $name) {
+      deployTargets {
+        id
+        name
+        created
+        cloudRegion
+        cloudProvider
+        friendlyName
+        sshHost
+        sshPort
+        routerPattern
+        buildImage
+      }
+    }
+}

api/lagoon/client/_lgraphql/deploytargets/removeDeployTargetFromOrganization.graphql

@@ -0,0 +1,11 @@
+mutation (
+  $deployTarget: Int!,
+  $organization: Int!,){
+  removeDeployTargetFromOrganization(input: {
+    deployTarget: $deployTarget,
+    organization: $organization,
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/organizations/addOrganization.graphql

@@ -0,0 +1,23 @@
+mutation (
+  $name: String!,
+  $friendlyName: String,
+  $description: String,
+  $quotaProject: Int,
+  $quotaGroup: Int,
+  $quotaNotification: Int,
+  $quotaEnvironment: Int,
+  $quotaRoute: Int,) {
+  addOrganization(input: {
+    name: $name,
+    friendlyName: $friendlyName,
+    description: $description,
+    quotaProject: $quotaProject,
+    quotaGroup: $quotaGroup,
+    quotaNotification: $quotaNotification,
+    quotaEnvironment: $quotaEnvironment,
+    quotaRoute: $quotaRoute,
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/organizations/allOrganizations.graphql

@@ -0,0 +1,13 @@
+query {
+  allOrganizations {
+    id
+    name
+    description
+    friendlyName
+    quotaProject
+    quotaGroup
+    quotaNotification
+    quotaEnvironment
+    quotaRoute
+  }
+}

api/lagoon/client/_lgraphql/organizations/deleteOrganization.graphql

@@ -0,0 +1,9 @@
+mutation (
+  $id: Int!
+){
+  deleteOrganization(
+    input: {
+      id: $id
+    }
+  )
+}

api/lagoon/client/_lgraphql/organizations/organizationById.graphql

@@ -0,0 +1,15 @@
+query (
+  $id: Int!) {
+    organizationById(
+      id: $id) {
+      id
+      name
+      description
+      friendlyName
+      quotaProject
+      quotaGroup
+      quotaNotification
+      quotaEnvironment
+      quotaRoute
+    }
+  }

api/lagoon/client/_lgraphql/organizations/organizationByName.graphql

@@ -0,0 +1,15 @@
+query (
+  $name: String!) {
+    organizationByName(
+      name: $name) {
+      id
+      name
+      description
+      friendlyName
+      quotaProject
+      quotaGroup
+      quotaNotification
+      quotaEnvironment
+      quotaRoute
+    }
+}

api/lagoon/client/_lgraphql/organizations/updateOrganization.graphql

@@ -0,0 +1,13 @@
+mutation (
+  $id: Int!
+  $patch: UpdateOrganizationPatchInput!){
+  updateOrganization(
+    input: {
+      id: $id
+      patch: $patch
+    }
+  ){
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/projects/addProject.graphql

@@ -1,5 +1,6 @@
 mutation (
   $name: String!,
+  $organization: Int,
   $gitUrl: String!,
   $subfolder: String,
   $openshift: Int!,
@@ -10,9 +11,11 @@ mutation (
   $autoIdle: Int,
   $storageCalc: Int,
   $developmentEnvironmentsLimit: Int,
+  $addOrgOwner: Boolean,
   $privateKey: String) {
     addProject(input: {
       name: $name,
+      organization: $organization,
       gitUrl: $gitUrl,
       subfolder: $subfolder,
       openshift: $openshift,
@@ -23,6 +26,7 @@ mutation (
       autoIdle: $autoIdle,
       storageCalc: $storageCalc,
       developmentEnvironmentsLimit: $developmentEnvironmentsLimit,
+      addOrgOwner: $addOrgOwner,
       privateKey: $privateKey
     }) {
       id

api/lagoon/client/_lgraphql/projects/minimalProjectByName.graphql

@@ -12,6 +12,7 @@ query (
         developmentEnvironmentsLimit
         gitUrl
         autoIdle
+        organization
         openshift{
           id
         }

api/lagoon/client/_lgraphql/projects/projectsByOrganizationId.graphql

@@ -0,0 +1,12 @@
+query (
+  $id: Int!) {
+  organizationById(
+    id: $id) {
+    projects {
+      id
+      name
+      organization
+      groupCount
+    }
+  }
+}

api/lagoon/client/_lgraphql/projects/removeProjectFromOrganization.graphql

@@ -0,0 +1,11 @@
+mutation (
+  $project: Int!,
+  $organization: Int!,){
+  removeProjectFromOrganization(input: {
+    project: $project,
+    organization: $organization,
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/usergroups/addGroupToOrganization.graphql

@@ -0,0 +1,11 @@
+mutation (
+  $name: String!,
+  $organization: Int!,){
+  addGroupToOrganization(input: {
+    name: $name,
+    organization: $organization,
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/usergroups/addUserToOrganization.graphql

@@ -0,0 +1,13 @@
+mutation (
+  $user: UserInput!,
+  $organization: Int!,
+  $owner: Boolean) {
+    addUserToOrganization(input: {
+      user: $user
+      organization: $organization
+      owner: $owner
+    }) {
+      id
+      name
+    }
+  }

api/lagoon/client/_lgraphql/usergroups/groupsByOrganizationId.graphql

@@ -0,0 +1,13 @@
+query (
+  $id: Int!) {
+  organizationById(
+    id: $id) {
+    groups {
+      id
+      name
+      type
+      memberCount
+      organization
+    }
+  }
+}

api/lagoon/client/_lgraphql/usergroups/removeUserFromOrganization.graphql

@@ -0,0 +1,13 @@
+mutation (
+  $user: UserInput!,
+  $organization: Int!,
+  $owner: Boolean) {
+  removeUserFromOrganization(input: {
+    user: $user
+    organization: $organization
+    owner: $owner
+  }) {
+    id
+    name
+  }
+}

api/lagoon/client/_lgraphql/usergroups/usersByOrganization.graphql

@@ -0,0 +1,12 @@
+query (
+  $id: Int!) {
+  usersByOrganization(
+    organization: $id) {
+    id
+    email
+    firstName
+    lastName
+    owner
+    comment
+  }
+}

api/lagoon/client/_lgraphql/usergroups/usersByOrganizationName.graphql

@@ -0,0 +1,14 @@
+query (
+  $name: String!) {
+  organizationByName(
+    name: $name) {
+    owners {
+      id
+      email
+      firstName
+      lastName
+      owner
+      comment
+    }
+  }
+}

api/lagoon/client/client.go

@@ -1,4 +1,4 @@
-//go:generate go-bindata -pkg lgraphql -o lgraphql/lgraphql.go -nometadata _lgraphql/ _lgraphql/deployments/ _lgraphql/deploytargets/ _lgraphql/deploytargetconfigs/ _lgraphql/projects/ _lgraphql/environments/ _lgraphql/tasks/ _lgraphql/usergroups/
+//go:generate go-bindata -pkg lgraphql -o lgraphql/lgraphql.go -nometadata _lgraphql/ _lgraphql/deployments/ _lgraphql/deploytargets/ _lgraphql/deploytargetconfigs/ _lgraphql/projects/ _lgraphql/environments/ _lgraphql/tasks/ _lgraphql/usergroups/ _lgraphql/organizations/
 
 // Package client implements the interfaces required by the parent lagoon
 // package.

api/lagoon/client/deploytargets.go

@@ -2,7 +2,9 @@ package client
 
 import (
 	"context"
-
+	"encoding/json"
+	"fmt"
+	"github.com/machinebox/graphql"
 	"github.com/uselagoon/machinery/api/schema"
 )
 
@@ -56,3 +58,78 @@ func (c *Client) DeleteDeployTarget(ctx context.Context, in *schema.DeleteDeploy
 
 	return c.client.Run(ctx, req, &out)
 }
+
+// DeployTargetsByOrganizationNameOrID queries the Lagoon API for deploy targets by the given organization name
+// and unmarshals the response into organization.
+// Need to rework the argument types here
+func (c *Client) DeployTargetsByOrganizationNameOrID(ctx context.Context, name *string, id *uint, out *[]schema.DeployTarget) error {
+	var req *graphql.Request
+	var err error
+	o := &schema.Organization{}
+
+	if name != nil {
+		req, err = c.newRequest("_lgraphql/deploytargets/deployTargetsByOrganizationName.graphql",
+			map[string]interface{}{
+				"name": name,
+			})
+		err = c.client.Run(ctx, req, &struct {
+			Response *schema.Organization `json:"organizationByName"`
+		}{
+			Response: o,
+		})
+		if err != nil {
+			return err
+		}
+	} else {
+		if id != nil {
+			req, err = c.newRequest("_lgraphql/deploytargets/deployTargetsByOrganizationId.graphql",
+				map[string]interface{}{
+					"id": id,
+				})
+			err = c.client.Run(ctx, req, &struct {
+				Response *schema.Organization `json:"organizationByID"`
+			}{
+				Response: o,
+			})
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(o.DeployTargets) == 0 {
+		return fmt.Errorf("no deploy targets found for organization %s", o.Name)
+	}
+	data, err := json.Marshal(o.DeployTargets)
+	if err != nil {
+		return err
+	}
+	json.Unmarshal(data, out)
+	return nil
+}
+
+// AddDeployTargetToOrganization adds an existing deploytarget to an organization.
+func (c *Client) AddDeployTargetToOrganization(ctx context.Context, in *schema.AddDeployTargetToOrganizationInput, out *schema.AddDeployTargetResponse) error {
+	req, err := c.newRequest("_lgraphql/deploytargets/addDeployTargetToOrganization.graphql", in)
+	if err != nil {
+		return err
+	}
+	return c.client.Run(ctx, req, &struct {
+		Response *schema.AddDeployTargetResponse `json:"addDeployTargetToOrganization"`
+	}{
+		Response: out,
+	})
+}
+
+// RemoveDeployTargetFromOrganization removes a deploytarget from an organization.
+func (c *Client) RemoveDeployTargetFromOrganization(ctx context.Context, in *schema.RemoveDeployTargetFromOrganizationInput, out *schema.DeleteDeployTargetResponse) error {
+	req, err := c.newRequest("_lgraphql/deploytargets/removeDeployTargetFromOrganization.graphql", in)
+	if err != nil {
+		return err
+	}
+	return c.client.Run(ctx, req, &struct {
+		Response *schema.DeleteDeployTargetResponse `json:"removeDeployTargetFromOrganization"`
+	}{
+		Response: out,
+	})
+}