ref(storage.go,storage_creds.go): move basic storage logic into convenience package

Author: Aaron Schlesinger

pkg/gitreceive/storage_creds.go pkg/gitreceive/storage/creds.gopkg/gitreceive/storage_creds.go renamed to pkg/gitreceive/storage/creds.go

@@ -1,10 +1,12 @@
-package gitreceive
+package storage
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"strings"
+
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 const (
@@ -17,19 +19,14 @@ var (
 	errMissingSecret = fmt.Errorf("missing %s", accessSecretKeyFile)
 )
 
-type storageCreds struct {
-	key    string
-	secret string
-}
-
-// getStorageCreds gets storage credentials from accessKeyIDFile and accessSecretKeyFile.
-// returns os.ErrNotExist if both files are missing and otherwise, if a file was missing,
-// returns errMissingKey or errMissingSecret according to the file
-func getStorageCreds() (*storageCreds, error) {
+// getCreds gets storage credentials from accessKeyIDFile and accessSecretKeyFile.
+// if either a key exists but not a secret or vice-versa, returns an error.
+// if neither exists, returns credentials.AnonymousCredentials
+func getCreds() (*credentials.Credentials, error) {
 	accessKeyIDBytes, accessKeyErr := ioutil.ReadFile(accessKeyIDFile)
 	accessSecretKeyBytes, accessSecretKeyErr := ioutil.ReadFile(accessSecretKeyFile)
 	if accessKeyErr == os.ErrNotExist && accessSecretKeyErr == os.ErrNotExist {
-		return nil, os.ErrNotExist
+		return credentials.AnonymousCredentials, nil
 	}
 	if accessKeyErr != nil && accessSecretKeyErr == nil {
 		return nil, errMissingKey
@@ -39,5 +36,5 @@ func getStorageCreds() (*storageCreds, error) {
 	}
 	accessKeyID := strings.TrimSpace(string(accessKeyIDBytes))
 	accessSecretKey := strings.TrimSpace(string(accessSecretKeyBytes))
-	return &storageCreds{key: accessKeyID, secret: accessSecretKey}, nil
+	return credentials.NewStaticCredentials(accessKeyID, accessSecretKey, ""), nil
 }

pkg/gitreceive/storage.go pkg/gitreceive/storage/endpoint.gopkg/gitreceive/storage.go renamed to pkg/gitreceive/storage/endpoint.go

@@ -1,4 +1,4 @@
-package gitreceive
+package storage
 
 import (
 	"fmt"
@@ -22,40 +22,16 @@ var (
 	)
 )
 
-type storageConfig interface {
-	schema() string
-	host() string
-	port() string
-}
-
-func getStorageConfig() (storageConfig, error) {
+func getEndpoint() (string, error) {
 	mHost := os.Getenv(minioHostEnvVar)
 	mPort := os.Getenv(minioPortEnvVar)
 	oHost := os.Getenv(outsideStorageHostEnvVar)
 	oPort := os.Getenv(outsideStoragePortEnvVar)
 	if mHost != "" && mPort != "" {
-		return minioConfig{hst: mHost, prt: mPort}, nil
+		return fmt.Sprintf("http://%s:%s", mHost, mPort), nil
 	} else if oHost != "" && oPort != "" {
-		return outsideConfig{hst: oHost, prt: oPort}, nil
+		return fmt.Sprintf("https://%s:%s", oHost, oPort), nil
 	} else {
 		return nil, errNoStorageConfig
 	}
 }
-
-type minioConfig struct {
-	hst string
-	prt string
-}
-
-func (m minioConfig) schema() string { return "http" }
-func (m minioConfig) host() string   { return m.hst }
-func (m minioConfig) port() string   { return m.prt }
-
-type outsideConfig struct {
-	hst string
-	prt string
-}
-
-func (o outsideConfig) schema() string { return "https" }
-func (o outsideConfig) host() string   { return o.hst }
-func (o outsideConfig) port() string   { return o.prt }