fix(pkg/gitreceive): create and use a storage.Client

The client includes the endpoint as well as the actual client library.
The build func uses the endpoint

Author: Aaron Schlesinger

pkg/gitreceive/build.go

@@ -16,7 +16,6 @@ import (
 	"github.com/deis/builder/pkg/gitreceive/storage"
 	"github.com/deis/builder/pkg/sys"
 	"github.com/deis/pkg/log"
-	s3 "github.com/minio/minio-go"
 	"gopkg.in/yaml.v2"
 
 	"k8s.io/kubernetes/pkg/api"
@@ -42,7 +41,7 @@ func run(cmd *exec.Cmd) error {
 	return cmd.Run()
 }
 
-func build(conf *Config, s3Client *s3.Client, kubeClient *client.Client, fs sys.FS, env sys.Env, builderKey, rawGitSha string) error {
+func build(conf *Config, s3Client *storage.Client, kubeClient *client.Client, fs sys.FS, env sys.Env, builderKey, rawGitSha string) error {
 	repo := conf.Repository
 	gitSha, err := git.NewSha(rawGitSha)
 	if err != nil {
@@ -64,7 +63,7 @@ func build(conf *Config, s3Client *s3.Client, kubeClient *client.Client, fs sys.
 		return fmt.Errorf("unable to create tmpdir %s (%s)", buildDir, err)
 	}
 
-	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint, conf.Bucket, appName, slugName, gitSha)
+	slugBuilderInfo := storage.NewSlugBuilderInfo(s3Client.Endpoint.URLStr, 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/storage/client.go

@@ -5,9 +5,19 @@ import (
 	s3 "github.com/minio/minio-go"
 )
 
+type Client struct {
+	*s3.Client
+	Endpoint *Endpoint
+}
+
 // GetClient returns a S3 API compatible storage client
+<<<<<<< 7c8dc9bdf6ffed171ed952661229ae2b8590cef7
 func GetClient(regionStr string, fs sys.FS, env sys.Env) (*s3.Client, error) {
 	auth, err := getAuth(fs)
+=======
+func GetClient(regionStr string) (*Client, error) {
+	auth, err := getAuth()
+>>>>>>> fix(pkg/gitreceive): create and use a storage.Client
 	if err != nil {
 		return nil, err
 	}
@@ -17,5 +27,9 @@ func GetClient(regionStr string, fs sys.FS, env sys.Env) (*s3.Client, error) {
 		return nil, err
 	}
 
-	return s3.New(endpoint, auth.accessKeyID, auth.accessKeySecret, false), nil
+	s3Client, err := s3.New(endpoint.URLStr, auth.accessKeyID, auth.accessKeySecret, false)
+	if err != nil {
+		return nil, err
+	}
+	return &Client{Client: s3Client, Endpoint: endpoint}, nil
 }