fix: bump version and improve util test

dnitsch · dnitsch · commit e264c0077ff0 · 2022-05-16T16:42:50.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 OWNER := dnitsch
 NAME := aws-cli-auth
-VERSION := v0.8.0
+VERSION := v0.8.1
 REVISION := $(shell git rev-parse --short HEAD)
 
 LDFLAGS := -ldflags="-s -w -X \"github.com/dnitsch/aws-cli-auth/cmd.Version=$(VERSION)\" -X \"github.com/dnitsch/aws-cli-auth/cmd.Revision=$(REVISION)\" -extldflags -static"
diff --git a/README.md b/README.md
@@ -20,6 +20,8 @@ By default the tool creates the session name - which can be audited including th
 
 - As the process of re-requesting new credentials is **by design** and should be used in places where it cannot be automated - it is good idea **IF POSSIBLE** to use longer sessions for ***NON LIVE*** AWS accounts so that the prompt is not too frequent.
 
+- Prior to `v0.8.0` you might be need to manually kill the `aws-cli-auth` process manually from your OS's process manager.
+
 ## Install
 
 MacOS
diff --git a/cmd/clear.go b/cmd/clear.go
@@ -36,7 +36,7 @@ func clear(cmd *cobra.Command, args []string) {
 	}
 	secretStore.ClearAll()
 
