Rename AssumeRoleFromCache (it doesn't always use cache)

redbubble · May 6, 2021 · 7641d00 · 7641d00
1 parent 801ad1e
commit 7641d00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cli/assume_role.go b/cli/assume_role.go
@@ -17,7 +17,7 @@ var notARoleErrorMessage = `'%s' is neither an IAM role ARN nor a configured ali
 
 Run 'yak --list-roles' to see which roles and aliases you can use.`
 
-func AssumeRoleFromCache(role string) (*sts.AssumeRoleWithSAMLOutput, error) {
+func AssumeRole(role string) (*sts.AssumeRoleWithSAMLOutput, error) {
 
 	creds := getAssumedRoleFromCache(role)
 
@@ -33,7 +33,7 @@ func AssumeRoleFromCache(role string) (*sts.AssumeRoleWithSAMLOutput, error) {
 		}
 
 		CacheLoginRoles(loginData.Roles)
-		creds, err = AssumeRole(loginData, role)
+		creds, err = assumeRoleFromAws(loginData, role)
 
 		if err != nil {
 			return nil, err
@@ -69,7 +69,7 @@ func ResolveRole(roleName string) (string, error) {
 	return "", fmt.Errorf(notARoleErrorMessage, roleName)
 }
 
-func AssumeRole(login saml.LoginData, desiredRole string) (*sts.AssumeRoleWithSAMLOutput, error) {
+func assumeRoleFromAws(login saml.LoginData, desiredRole string) (*sts.AssumeRoleWithSAMLOutput, error) {
 	role, err := login.GetLoginRole(desiredRole)
 
 	if err != nil {

diff --git a/cmd/print_credentials.go b/cmd/print_credentials.go
@@ -17,7 +17,7 @@ func printCredentialsCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	creds, err := cli.AssumeRoleFromCache(roleName)
+	creds, err := cli.AssumeRole(roleName)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/shim.go b/cmd/shim.go
@@ -16,7 +16,7 @@ func shimCmd(cmd *cobra.Command, args []string) error {
 
 	command := args[1:]
 
-	creds, err := cli.AssumeRoleFromCache(roleName)
+	creds, err := cli.AssumeRole(roleName)
 	if err != nil {
 		return err
 	}