Allow users to create file groups in out script

[#142976615]

Signed-off-by: Danny Sullivan <dsullivan@pivotal.io>

gp/gp.go

@@ -113,6 +113,14 @@ func (c Client) AddProductFile(productSlug string, releaseID int, productFileID
 	return c.client.ProductFiles.AddToRelease(productSlug, releaseID, productFileID)
 }
 
+func (c Client) CreateFileGroup(config pivnet.CreateFileGroupConfig) (pivnet.FileGroup, error) {
+	return c.client.FileGroups.Create(config)
+}
+
+func (c Client) AddFileGroup(productSlug string, releaseID int, fileGroupID int) error {
+	return c.client.FileGroups.AddToRelease(productSlug, releaseID, fileGroupID)
+}
+
 func (c Client) DownloadProductFile(writer *os.File, productSlug string, releaseID int, productFileID int, progressWriter io.Writer) error {
 	return c.client.ProductFiles.DownloadForRelease(writer, productSlug, releaseID, productFileID, progressWriter)
 }

out/release/release_uploader.go

@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"time"
 
-	pivnet "github.com/pivotal-cf/go-pivnet"
 	"github.com/pivotal-cf/go-pivnet/logger"
 	"github.com/pivotal-cf/pivnet-resource/metadata"
+	pivnet "github.com/pivotal-cf/go-pivnet"
 )
 
 type ReleaseUploader struct {
@@ -27,7 +27,11 @@ type ReleaseUploader struct {
 type uploadClient interface {
 	FindProductForSlug(slug string) (pivnet.Product, error)
 	CreateProductFile(pivnet.CreateProductFileConfig) (pivnet.ProductFile, error)
+
 	AddProductFile(productSlug string, releaseID int, productFileID int) error
+	AddFileGroup(name string, releaseID int, fileGroupID int) error
+
+	CreateFileGroup(pivnet.CreateFileGroupConfig) (pivnet.FileGroup, error)
 	ProductFiles(productSlug string) ([]pivnet.ProductFile, error)
 	ProductFile(productSlug string, productFileID int) (pivnet.ProductFile, error)
 	DeleteProductFile(productSlug string, releaseID int) (pivnet.ProductFile, error)
@@ -175,6 +179,7 @@ func (u ReleaseUploader) Upload(release pivnet.Release, exactGlobs []string) err
 			uploadAs,
 		))
 
+
 		productFile, err := u.pivnet.CreateProductFile(pivnet.CreateProductFileConfig{
 			ProductSlug:        u.productSlug,
 			Name:               uploadAs,
@@ -210,6 +215,22 @@ func (u ReleaseUploader) Upload(release pivnet.Release, exactGlobs []string) err
 		}
 	}
 
+	for _, group := range u.metadata.FileGroups {
+		fileGroup, err := u.pivnet.CreateFileGroup(pivnet.CreateFileGroupConfig{
+			ProductSlug:        u.productSlug,
+			Name:               group.Name,
+		})
+
+		if err != nil {
+			return err
+		}
+
+		err = u.pivnet.AddFileGroup(u.productSlug, release.ID, fileGroup.ID)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

out/release/release_uploader_test.go

@@ -40,6 +40,7 @@ var _ = Describe("ReleaseUploader", func() {
 
 		existingProductFilesErr error
 		createProductFileErr    error
+		createFileGroupErr    	error
 		uploadFileErr           error
 		sha256SumFileErr        error
 		md5SumFileErr           error
@@ -78,6 +79,12 @@ var _ = Describe("ReleaseUploader", func() {
 					IncludedFiles:      []string{"include1", "include2"},
 				},
 			},
+
+			FileGroups: []metadata.FileGroup{
+				{
+					Name: "file-group-1",
+				},
+			},
 		}
 
 		existingProductFiles = []pivnet.ProductFile{
@@ -117,6 +124,8 @@ var _ = Describe("ReleaseUploader", func() {
 		md5Summer.SumFileReturns(actualMD5Sum, md5SumFileErr)
 		s3Client.UploadFileReturns(newAWSObjectKey, uploadFileErr)
 		uploadClient.CreateProductFileReturns(pivnet.ProductFile{ID: 13367}, createProductFileErr)
+		uploadClient.CreateFileGroupReturns(pivnet.FileGroup{ID: 8675309}, createFileGroupErr)
+
 		uploadClient.ProductFilesReturns(existingProductFiles, existingProductFilesErr)
 
 		invokeCount := 0
@@ -162,10 +171,22 @@ var _ = Describe("ReleaseUploader", func() {
 				IncludedFiles:      mdata.ProductFiles[0].IncludedFiles,
 			}))
 
+			Expect(uploadClient.AddProductFileCallCount()).To(Equal(1))
 			invokedProductSlug, releaseID, productFileID := uploadClient.AddProductFileArgsForCall(0)
 			Expect(invokedProductSlug).To(Equal(productSlug))
 			Expect(releaseID).To(Equal(1111))
 			Expect(productFileID).To(Equal(13367))
+
+			Expect(uploadClient.CreateFileGroupArgsForCall(0)).To(Equal(pivnet.CreateFileGroupConfig{
+				ProductSlug:        productSlug,
+				Name:               mdata.FileGroups[0].Name,
+			}))
+
+			Expect(uploadClient.AddFileGroupCallCount()).To(Equal(1))
+			invokedProductSlug, releaseID, fileGroupID := uploadClient.AddFileGroupArgsForCall(0)
+			Expect(invokedProductSlug).To(Equal(productSlug))
+			Expect(releaseID).To(Equal(1111))
+			Expect(fileGroupID).To(Equal(8675309))
 		})
 
 		Context("when a product file already exists with AWSObjectKey", func() {