Adds context tests

Author: aeitzman

google/externalaccount/aws_test.go

@@ -1371,7 +1371,7 @@ func TestAWSCredential_ProgrammaticAuthRegionError(t *testing.T) {
 	}
 }
 
-func TestAWSCredential_ProgrammaticAuthContext(t *testing.T) {
+func TestAWSCredential_ProgrammaticAuthOptions(t *testing.T) {
 	tfc := testFileConfig
 	securityCredentials := AwsSecurityCredentials{
 		AccessKeyID:     accessKeyID,
@@ -1396,6 +1396,31 @@ func TestAWSCredential_ProgrammaticAuthContext(t *testing.T) {
 	}
 }
 
+func TestAWSCredential_ProgrammaticAuthContext(t *testing.T) {
+	tfc := testFileConfig
+	securityCredentials := AwsSecurityCredentials{
+		AccessKeyID:     accessKeyID,
+		SecretAccessKey: secretAccessKey,
+	}
+	ctx := context.Background()
+
+	tfc.AwsSecurityCredentialsSupplier = testAwsSupplier{
+		awsRegion:       "us-east-2",
+		credentials:     &securityCredentials,
+		expectedContext: ctx,
+	}
+
+	base, err := tfc.parse(ctx)
+	if err != nil {
+		t.Fatalf("parse() failed %v", err)
+	}
+
+	_, err = base.subjectToken()
+	if err != nil {
+		t.Fatalf("subjectToken() failed %v", err)
+	}
+}
+
 func TestAwsCredential_CredentialSourceType(t *testing.T) {
 	server := createDefaultAwsTestServer()
 	ts := httptest.NewServer(server)
@@ -1419,6 +1444,7 @@ type testAwsSupplier struct {
 	awsRegion       string
 	credentials     *AwsSecurityCredentials
 	expectedOptions *SupplierOptions
+	expectedContext context.Context
 }
 
 func (supp testAwsSupplier) AwsRegion(ctx context.Context, options SupplierOptions) (string, error) {
@@ -1433,6 +1459,11 @@ func (supp testAwsSupplier) AwsRegion(ctx context.Context, options SupplierOptio
 			return "", errors.New("Audience does not match")
 		}
 	}
+	if supp.expectedContext != nil {
+		if supp.expectedContext != ctx {
+			return "", errors.New("Context does not match")
+		}
+	}
 	return supp.awsRegion, nil
 }
 
@@ -1448,5 +1479,10 @@ func (supp testAwsSupplier) AwsSecurityCredentials(ctx context.Context, options
 			return nil, errors.New("Audience does not match")
 		}
 	}
+	if supp.expectedContext != nil {
+		if supp.expectedContext != ctx {
+			return nil, errors.New("Context does not match")
+		}
+	}
 	return supp.credentials, nil
 }

google/externalaccount/programmaticrefreshcredsource_test.go

@@ -54,13 +54,13 @@ func TestRetrieveSubjectToken_ProgrammaticAuthFails(t *testing.T) {
 	}
 }
 
-func TestRetrieveSubjectToken_ProgrammaticAuthContext(t *testing.T) {
+func TestRetrieveSubjectToken_ProgrammaticAuthOptions(t *testing.T) {
 	tfc := testConfig
 	expectedOptions := SupplierOptions{Audience: tfc.Audience, SubjectTokenType: tfc.SubjectTokenType}
 
 	tfc.SubjectTokenSupplier = testSubjectTokenSupplier{
 		subjectToken:    "subjectToken",
-		expectedContext: &expectedOptions,
+		expectedOptions: &expectedOptions,
 	}
 
 	base, err := tfc.parse(context.Background())
@@ -74,23 +74,49 @@ func TestRetrieveSubjectToken_ProgrammaticAuthContext(t *testing.T) {
 	}
 }
 
+func TestRetrieveSubjectToken_ProgrammaticAuthContext(t *testing.T) {
+	tfc := testConfig
+	ctx := context.Background()
+
+	tfc.SubjectTokenSupplier = testSubjectTokenSupplier{
+		subjectToken:    "subjectToken",
+		expectedContext: ctx,
+	}
+
+	base, err := tfc.parse(ctx)
+	if err != nil {
+		t.Fatalf("parse() failed %v", err)
+	}
+
+	_, err = base.subjectToken()
+	if err != nil {
+		t.Fatalf("retrieveSubjectToken() failed: %v", err)
+	}
+}
+
 type testSubjectTokenSupplier struct {
 	err             error
 	subjectToken    string
-	expectedContext *SupplierOptions
+	expectedOptions *SupplierOptions
+	expectedContext context.Context
 }
 
 func (supp testSubjectTokenSupplier) SubjectToken(ctx context.Context, options SupplierOptions) (string, error) {
 	if supp.err != nil {
 		return "", supp.err
 	}
-	if supp.expectedContext != nil {
-		if supp.expectedContext.Audience != options.Audience {
+	if supp.expectedOptions != nil {
+		if supp.expectedOptions.Audience != options.Audience {
 			return "", errors.New("Audience does not match")
 		}
-		if supp.expectedContext.SubjectTokenType != options.SubjectTokenType {
+		if supp.expectedOptions.SubjectTokenType != options.SubjectTokenType {
 			return "", errors.New("Audience does not match")
 		}
 	}
+	if supp.expectedContext != nil {
+		if supp.expectedContext != ctx {
+			return "", errors.New("Context does not match")
+		}
+	}
 	return supp.subjectToken, nil
 }