iam-sync-users/iam-public-ssh-keys: Use common.OpenSession

hamstah · Jul 18, 2019 · 115644d · 115644d
1 parent 7e66c1b
commit 115644d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/iam/public-ssh-keys/main.go b/iam/public-ssh-keys/main.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/hamstah/awstools/common"
@@ -25,8 +24,7 @@ func main() {
 	kingpin.CommandLine.Help = "Return public SSH keys for an IAM user."
 	flags := common.HandleFlags()
 
-	session := session.Must(session.NewSession())
-	conf := common.AssumeRoleConfig(flags, session)
+	session, conf := common.OpenSession(flags)
 
 	iamClient := iam.New(session, conf)
 

diff --git a/iam/sync-users/main.go b/iam/sync-users/main.go
@@ -13,7 +13,6 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hamstah/awstools/common"
 	log "github.com/sirupsen/logrus"
@@ -40,8 +39,7 @@ func main() {
 	flags := common.HandleFlags()
 	common.FatalOnError(ensureCanCreateUser())
 
-	session := session.Must(session.NewSession())
-	conf := common.AssumeRoleConfig(flags, session)
+	session, conf := common.OpenSession(flags)
 
 	iamClient := iam.New(session, conf)
 
@@ -199,8 +197,8 @@ func syncUserGroups(iamUser *IAMUser) error {
 	groupsStr := strings.Join(iamUser.Groups, ",")
 	log.WithFields(log.Fields{
 		"username": iamUser.Username,
-		"groups": groupsStr,
-		}).Info("Setting user groups")
+		"groups":   groupsStr,
+	}).Info("Setting user groups")
 	return RunCommand("/usr/sbin/usermod", "-G", groupsStr, iamUser.Username)
 }