ref(*): move ./pkg/gitreceive/storage to ./pkg/storage

Author: Aaron Schlesinger

boot.go

@@ -11,9 +11,9 @@ import (
 	"github.com/deis/builder/pkg/cleaner"
 	"github.com/deis/builder/pkg/conf"
 	"github.com/deis/builder/pkg/gitreceive"
-	"github.com/deis/builder/pkg/gitreceive/storage"
 	"github.com/deis/builder/pkg/healthsrv"
 	"github.com/deis/builder/pkg/sshd"
+	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
 	pkglog "github.com/deis/pkg/log"
 	kcl "k8s.io/kubernetes/pkg/client/unversioned"

pkg/gitreceive/build.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/gitreceive/git"
-	"github.com/deis/builder/pkg/gitreceive/storage"
+	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
 	"github.com/deis/pkg/log"
 	"gopkg.in/yaml.v2"
@@ -63,7 +63,7 @@ func build(conf *Config, s3Client *storage.Client, kubeClient *client.Client, fs
 		return fmt.Errorf("unable to create tmpdir %s (%s)", buildDir, err)
 	}
 
-	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint, conf.Bucket, appName, slugName, gitSha)
+	slugBuilderInfo := NewSlugBuilderInfo(s3Client.Endpoint, conf.Bucket, appName, slugName, gitSha)
 
 	// Get the application config from the controller, so we can check for a custom buildpack URL
 	appConf, err := getAppConfig(conf, builderKey, conf.Username, appName)

pkg/gitreceive/build_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg"
-	"github.com/deis/builder/pkg/gitreceive/storage"
+	"github.com/deis/builder/pkg/storage"
 )
 
 const (

pkg/gitreceive/controller.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/gitreceive/git"
-	"github.com/deis/builder/pkg/gitreceive/storage"
 	"github.com/deis/pkg/log"
 )
 
@@ -152,7 +151,7 @@ func receive(conf *Config, builderKey, gitSha string) error {
 }
 
 func createBuildHook(
-	slugBuilderInfo *storage.SlugBuilderInfo,
+	slugBuilderInfo *SlugBuilderInfo,
 	gitSha *git.SHA,
 	username,
 	appName string,

pkg/gitreceive/controller_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/gitreceive/git"
-	"github.com/deis/builder/pkg/gitreceive/storage"
+	"github.com/deis/builder/pkg/storage"
 )
 
 const (
@@ -22,7 +22,7 @@ func TestCreateBuildHook(t *testing.T) {
 	sha, err := git.NewSha(rawSha)
 	assert.NoErr(t, err)
 	endpoint := &storage.Endpoint{URLStr: "s3.amazonaws.com", Secure: false}
-	slugBuilderInfo := storage.NewSlugBuilderInfo(endpoint, bucket, appName, slugName, sha)
+	slugBuilderInfo := NewSlugBuilderInfo(endpoint, bucket, appName, slugName, sha)
 	hookUsingDockerfile := createBuildHook(slugBuilderInfo, sha, username, appName, procType, true)
 	assert.Equal(t, hookUsingDockerfile.Sha, sha.Short(), "git sha")
 	assert.Equal(t, hookUsingDockerfile.ReceiveUser, username, "username")

pkg/gitreceive/run.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/deis/builder/pkg/gitreceive/storage"
+	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
 	"github.com/deis/pkg/log"
 

…/gitreceive/storage/slug_builder_info.go pkg/gitreceive/slug_builder_info.gopkg/gitreceive/storage/slug_builder_info.go renamed to pkg/gitreceive/slug_builder_info.go pkg/gitreceive/storage/slug_builder_info.go renamed to pkg/gitreceive/slug_builder_info.go

@@ -1,9 +1,10 @@
-package storage
+package gitreceive
 
 import (
 	"fmt"
 
 	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/storage"
 )
 
 const (
@@ -19,8 +20,8 @@ type SlugBuilderInfo struct {
 	tarURL  string
 }
 
-// NewSlugBuilderInfo creates and populates a new SlugBuilderInfo based on the given data.
-func NewSlugBuilderInfo(s3Endpoint *Endpoint, bucket, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
+// NewSlugBuilderInfo creates and populates a new SlugBuilderInfo based on the given data
+func NewSlugBuilderInfo(s3Endpoint *storage.Endpoint, bucket, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
 	tarKey := fmt.Sprintf("home/%s/tar", slugName)
 	// this is where the controller tells slugrunner to download the slug from, so we have to
 	// tell slugbuilder to upload it to here

…eceive/storage/slug_builder_info_test.go pkg/gitreceive/slug_builder_info_test.gopkg/gitreceive/storage/slug_builder_info_test.go renamed to pkg/gitreceive/slug_builder_info_test.go pkg/gitreceive/storage/slug_builder_info_test.go renamed to pkg/gitreceive/slug_builder_info_test.go

@@ -1,21 +1,15 @@
-package storage
+package gitreceive
 
 import (
 	"testing"
 
 	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg/gitreceive/git"
-)
-
-const (
-	rawSha   = "c3b4e4ba8b7267226ff02ad07a3a2cca9c9237de"
-	appName  = "myapp"
-	slugName = "myslug"
-	bucket   = "git"
+	"github.com/deis/builder/pkg/storage"
 )
 
 var (
-	s3Endpoint = &Endpoint{URLStr: "10.1.2.3:9090", Secure: false}
+	s3Endpoint = &storage.Endpoint{URLStr: "10.1.2.3:9090", Secure: false}
 )
 
 func TestS3Endpoint(t *testing.T) {