Add code based on awslabs#181

Author: benhowes

ecr-login/api/factory.go

@@ -39,6 +39,7 @@ type ClientFactory interface {
 	NewClientWithOptions(opts Options) Client
 	NewClientFromRegion(region string) Client
 	NewClientWithFipsEndpoint(region string) (Client, error)
+	NewClientWithExplicitProfile(profile string) (Client, error)
 	NewClientWithDefaults() Client
 }
 
@@ -84,6 +85,23 @@ func (defaultClientFactory DefaultClientFactory) NewClientWithFipsEndpoint(regio
 	}), nil
 }
 
+// NewClientWithExplicitProfile creates a session with a custom profile set
+func (defaultClientFactory DefaultClientFactory) NewClientWithExplicitProfile(profile string) (Client, error) {
+       awsSession, err := session.NewSessionWithOptions(session.Options{
+               Profile: profile,
+               SharedConfigState: loadSharedConfigState(),
+       })
+       if err != nil {
+               return nil, err
+       }
+       awsSession.Handlers.Build.PushBackNamed(userAgentHandler)
+       awsConfig := awsSession.Config
+       return defaultClientFactory.NewClientWithOptions(Options{
+               Session: awsSession,
+               Config:  awsConfig,
+       }), nil
+}
+
 // NewClientFromRegion uses the region to create the client
 func (defaultClientFactory DefaultClientFactory) NewClientFromRegion(region string) Client {
 	awsSession := session.Must(session.NewSessionWithOptions(session.Options{

ecr-login/ecr.go

@@ -16,6 +16,7 @@ package ecr
 import (
 	"errors"
 	"fmt"
+	"os"
 
 	"github.com/sirupsen/logrus"
 
@@ -52,13 +53,21 @@ func (self ECRHelper) Get(serverURL string) (string, string, error) {
 		return "", "", credentials.NewErrCredentialsNotFound()
 	}
 
+	profile, profile_exists := os.LookupEnv("AWS_PROFILE")
+
 	var client api.Client
 	if registry.FIPS {
 		client, err = self.ClientFactory.NewClientWithFipsEndpoint(registry.Region)
 		if err != nil {
 			logrus.WithError(err).Error("Error resolving FIPS endpoint")
 			return "", "", credentials.NewErrCredentialsNotFound()
 		}
+	} else if profile_exists {
+		client, err = self.ClientFactory.NewClientWithExplicitProfile(profile)
+		if err != nil {
+            logrus.WithError(err).Error("Error creating client with explicit profile")
+            return "", "", credentials.NewErrCredentialsNotFound()
+        }
 	} else {
 		client = self.ClientFactory.NewClientFromRegion(registry.Region)
 	}