Tune/address review feedback

Author: Byron Wolfman

internal/aws.go

@@ -85,18 +85,18 @@ func readRoleFromAWS(role string, request *Request) (*iam.Role, error) {
 	return roleObject, nil
 }
 
-func constructAssumeRoleInput(arn string, externalId string, sessionName string) (*sts.AssumeRoleInput) {
+func constructAssumeRoleInput(arn string, externalId string) (*sts.AssumeRoleInput) {
 	if externalId == "" {
 		return &sts.AssumeRoleInput{
 			RoleArn:         aws.String(arn),
-			RoleSessionName: aws.String(sessionName),
+			RoleSessionName: aws.String("go-metadataproxy"),
 		}
 	}
 
 	return &sts.AssumeRoleInput{
 		ExternalId:      aws.String(externalId),
 		RoleArn:         aws.String(arn),
-		RoleSessionName: aws.String(sessionName),
+		RoleSessionName: aws.String("go-metadataproxy"),
 	}
 }
 
@@ -111,7 +111,7 @@ func assumeRoleFromAWS(arn string, externalId string, request *Request) (*sts.As
 
 	request.setLabel("assume_role_from_aws_cache", "miss")
 	request.log.Infof("Requesting STS Assume Role info for %s from AWS", arn)
-	req := stsService.AssumeRoleRequest(constructAssumeRoleInput(arn, externalId, "go-metadataproxy"))
+	req := stsService.AssumeRoleRequest(constructAssumeRoleInput(arn, externalId))
 
 	assumedRole, err := req.Send()
 	if err != nil {

internal/docker.go

@@ -105,9 +105,9 @@ func findDockerContainerIAMRole(container *docker.Container, request *Request) (
 	return "", fmt.Errorf("Could not find IAM_ROLE in the container ENV config")
 }
 
-func findDockerContainerExternalId(container *docker.Container, request *Request) (string, error) {
+func findDockerContainerExternalId(container *docker.Container, request *Request) string {
 	v, _ := findDockerContainerEnvValue(container, "IAM_EXTERNAL_ID")
-	return v, nil
+	return v
 }
 
 func findDockerContainerEnvValue(container *docker.Container, key string) (string, bool) {

internal/http_helper.go

@@ -48,16 +48,13 @@ func findContainerRoleByAddress(addr string, request *Request) (*iam.Role, strin
 		return nil, "", err
 	}
 
-	externalId, err := findDockerContainerExternalId(container, request)
-	if err != nil {
-		return nil, "", err
-	}
-
 	role, err := readRoleFromAWS(roleName, request)
 	if err != nil {
 		return nil, "", err
 	}
 
+	externalId := findDockerContainerExternalId(container, request)
+
 	return role, externalId, nil
 }