Merge pull request #24 from danmx/profile

Adding AWS config profile support
danmx · Apr 15, 2019 · c32b996 · c32b996
2 parents 69b0276 + e1d3151
commit c32b996
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/cmd/sigil/main.go b/cmd/sigil/main.go
@@ -32,6 +32,7 @@ var (
 	workDir       string
 	cfgFilePath   string
 	awsRegion     string
+	awsProfile    string
 	target        string
 	targetType    string
 	outputFormat  string
@@ -98,6 +99,11 @@ func main() {
 			Usage:       "specify AWS `region`",
 			Destination: &awsRegion,
 		}),
+		altsrc.NewStringFlag(cli.StringFlag{
+			Name:        "profile",
+			Usage:       "specify AWS `profile`",
+			Destination: &awsProfile,
+		}),
 		cli.StringFlag{
 			Name:        "log-level",
 			Value:       LogLevel,
@@ -152,10 +158,13 @@ func main() {
 					"tags":          tagFilter.String(),
 					"output-format": outputFormat,
 					"region":        awsRegion,
+					"profile":       awsProfile,
+					"interactive":   startSession,
 				}).Debug("List inputs")
 				input := &list.StartInput{
 					OutputFormat: &outputFormat,
 					AWSRegion:    &awsRegion,
+					AWSProfile:   &awsProfile,
 					TagFilter:    &tagFilter.Map,
 					StartSession: &startSession,
 				}
@@ -190,14 +199,16 @@ func main() {
 			Flags:       sessionFlags,
 			Action: func(c *cli.Context) error {
 				log.WithFields(log.Fields{
-					"target": target,
-					"type":   targetType,
-					"region": awsRegion,
+					"target":  target,
+					"type":    targetType,
+					"region":  awsRegion,
+					"profile": awsProfile,
 				}).Debug("Session inputs")
 				input := &session.StartInput{
 					Target:     &target,
 					TargetType: &targetType,
 					AWSRegion:  &awsRegion,
+					AWSProfile: &awsProfile,
 				}
 				err := session.Start(input)
 				if err != nil {

diff --git a/pkg/list/list.go b/pkg/list/list.go
@@ -13,6 +13,7 @@ import (
 	remoteSession "github.com/danmx/sigil/pkg/session"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ssm"
@@ -25,6 +26,7 @@ type StartInput struct {
 	// Define output format
 	OutputFormat *string
 	AWSRegion    *string
+	AWSProfile   *string
 	TagFilter    *map[string]string
 	StartSession *bool
 }
@@ -64,6 +66,11 @@ func Start(input *StartInput) error {
 	if *input.AWSRegion != "" {
 		awsConfig.Region = input.AWSRegion
 	}
+	if *input.AWSProfile != "" {
+		// Leaving empty filename because of
+		// https://github.com/aws/aws-sdk-go/blob/704cb4634ea23d666b1046363639d44234fb4ed2/aws/credentials/shared_credentials_provider.go#L31
+		awsConfig.Credentials = credentials.NewSharedCredentials("", *input.AWSProfile)
+	}
 	sess := session.Must(session.NewSession(awsConfig))
 	// Get the list of instances
 	ssmDescribeInstancesInput := &ssm.DescribeInstanceInformationInput{}

diff --git a/pkg/session/session.go b/pkg/session/session.go
@@ -7,6 +7,7 @@ import (
 	"os/exec"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ssm"
@@ -18,6 +19,7 @@ type StartInput struct {
 	Target     *string
 	TargetType *string
 	AWSRegion  *string
+	AWSProfile *string
 }
 
 // Start will start a session in chosen EC2 instance
@@ -26,6 +28,11 @@ func Start(input *StartInput) error {
 	if *input.AWSRegion != "" {
 		awsConfig.Region = input.AWSRegion
 	}
+	if *input.AWSProfile != "" {
+		// Leaving empty filename because of
+		// https://github.com/aws/aws-sdk-go/blob/704cb4634ea23d666b1046363639d44234fb4ed2/aws/credentials/shared_credentials_provider.go#L31
+		awsConfig.Credentials = credentials.NewSharedCredentials("", *input.AWSProfile)
+	}
 	sess := session.Must(session.NewSession(awsConfig))
 	var instanceID *string
 	switch *input.TargetType {