Merge pull request #9 from ReSTARTR/feature/args-profile

Add `--profile` option

README.md

@@ -73,6 +73,7 @@ Not Display field headers, if set true.
 ```
 [options]
 creds    = shared
+profile  = default
 region   = ap-northeast-1
 tags     = Role:app,Env:production
 fields   = instance-id,tag:Name,public-ip,private-ip

client/client.go

@@ -30,6 +30,7 @@ var (
 )
 
 type Options struct {
+	Profile     string
 	Filters     map[string]string
 	TagFilters  map[string]string
 	Fields      []string
@@ -63,7 +64,7 @@ func namesToUpper(strs []string) []string {
 func Describe(o *Options, w *tabwriter.Writer) error {
 	// build queries
 	config := &aws.Config{Region: aws.String(o.Region)}
-	credentials, err := creds.SelectCredentials(o.Credentials)
+	credentials, err := creds.SelectCredentials(o.Credentials, o.Profile)
 	if err != nil {
 		return err
 	}

creds/selector.go

@@ -18,13 +18,13 @@ const (
 )
 
 // creds "env" or "shared" or "ec2"
-func SelectCredentials(creds string) (*credentials.Credentials, error) {
+func SelectCredentials(creds string, profile string) (*credentials.Credentials, error) {
 	sharedCredsFile := os.Getenv("HOME") + SHARED_CREDS_FILENAME
 	switch creds {
 	case "env":
 		return credentials.NewEnvCredentials(), nil
 	case "shared":
-		return credentials.NewSharedCredentials(sharedCredsFile, SHARED_CREDS_PROFILE), nil
+		return credentials.NewSharedCredentials(sharedCredsFile, profile), nil
 	case "ec2":
 		return credentials.NewCredentials(&ec2rolecreds.EC2RoleProvider{
 			Client: ec2metadata.New(session.New()),
@@ -35,7 +35,7 @@ func SelectCredentials(creds string) (*credentials.Credentials, error) {
 			&credentials.EnvProvider{},
 			&credentials.SharedCredentialsProvider{
 				Filename: sharedCredsFile,
-				Profile:  SHARED_CREDS_PROFILE,
+				Profile:  profile,
 			},
 			&ec2rolecreds.EC2RoleProvider{
 				Client: ec2metadata.New(session.New()),

main.go

@@ -16,10 +16,10 @@ var (
 	version string
 )
 
-func loadRegionInAwsConfig() string {
+func loadRegionInAwsConfig(profile string) string {
 	cfg, err := creds.LoadAwsConfig()
 	if err == nil {
-		return cfg.Section("default").Key("region").Value()
+		return cfg.Section(profile).Key("region").Value()
 	}
 	return ""
 }
@@ -60,6 +60,7 @@ func parseFieldsString(str string) []string {
 func optionsFromFile() *client.Options {
 	opt := client.NewOptions()
 	if cfg, err := loadConfig(); err == nil {
+		opt.Profile = cfg.Section("options").Key("profile").Value()
 		opt.Region = cfg.Section("options").Key("region").Value()
 		opt.TagFilters = parseFilterString(cfg.Section("options").Key("tags").Value())
 		opt.Fields = parseFieldsString(cfg.Section("options").Key("fields").Value())
@@ -77,6 +78,7 @@ func NewTableWriter() *tabwriter.Writer {
 
 func main() {
 	// parse options
+	profile := flag.String("profile", "default", "profile name of aws credentials")
 	filters := flag.String("filters", "", "key1:value1,key2:value2,...")
 	tagFilters := flag.String("tags", "", "key1:value1,key2:value2,...")
 	fields := flag.String("fields", "", "column1,column2,...")
@@ -91,7 +93,8 @@ func main() {
 	}
 
 	opt := optionsFromFile()
-	awsConfigRegion := loadRegionInAwsConfig()
+	opt.Profile = *profile
+	awsConfigRegion := loadRegionInAwsConfig(opt.Profile)
 	if awsConfigRegion != "" {
 		opt.Region = awsConfigRegion
 	}