Merge pull request #24 from ConradKurth/aws-credentials

Use AWS sdk to parse credentials

Gopkg.toml

@@ -25,10 +25,6 @@
   name = "github.com/aws/aws-sdk-go"
   version = "1.12.1"
 
-[[constraint]]
-  name = "github.com/go-ini/ini"
-  version = "1.28.2"
-
 [[constraint]]
   name = "github.com/pkg/errors"
   version = "0.8.0"

cmd/helms3/delete.go

@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/hypnoglow/helm-s3/pkg/awss3"
-	"github.com/hypnoglow/helm-s3/pkg/awsutil"
 	"github.com/hypnoglow/helm-s3/pkg/helmutil"
 	"github.com/hypnoglow/helm-s3/pkg/index"
 )
@@ -18,12 +17,7 @@ func runDelete(name, version, repoName string) error {
 		return err
 	}
 
-	awsConfig, err := awsutil.Config()
-	if err != nil {
-		return errors.Wrap(err, "get aws config")
-	}
-
-	storage := awss3.NewStorage(awsConfig)
+	storage := awss3.New()
 
 	// Fetch current index.
 

cmd/helms3/init.go

@@ -6,7 +6,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/hypnoglow/helm-s3/pkg/awss3"
-	"github.com/hypnoglow/helm-s3/pkg/awsutil"
 	"github.com/hypnoglow/helm-s3/pkg/index"
 )
 
@@ -16,12 +15,7 @@ func runInit(uri string) error {
 		return errors.WithMessage(err, "get index reader")
 	}
 
-	awsConfig, err := awsutil.Config()
-	if err != nil {
-		return errors.WithMessage(err, "get aws config")
-	}
-
-	storage := awss3.NewStorage(awsConfig)
+	storage := awss3.New()
 
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer cancel()

cmd/helms3/proxy.go

@@ -7,16 +7,11 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/hypnoglow/helm-s3/pkg/awss3"
-	"github.com/hypnoglow/helm-s3/pkg/awsutil"
 )
 
 func runProxy(uri string) error {
-	awsConfig, err := awsutil.Config()
-	if err != nil {
-		return errors.WithMessage(err, "get aws config")
-	}
 
-	storage := awss3.NewStorage(awsConfig)
+	storage := awss3.New()
 
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer cancel()

cmd/helms3/push.go

@@ -12,7 +12,6 @@ import (
 	"k8s.io/helm/pkg/provenance"
 
 	"github.com/hypnoglow/helm-s3/pkg/awss3"
-	"github.com/hypnoglow/helm-s3/pkg/awsutil"
 	"github.com/hypnoglow/helm-s3/pkg/helmutil"
 	"github.com/hypnoglow/helm-s3/pkg/index"
 )
@@ -38,12 +37,7 @@ func runPush(chartPath string, repoName string) error {
 		return errors.Wrapf(err, "change dir to %s", dir)
 	}
 
-	awsConfig, err := awsutil.Config()
-	if err != nil {
-		return errors.Wrap(err, "get aws config")
-	}
-
-	storage := awss3.NewStorage(awsConfig)
+	storage := awss3.New()
 
 	// Load chart, calculate required params like hash,
 	// and upload the chart right away.

pkg/awss3/storage.go

@@ -12,18 +12,17 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/pkg/errors"
+
+	"github.com/hypnoglow/helm-s3/pkg/awsutil"
 )
 
-// NewStorage returns a new Storage.
-func NewStorage(awsConfig *aws.Config) *Storage {
-	return &Storage{
-		config: awsConfig,
-	}
+// New returns a new Storage.
+func New() *Storage {
+	return &Storage{}
 }
 
 // Storage provides an interface to work with AWS S3 objects by s3 protocol.
 type Storage struct {
-	config  *aws.Config
 	session *session.Session
 }
 
@@ -111,7 +110,7 @@ func (s *Storage) initSession() (err error) {
 		return nil
 	}
 
-	s.session, err = session.NewSession(s.config)
+	s.session, err = awsutil.Session()
 	return errors.Wrap(err, "init aws session")
 }
 

pkg/awsutil/session.go

@@ -0,0 +1,28 @@
+package awsutil
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
+	"github.com/aws/aws-sdk-go/aws/session"
+)
+
+var (
+	// awsDisableSSL can be set to true by build tag.
+	awsDisableSSL = "false"
+
+	// awsEndpoint can be set to a custom endpoint by build tag.
+	awsEndpoint = ""
+)
+
+// Session returns an AWS session as described http://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html
+func Session() (*session.Session, error) {
+	return session.NewSessionWithOptions(session.Options{
+		Config: aws.Config{
+			DisableSSL:       aws.Bool(awsDisableSSL == "true"),
+			S3ForcePathStyle: aws.Bool(true),
+			Endpoint:         aws.String(awsEndpoint),
+		},
+		SharedConfigState:       session.SharedConfigEnable,
+		AssumeRoleTokenProvider: stscreds.StdinTokenProvider,
+	})
+}