Merge pull request #2 from AO-AO/master

Use credential or config in ~/.aws/ by default

Author: FrontMage

db/dbsession.go

@@ -11,16 +11,30 @@ import (
 var DynamoDB *dynamodb.DynamoDB
 
 // GetDynamoSession returns a new dynamodb session
-func GetDynamoSession(accessKeyID, secretAccessKey, region string) *dynamodb.DynamoDB {
-	token := ""
-	creds := credentials.NewStaticCredentials(accessKeyID, secretAccessKey, token)
-	_, err := creds.Get()
-	if err != nil {
-		panic(err)
+func GetDynamoSession(accessKeyID, secretAccessKey, region string) (*dynamodb.DynamoDB, error) {
+	sessionConfig := session.Options{}
+	if accessKeyID != "" || secretAccessKey != "" {
+		token := ""
+		creds := credentials.NewStaticCredentials(accessKeyID, secretAccessKey, token)
+		_, err := creds.Get()
+		if err != nil {
+			return nil, err
+		}
+		sessionConfig.Config.Credentials = creds
 	}
 
-	DynamoDB = dynamodb.New(session.New(&aws.Config{Region: &region}))
-	return DynamoDB
+	if region != "" {
+		sessionConfig.Config.Region = &region
+	} else {
+		sessionConfig.SharedConfigState = session.SharedConfigEnable
+	}
+
+	session, err := session.NewSessionWithOptions(sessionConfig)
+	if err != nil {
+		return nil, err
+	}
+	DynamoDB = dynamodb.New(session)
+	return DynamoDB, nil
 }
 
 // ListTable returns all table names from dynamoDB

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
@@ -214,17 +215,14 @@ func main() {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			if region == "" {
-				fmt.Println("Must provide aws config region")
-			} else if accessKeyID == "" {
-				fmt.Println("Must provide aws config access key id")
-			} else if secretAccessKey == "" {
-				fmt.Println("Must provide aws config secret access key")
-			} else {
-				db.GetDynamoSession(accessKeyID, secretAccessKey, region)
+			if !((accessKeyID == "" && secretAccessKey == "") || (accessKeyID != "" && secretAccessKey != "")) {
+				return errors.New("Must provide access key id and secret access key at the same time")
+			} else if _, err := db.GetDynamoSession(accessKeyID, secretAccessKey, region); err == nil {
 				runPrompt(tablePrefix)
+				return nil
+			} else {
+				return err
 			}
-			return nil
 		},
 	}