-	if err := os.Remove(util.ConfigIniFile()); err != nil {
+	if err := os.Remove(util.ConfigIniFile("")); err != nil {
 		util.Exit(err)
 	}
 
diff --git a/cmd/root.go b/cmd/root.go
@@ -40,10 +40,10 @@ func init() {
 
 func initConfig() {
 	util.IsTraceEnabled = verbose
-	if _, err := os.Stat(util.ConfigIniFile()); err != nil {
+	if _, err := os.Stat(util.ConfigIniFile("")); err != nil {
 		// creating a file
 		rolesInit := []byte(fmt.Sprintf("[%s]\n", config.INI_CONF_SECTION))
-		err := os.WriteFile(util.ConfigIniFile(), rolesInit, 0644)
+		err := os.WriteFile(util.ConfigIniFile(""), rolesInit, 0644)
 		cobra.CheckErr(err)
 	}
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/dnitsch/aws-cli-auth
 go 1.17
 
 require (
-	github.com/aws/aws-sdk-go v1.43.12
+	github.com/aws/aws-sdk-go v1.44.14
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.3.0
@@ -25,7 +25,7 @@ require (
 )
 
 require (
-	github.com/go-rod/rod v0.105.1
+	github.com/go-rod/rod v0.106.6
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
diff --git a/go.sum b/go.sum
@@ -91,8 +91,8 @@ github.com/avelino/slugify v0.0.0-20180501145920-855f152bd774/go.mod h1:5wi5YYOp
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.37.32/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.43.12 h1:wOdx6+reSDpUBFEuJDA6edCrojzy8rOtMzhS2rD9+7M=
-github.com/aws/aws-sdk-go v1.43.12/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.14 h1:qd7/muV1rElsbvkK9D1nHUzBoDlEw2etfeo4IE82eSQ=
+github.com/aws/aws-sdk-go v1.44.14/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -199,8 +199,8 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-rod/rod v0.105.1 h1:r0bNmO9siOe13lG6Vbkaak11u48rYmWGl/Hk4MJdOiE=
-github.com/go-rod/rod v0.105.1/go.mod h1:Wrnn6HokFHskwaIVke3ML1y/NBVp7XPIeB8eDzR9vuw=
+github.com/go-rod/rod v0.106.6 h1:zJorVPG7s8Xgbh7PkSySP4FNoo0OiougKaMb3j6zT6w=
+github.com/go-rod/rod v0.106.6/go.mod h1:xkZOchuKqTOkMOBkrzb7uJpbKZRab1haPCWDvuZkS2U=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -584,8 +584,8 @@ github.com/werf/logboek v0.5.1/go.mod h1:1RKvhO4ulmpD5sUN/9a2XsRjt+Xh8CxJjMbmya8
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=
 github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=
-github.com/ysmood/got v0.23.2 h1:U2U0vyQ/gDaawkKJZK/hyza8UUXbWCurbmazK7AcAfY=
-github.com/ysmood/got v0.23.2/go.mod h1:pE1l4LOwOBhQg6A/8IAatkGp7uZjnalzrZolnlhhMgY=
+github.com/ysmood/got v0.29.1 h1:7TNTm3Bw5kdBGXFp04qnZ9DqlZ1XS1z1JdeobeJY6Mo=
+github.com/ysmood/got v0.29.1/go.mod h1:pE1l4LOwOBhQg6A/8IAatkGp7uZjnalzrZolnlhhMgY=
 github.com/ysmood/gotrace v0.6.0 h1:SyI1d4jclswLhg7SWTL6os3L1WOKeNn/ZtzVQF8QmdY=
 github.com/ysmood/gotrace v0.6.0/go.mod h1:TzhIG7nHDry5//eYZDYcTzuJLYQIkykJzCRIo4/dzQM=
 github.com/ysmood/gson v0.7.1 h1:zKL2MTGtynxdBdlZjyGsvEOZ7dkxaY5TH6QhAbTgz0Q=
diff --git a/internal/auth/saml.go b/internal/auth/saml.go
@@ -28,18 +28,17 @@ func GetSamlCreds(conf config.SamlConfig) {
 
 		t, err := webBrowser.GetSamlLogin(conf)
 		if err != nil {
-			util.Writeln("Err: %v", err)
+			util.Exit(err)
 		}
 		user, err := user.Current()
 		if err != nil {
-			util.Writeln(err.Error())
+			util.Exit(err)
 		}
 
 		roleObj := &util.AWSRole{RoleARN: conf.BaseConfig.Role, PrincipalARN: conf.PrincipalArn, Name: util.SessionName(user.Username, config.SELF_NAME), Duration: conf.Duration}
 
 		awsCreds, err = LoginStsSaml(t, roleObj)
 		if err != nil {
-			util.Writeln("%v", err)
 			util.Exit(err)
 		}
 
diff --git a/internal/util/helper.go b/internal/util/helper.go
@@ -24,8 +24,14 @@ func HomeDir() string {
 	return home
 }
 
-func ConfigIniFile() string {
-	return path.Join(HomeDir(), fmt.Sprintf(".%s.ini", config.SELF_NAME))
+func ConfigIniFile(basePath string) string {
+	var base = ""
+	if basePath != "" {
+		base = basePath
+	} else {
+		base = HomeDir()
+	}
+	return path.Join(base, fmt.Sprintf(".%s.ini", config.SELF_NAME))
 }
 
 func WriteDataDir(datadir string) {
@@ -41,6 +47,7 @@ func SetCredentials(creds *AWSCredentials, config config.SamlConfig) {
 	if config.BaseConfig.StoreInProfile {
 		if err := storeCredentialsInProfile(*creds, config.BaseConfig.CfgSectionName); err != nil {
 			Traceln("Error: %s", err.Error())
+			Exit(err)
 		}
 		return
 	}
@@ -128,9 +135,10 @@ func IsValid(cred *AWSCredentials) bool {
 	return err == nil
 }
 
+// WriteIniSection update ini sections in own config file
 func WriteIniSection(role string) error {
 	section := fmt.Sprintf("%s.%s", config.INI_CONF_SECTION, RoleKeyConverter(role))
-	cfg, err := ini.Load(ConfigIniFile())
+	cfg, err := ini.Load(ConfigIniFile(""))
 	if err != nil {
 		Writeln("Fail to read Ini file: %v", err)
 		Exit(err)
@@ -141,15 +149,15 @@ func WriteIniSection(role string) error {
 			return err
 		}
 		sct.Key("name").SetValue(role)
-		cfg.SaveTo(ConfigIniFile())
+		cfg.SaveTo(ConfigIniFile(""))
 	}
 
 	return nil
 }
 
 func GetAllIniSections() ([]string, error) {
 	sections := []string{}
-	cfg, err := ini.Load(ConfigIniFile())
+	cfg, err := ini.Load(ConfigIniFile(""))
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/util/helper_test.go b/internal/util/helper_test.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/dnitsch/aws-cli-auth/internal/config"
@@ -25,8 +26,10 @@ func TestGetEntryInIni(t *testing.T) {
 
 //
 func TestCreateEntryInIni(t *testing.T) {
+	dir, _ := os.Getwd()
+	cfg, err := ini.Load(ConfigIniFile(dir))
+	// config.INI_CONF_SECTION = "unitTestRole"
 
-	cfg, err := ini.Load(ConfigIniFile())
 	if err != nil {
 		Writeln("Fail to read Ini file: %v", err)
 		Exit(err)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func clear(cmd *cobra.Command, args []string) {`
`36`	`36`	`}`
`37`	`37`	`secretStore.ClearAll()`
`38`	`38`
`39`		`- if err := os.Remove(util.ConfigIniFile()); err != nil {`
	`39`	`+ if err := os.Remove(util.ConfigIniFile("")); err != nil {`
`40`	`40`	`util.Exit(err)`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,10 @@ func init() {`
`40`	`40`
`41`	`41`	`func initConfig() {`
`42`	`42`	`util.IsTraceEnabled = verbose`
`43`		`- if _, err := os.Stat(util.ConfigIniFile()); err != nil {`
	`43`	`+ if _, err := os.Stat(util.ConfigIniFile("")); err != nil {`
`44`	`44`	`// creating a file`
`45`	`45`	`rolesInit := []byte(fmt.Sprintf("[%s]\n", config.INI_CONF_SECTION))`
`46`		`- err := os.WriteFile(util.ConfigIniFile(), rolesInit, 0644)`
	`46`	`+ err := os.WriteFile(util.ConfigIniFile(""), rolesInit, 0644)`
`47`	`47`	`cobra.CheckErr(err)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,18 +28,17 @@ func GetSamlCreds(conf config.SamlConfig) {`
`28`	`28`
`29`	`29`	`t, err := webBrowser.GetSamlLogin(conf)`
`30`	`30`	`if err != nil {`
`31`		`- util.Writeln("Err: %v", err)`
	`31`	`+ util.Exit(err)`
`32`	`32`	`}`
`33`	`33`	`user, err := user.Current()`
`34`	`34`	`if err != nil {`
`35`		`- util.Writeln(err.Error())`
	`35`	`+ util.Exit(err)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`roleObj := &util.AWSRole{RoleARN: conf.BaseConfig.Role, PrincipalARN: conf.PrincipalArn, Name: util.SessionName(user.Username, config.SELF_NAME), Duration: conf.Duration}`
`39`	`39`
`40`	`40`	`awsCreds, err = LoginStsSaml(t, roleObj)`
`41`	`41`	`if err != nil {`
`42`		`- util.Writeln("%v", err)`
`43`	`42`	`util.Exit(err)`
`44`	`43`	`}`
`45`	`44`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,14 @@ func HomeDir() string {`
`24`	`24`	`return home`
`25`	`25`	`}`
`26`	`26`
`27`		`-func ConfigIniFile() string {`
`28`		`- return path.Join(HomeDir(), fmt.Sprintf(".%s.ini", config.SELF_NAME))`
	`27`	`+func ConfigIniFile(basePath string) string {`
	`28`	`+ var base = ""`
	`29`	`+ if basePath != "" {`
	`30`	`+ base = basePath`
	`31`	`+ } else {`
	`32`	`+ base = HomeDir()`
	`33`	`+ }`
	`34`	`+ return path.Join(base, fmt.Sprintf(".%s.ini", config.SELF_NAME))`
`29`	`35`	`}`
`30`	`36`
`31`	`37`	`func WriteDataDir(datadir string) {`
`@@ -41,6 +47,7 @@ func SetCredentials(creds *AWSCredentials, config config.SamlConfig) {`
`41`	`47`	`if config.BaseConfig.StoreInProfile {`
`42`	`48`	`if err := storeCredentialsInProfile(*creds, config.BaseConfig.CfgSectionName); err != nil {`
`43`	`49`	`Traceln("Error: %s", err.Error())`
	`50`	`+ Exit(err)`
`44`	`51`	`}`
`45`	`52`	`return`
`46`	`53`	`}`
`@@ -128,9 +135,10 @@ func IsValid(cred *AWSCredentials) bool {`
`128`	`135`	`return err == nil`
`129`	`136`	`}`
`130`	`137`
	`138`	`+// WriteIniSection update ini sections in own config file`
`131`	`139`	`func WriteIniSection(role string) error {`
`132`	`140`	`section := fmt.Sprintf("%s.%s", config.INI_CONF_SECTION, RoleKeyConverter(role))`
`133`		`- cfg, err := ini.Load(ConfigIniFile())`
	`141`	`+ cfg, err := ini.Load(ConfigIniFile(""))`
`134`	`142`	`if err != nil {`
`135`	`143`	`Writeln("Fail to read Ini file: %v", err)`
`136`	`144`	`Exit(err)`
`@@ -141,15 +149,15 @@ func WriteIniSection(role string) error {`
`141`	`149`	`return err`
`142`	`150`	`}`
`143`	`151`	`sct.Key("name").SetValue(role)`
`144`		`- cfg.SaveTo(ConfigIniFile())`
	`152`	`+ cfg.SaveTo(ConfigIniFile(""))`
`145`	`153`	`}`
`146`	`154`
`147`	`155`	`return nil`
`148`	`156`	`}`
`149`	`157`
`150`	`158`	`func GetAllIniSections() ([]string, error) {`
`151`	`159`	`sections := []string{}`
`152`		`- cfg, err := ini.Load(ConfigIniFile())`
	`160`	`+ cfg, err := ini.Load(ConfigIniFile(""))`
`153`	`161`	`if err != nil {`
`154`	`162`	`return nil, err`
`155`	`163`	`}`