added profile override functionality

aliases/aliases.go

@@ -3,6 +3,7 @@ package aliases
 import "os"
 
 var OverrideAwsRegion string
+var OverrideAwsProfile string
 var Search string
 
 func init() {
@@ -11,6 +12,11 @@ func init() {
 		OverrideAwsRegion = "$"
 	}
 
+	OverrideAwsProfile = os.Getenv("ALFRED_AWS_CONSOLE_SERVICES_OVERRIDE_AWS_PROFILE_ALIAS")
+	if OverrideAwsProfile == "" {
+		OverrideAwsProfile = "@"
+	}
+
 	Search = os.Getenv("ALFRED_AWS_CONSOLE_SERVICES_WORKFLOW_SEARCH_ALIAS")
 	if Search == "" {
 		Search = ","

awsconfig/profiles.go

@@ -0,0 +1,83 @@
+package awsconfig
+
+import (
+	"log"
+	"os"
+
+	"github.com/aws/aws-sdk-go-v2/config"
+	"gopkg.in/ini.v1"
+)
+
+type Profile struct {
+	Name   string
+	Region string
+}
+
+var awsProfiles []Profile
+
+func GetAwsProfiles() []Profile {
+	if awsProfiles == nil || len(awsProfiles) <= 0 {
+		loadAwsProfiles()
+	}
+	return awsProfiles
+}
+
+func loadAwsProfiles() {
+	credentialsIniFile, err := ini.Load(GetAwsCredentialsFilePath())
+	if err != nil {
+		log.Println(err)
+	}
+	configIniFile, err := ini.Load(GetAwsProfileFilePath())
+	if err != nil {
+		log.Println(err)
+	}
+
+	awsProfiles = nil
+	if credentialsIniFile != nil {
+		for _, section := range credentialsIniFile.Sections() {
+			if section.Name() == ini.DefaultSection {
+				// AWS does not specify anything useful in the root section
+				continue
+			}
+			profile := Profile{
+				Name: section.Name(),
+			}
+
+			if configIniFile != nil {
+				var sectionName string
+				if profile.Name == "default" {
+					sectionName = profile.Name
+				} else {
+					// all other non-"default" profiles have special prefix
+					sectionName = "profile " + profile.Name
+				}
+				configProfileSection, _ := configIniFile.GetSection(sectionName)
+				if configProfileSection != nil {
+					regionKey, _ := configProfileSection.GetKey("region")
+					if regionKey != nil {
+						profile.Region = regionKey.Value()
+					}
+				}
+			}
+			awsProfiles = append(awsProfiles, profile)
+		}
+	}
+}
+
+func GetAwsCredentialsFilePath() string {
+	// see https://docs.aws.amazon.com/sdkref/latest/guide/file-location.html
+	path, _ := os.LookupEnv("AWS_SHARED_CREDENTIALS_FILE")
+	if path == "" {
+		path = config.DefaultSharedCredentialsFilename()
+	}
+	return path
+}
+
+func GetAwsProfileFilePath() string {
+	// see https://docs.aws.amazon.com/sdkref/latest/guide/file-location.html
+	path, _ := os.LookupEnv("AWS_CONFIG_FILE")
+	if path == "" {
+		path = config.DefaultSharedConfigFilename()
+	}
+	return path
+}

awsworkflow/regions.go → awsconfig/regions.go

@@ -1,4 +1,4 @@
-package awsworkflow
+package awsconfig
 
 type Region struct {
 	Name        string

awsworkflow/aws.go

@@ -9,11 +9,32 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	aw "github.com/deanishe/awgo"
+	"github.com/rkoval/alfred-aws-console-services-workflow/awsconfig"
 	"github.com/rkoval/alfred-aws-console-services-workflow/util"
 )
 
-func InitAWS(transport http.RoundTripper) aws.Config {
-	cfg, err := config.LoadDefaultConfig(context.TODO())
+func InitAWS(transport http.RoundTripper, profile *awsconfig.Profile, region *awsconfig.Region) aws.Config {
+	profileLoadOptionsFunc := func(o *config.LoadOptions) error {
+		return nil
+	}
+	regionLoadOptionsFunc := func(o *config.LoadOptions) error {
+		return nil
+	}
+	if profile != nil {
+		profileLoadOptionsFunc = config.WithSharedConfigProfile(profile.Name)
+		if profile.Region != "" {
+			regionLoadOptionsFunc = config.WithRegion(profile.Region)
+		}
+	}
+	if region != nil {
+		regionLoadOptionsFunc = config.WithRegion(region.Name)
+	}
+
+	cfg, err := config.LoadDefaultConfig(
+		context.TODO(),
+		profileLoadOptionsFunc,
+		regionLoadOptionsFunc,
+	)
 	if err != nil {
 		panic(err)
 	}

go.mod

@@ -26,5 +26,6 @@ require (
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.2.8
 )

go.sum

@@ -96,6 +96,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=

main.go

@@ -7,7 +7,6 @@ import (
 
 	aw "github.com/deanishe/awgo"
 	"github.com/deanishe/awgo/update"
-	"github.com/rkoval/alfred-aws-console-services-workflow/awsworkflow"
 	"github.com/rkoval/alfred-aws-console-services-workflow/workflow"
 )
 
@@ -29,9 +28,7 @@ func init() {
 func main() {
 	wf.Run(func() {
 		log.Printf("running workflow with query: `%s`", query)
-		cfg := awsworkflow.InitAWS(nil)
 		query = strings.TrimLeft(query, " ")
-
-		workflow.Run(wf, query, cfg, forceFetch, openAll, ymlPath)
+		workflow.Run(wf, query, nil, forceFetch, openAll, ymlPath)
 	})
 }

parsers/.snapshots/TestParser-#00

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-$

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(""),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-$us

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)((len=2) "us"),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-$us-west-2

@@ -5,10 +5,12 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)({
+  regionOverride: (*awsconfig.Region)({
     Name: (string) (len=9) "us-west-2",
     Description: (string) (len=16) "US West (Oregon)"
   }),
   RegionQuery: (*string)((len=9) "us-west-2"),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-@

@@ -0,0 +1,13 @@
+(*parsers.Query)({
+  RawQuery: (string) (len=1) "@",
+  Service: (*awsworkflow.AwsService)(<nil>),
+  SubService: (*awsworkflow.AwsService)(<nil>),
+  HasTrailingWhitespace: (bool) false,
+  HasOpenAll: (bool) false,
+  HasDefaultSearchAlias: (bool) false,
+  regionOverride: (*awsconfig.Region)(<nil>),
+  RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(""),
+  RemainingQuery: (string) ""
+})

parsers/.snapshots/TestParser-@prof

@@ -0,0 +1,13 @@
+(*parsers.Query)({
+  RawQuery: (string) (len=5) "@prof",
+  Service: (*awsworkflow.AwsService)(<nil>),
+  SubService: (*awsworkflow.AwsService)(<nil>),
+  HasTrailingWhitespace: (bool) false,
+  HasOpenAll: (bool) false,
+  HasDefaultSearchAlias: (bool) false,
+  regionOverride: (*awsconfig.Region)(<nil>),
+  RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)((len=4) "prof"),
+  RemainingQuery: (string) ""
+})

parsers/.snapshots/TestParser-@profile

@@ -0,0 +1,13 @@
+(*parsers.Query)({
+  RawQuery: (string) (len=8) "@profile",
+  Service: (*awsworkflow.AwsService)(<nil>),
+  SubService: (*awsworkflow.AwsService)(<nil>),
+  HasTrailingWhitespace: (bool) false,
+  HasOpenAll: (bool) false,
+  HasDefaultSearchAlias: (bool) false,
+  regionOverride: (*awsconfig.Region)(<nil>),
+  RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)((len=7) "profile"),
+  RemainingQuery: (string) ""
+})

parsers/.snapshots/TestParser-OPEN_ALL_elasticbeanstalk_environments

@@ -48,7 +48,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) true,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-_

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-___

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-______elasticbeanstalk______

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-_elasticbeanstalk

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-_elasticbeanstalk_

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) ""
 })

parsers/.snapshots/TestParser-_elasticbeanstalk_,search_term_more_hello_

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) true,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) (len=22) "search term more hello"
 })

parsers/.snapshots/TestParser-_elasticbeanstalk_subservice_search_term_more_hello

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) (len=33) "subservice search term more hello"
 })

parsers/.snapshots/TestParser-_elasticbeanstalk_subservice_search_term_more_hello_

@@ -38,7 +38,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) (len=33) "subservice search term more hello"
 })

parsers/.snapshots/TestParser-asdf_asdf

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) false,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) (len=9) "asdf asdf"
 })

parsers/.snapshots/TestParser-asdf_asdf_asdf_

@@ -5,7 +5,9 @@
   HasTrailingWhitespace: (bool) true,
   HasOpenAll: (bool) false,
   HasDefaultSearchAlias: (bool) false,
-  RegionOverride: (*awsworkflow.Region)(<nil>),
+  regionOverride: (*awsconfig.Region)(<nil>),
   RegionQuery: (*string)(<nil>),
+  ProfileOverride: (*awsconfig.Profile)(<nil>),
+  ProfileQuery: (*string)(<nil>),
   RemainingQuery: (string) (len=14) "asdf asdf asdf"
 })