Extend groups to have an array of clusters as a field

client/actions/clusters/cluster_client.go

@@ -14,14 +14,14 @@ import (
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ClusterService
 type ClusterService interface {
 	// RegisterCluster registers a new cluster under the specified organization ID.
-	RegisterCluster(string, types.Registration) (*RegisterClusterResponseDataDetails, error)
+	RegisterCluster(orgID string, registration types.Registration) (*RegisterClusterResponseDataDetails, error)
 	// ClustersByOrgID lists the clusters registered under the specified organization.
-	ClustersByOrgID(string) (types.ClusterList, error)
+	ClustersByOrgID(orgID string) (types.ClusterList, error)
 	// ClusterByName returns the cluster registered under the specified organization and name.
-	ClusterByName(string, string) (*types.Cluster, error)
+	ClusterByName(orgID string, clusterName string) (*types.Cluster, error)
 	// DeleteClusterByClusterID deletes the specified cluster from the specified org,
 	// including all resources under that cluster.
-	DeleteClusterByClusterID(string, string) (*DeleteClustersResponseDataDetails, error)
+	DeleteClusterByClusterID(orgID string, clusterID string) (*DeleteClustersResponseDataDetails, error)
 }
 
 // Client is an implementation of a satcon client.

client/actions/groups/group_by_name.go

@@ -33,6 +33,7 @@ func NewGroupByNameVariables(orgID string, name string) GroupByNameVariables {
 		"orgId",
 		"name",
 		"created",
+		"clusters{id,orgId,clusterId,name,metadata}",
 	}
 
 	return vars

client/actions/groups/group_by_name_test.go

@@ -45,6 +45,7 @@ var _ = Describe("GroupByName", func() {
 				"orgId",
 				"name",
 				"created",
+				"clusters{id,orgId,clusterId,name,metadata}",
 			))
 		})
 	})
@@ -64,6 +65,14 @@ var _ = Describe("GroupByName", func() {
 						UUID:  "asdf",
 						OrgID: orgID,
 						Name:  "group1",
+						Clusters: []types.Cluster{
+							{
+								ID:        "cid",
+								OrgID:     "oid",
+								ClusterID: "cid",
+								Name:      "cluster1",
+							},
+						},
 					},
 				},
 			}

client/actions/groups/groups.go

@@ -30,6 +30,7 @@ func NewGroupsVariables(orgID string) GroupsVariables {
 		"orgId",
 		"name",
 		"created",
+		"clusters{id,orgId,clusterId,name,metadata}",
 	}
 
 	return vars

client/actions/groups/groups_test.go

@@ -41,6 +41,7 @@ var _ = Describe("Groups", func() {
 				"orgId",
 				"name",
 				"created",
+				"clusters{id,orgId,clusterId,name,metadata}",
 			))
 		})
 	})
@@ -61,6 +62,14 @@ var _ = Describe("Groups", func() {
 							UUID:  "asdf",
 							OrgID: orgID,
 							Name:  "cluster1",
+							Clusters: []types.Cluster{
+								{
+									ID:        "cid",
+									OrgID:     "oid",
+									ClusterID: "cid",
+									Name:      "cluster1",
+								},
+							},
 						},
 						{
 							UUID:  "qwer",

client/types/types.go

@@ -114,11 +114,12 @@ type RequestErrorDetails struct {
 type GroupList []Group
 
 type Group struct {
-	UUID    string    `json:"uuid,omitempty"`
-	OrgID   string    `json:"orgId,omitempty"`
-	Name    string    `json:"name,omitempty"`
-	Owner   BasicUser `json:"owner,omitempty"`
-	Created string    `json:"created,omitempty"`
+	UUID     string    `json:"uuid,omitempty"`
+	OrgID    string    `json:"orgId,omitempty"`
+	Name     string    `json:"name,omitempty"`
+	Owner    BasicUser `json:"owner,omitempty"`
+	Created  string    `json:"created,omitempty"`
+	Clusters []Cluster `json:"clusters,omitempty"`
 }
 
 // Registration is the encapsulation of the JSON registration body, which at this

test/integration/groups_test.go

@@ -2,6 +2,7 @@ package integration_test
 
 import (
 	"fmt"
+	"github.com/IBM/satcon-client-go/client/types"
 	"strings"
 
 	. "github.com/onsi/ginkgo"
@@ -30,14 +31,16 @@ var _ = Describe("Groups", func() {
 	Describe("Group Lifecycle", func() {
 
 		var (
-			groupName1 string
-			groupName2 string
+			groupName1  string
+			groupName2  string
+			clusterName string
 		)
 
 		BeforeEach(func() {
 			groupName1 = RandStringBytes(8)
 			groupName2 = RandStringBytes(8)
-			fmt.Printf("groupName1 = %s\ngroupName2 = %s\n", groupName1, groupName2)
+			clusterName = RandStringBytes(8)
+			fmt.Printf("groupName1 = %s\ngroupName2 = %s\nclusterName = %s\n", groupName1, groupName2, clusterName)
 		})
 
 		It("Lists the groups, creates our new group, lists again and finds it, deletes it, and finally lists to see that it's gone", func() {
@@ -68,11 +71,28 @@ var _ = Describe("Groups", func() {
 			}
 			Expect(found).To(BeTrue())
 
-			// get group by name
+			// create new cluster
+			newClusterDetails, err := c.Clusters.RegisterCluster(testConfig.OrgID, types.Registration{Name: clusterName})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(newClusterDetails).NotTo(BeNil())
+
+			// add new cluster to the group
+			_, err = c.Groups.GroupClusters(testConfig.OrgID, newGroupDetails.UUID, []string{newClusterDetails.ClusterID})
+			Expect(err).NotTo(HaveOccurred())
+
+			// get group by name and verify that the new cluster is part of it
 			group1, err := c.Groups.GroupByName(testConfig.OrgID, groupName1)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(group1).NotTo(BeNil())
 			Expect(group1.Name).To(Equal(groupName1))
+			Expect(group1.Clusters).To(HaveLen(1))
+			Expect(group1.Clusters[0].ClusterID).To(Equal(newClusterDetails.ClusterID))
+			Expect(group1.Clusters[0].Name).To(Equal(clusterName))
+
+			// delete cluster
+			delClusterDetails, err := c.Clusters.DeleteClusterByClusterID(testConfig.OrgID, newClusterDetails.ClusterID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(delClusterDetails.DeletedClusterCount).To(Equal(1))
 
 			// delete the group using RemoveGroupByName
 			removeGroup1, err := c.Groups.RemoveGroupByName(testConfig.OrgID, groupName1)