Skip to content

Commit af89ee0

Browse files
BigTailWolfBigTailWolf
committed
remove the redundant url retrieving in tests
1 parent 1e74fc2 commit af89ee0

File tree

1 file changed

+4
-131
lines changed

1 file changed

+4
-131
lines changed

‎google/internal/externalaccount/aws_test.go

+4-131
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,6 @@ func getExpectedSubjectToken(url, region, accessKeyID, secretAccessKey, security
585585
func TestAWSCredential_BasicRequest(t *testing.T) {
586586
server := createDefaultAwsTestServer()
587587
ts := httptest.NewServer(server)
588-
_, err := neturl.Parse(ts.URL)
589-
if err != nil {
590-
t.Fatalf("couldn't parse httptest servername")
591-
}
592588

593589
tfc := testFileConfig
594590
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -628,10 +624,6 @@ func TestAWSCredential_BasicRequest(t *testing.T) {
628624
func TestAWSCredential_IMDSv2(t *testing.T) {
629625
server := createDefaultAwsTestServerWithImdsv2(t)
630626
ts := httptest.NewServer(server)
631-
_, err := neturl.Parse(ts.URL)
632-
if err != nil {
633-
t.Fatalf("couldn't parse httptest servername")
634-
}
635627

636628
tfc := testFileConfig
637629
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -671,10 +663,6 @@ func TestAWSCredential_IMDSv2(t *testing.T) {
671663
func TestAWSCredential_BasicRequestWithoutSecurityToken(t *testing.T) {
672664
server := createDefaultAwsTestServer()
673665
ts := httptest.NewServer(server)
674-
_, err := neturl.Parse(ts.URL)
675-
if err != nil {
676-
t.Fatalf("couldn't parse httptest servername")
677-
}
678666
delete(server.Credentials, "Token")
679667

680668
tfc := testFileConfig
@@ -715,10 +703,6 @@ func TestAWSCredential_BasicRequestWithoutSecurityToken(t *testing.T) {
715703
func TestAWSCredential_BasicRequestWithEnv(t *testing.T) {
716704
server := createDefaultAwsTestServer()
717705
ts := httptest.NewServer(server)
718-
_, err := neturl.Parse(ts.URL)
719-
if err != nil {
720-
t.Fatalf("couldn't parse httptest servername")
721-
}
722706

723707
tfc := testFileConfig
724708
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -762,10 +746,6 @@ func TestAWSCredential_BasicRequestWithEnv(t *testing.T) {
762746
func TestAWSCredential_BasicRequestWithDefaultEnv(t *testing.T) {
763747
server := createDefaultAwsTestServer()
764748
ts := httptest.NewServer(server)
765-
_, err := neturl.Parse(ts.URL)
766-
if err != nil {
767-
t.Fatalf("couldn't parse httptest servername")
768-
}
769749

770750
tfc := testFileConfig
771751
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -808,10 +788,6 @@ func TestAWSCredential_BasicRequestWithDefaultEnv(t *testing.T) {
808788
func TestAWSCredential_BasicRequestWithTwoRegions(t *testing.T) {
809789
server := createDefaultAwsTestServer()
810790
ts := httptest.NewServer(server)
811-
_, err := neturl.Parse(ts.URL)
812-
if err != nil {
813-
t.Fatalf("couldn't parse httptest servername")
814-
}
815791

816792
tfc := testFileConfig
817793
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -855,10 +831,6 @@ func TestAWSCredential_BasicRequestWithTwoRegions(t *testing.T) {
855831
func TestAWSCredential_RequestWithBadVersion(t *testing.T) {
856832
server := createDefaultAwsTestServer()
857833
ts := httptest.NewServer(server)
858-
_, err := neturl.Parse(ts.URL)
859-
if err != nil {
860-
t.Fatalf("couldn't parse httptest servername")
861-
}
862834

863835
tfc := testFileConfig
864836
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -870,7 +842,7 @@ func TestAWSCredential_RequestWithBadVersion(t *testing.T) {
870842
}()
871843
getenv = setEnvironment(map[string]string{})
872844

873-
_, err = tfc.parse(context.Background())
845+
_, err := tfc.parse(context.Background())
874846
if err == nil {
875847
t.Fatalf("parse() should have failed")
876848
}
@@ -882,10 +854,6 @@ func TestAWSCredential_RequestWithBadVersion(t *testing.T) {
882854
func TestAWSCredential_RequestWithNoRegionURL(t *testing.T) {
883855
server := createDefaultAwsTestServer()
884856
ts := httptest.NewServer(server)
885-
_, err := neturl.Parse(ts.URL)
886-
if err != nil {
887-
t.Fatalf("couldn't parse httptest servername")
888-
}
889857

890858
tfc := testFileConfig
891859
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -915,10 +883,7 @@ func TestAWSCredential_RequestWithNoRegionURL(t *testing.T) {
915883
func TestAWSCredential_RequestWithBadRegionURL(t *testing.T) {
916884
server := createDefaultAwsTestServer()
917885
ts := httptest.NewServer(server)
918-
_, err := neturl.Parse(ts.URL)
919-
if err != nil {
920-
t.Fatalf("couldn't parse httptest servername")
921-
}
886+
922887
server.WriteRegion = notFound
923888

924889
tfc := testFileConfig
@@ -948,10 +913,7 @@ func TestAWSCredential_RequestWithBadRegionURL(t *testing.T) {
948913
func TestAWSCredential_RequestWithMissingCredential(t *testing.T) {
949914
server := createDefaultAwsTestServer()
950915
ts := httptest.NewServer(server)
951-
_, err := neturl.Parse(ts.URL)
952-
if err != nil {
953-
t.Fatalf("couldn't parse httptest servername")
954-
}
916+
955917
server.WriteSecurityCredentials = func(w http.ResponseWriter, r *http.Request) {
956918
w.Write([]byte("{}"))
957919
}
@@ -983,10 +945,7 @@ func TestAWSCredential_RequestWithMissingCredential(t *testing.T) {
983945
func TestAWSCredential_RequestWithIncompleteCredential(t *testing.T) {
984946
server := createDefaultAwsTestServer()
985947
ts := httptest.NewServer(server)
986-
_, err := neturl.Parse(ts.URL)
987-
if err != nil {
988-
t.Fatalf("couldn't parse httptest servername")
989-
}
948+
990949
server.WriteSecurityCredentials = func(w http.ResponseWriter, r *http.Request) {
991950
w.Write([]byte(`{"AccessKeyId":"FOOBARBAS"}`))
992951
}
@@ -1018,10 +977,6 @@ func TestAWSCredential_RequestWithIncompleteCredential(t *testing.T) {
1018977
func TestAWSCredential_RequestWithNoCredentialURL(t *testing.T) {
1019978
server := createDefaultAwsTestServer()
1020979
ts := httptest.NewServer(server)
1021-
_, err := neturl.Parse(ts.URL)
1022-
if err != nil {
1023-
t.Fatalf("couldn't parse httptest servername")
1024-
}
1025980

1026981
tfc := testFileConfig
1027982
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -1051,10 +1006,6 @@ func TestAWSCredential_RequestWithNoCredentialURL(t *testing.T) {
10511006
func TestAWSCredential_RequestWithBadCredentialURL(t *testing.T) {
10521007
server := createDefaultAwsTestServer()
10531008
ts := httptest.NewServer(server)
1054-
_, err := neturl.Parse(ts.URL)
1055-
if err != nil {
1056-
t.Fatalf("couldn't parse httptest servername")
1057-
}
10581009
server.WriteRolename = notFound
10591010

10601011
tfc := testFileConfig
@@ -1084,10 +1035,6 @@ func TestAWSCredential_RequestWithBadCredentialURL(t *testing.T) {
10841035
func TestAWSCredential_RequestWithBadFinalCredentialURL(t *testing.T) {
10851036
server := createDefaultAwsTestServer()
10861037
ts := httptest.NewServer(server)
1087-
_, err := neturl.Parse(ts.URL)
1088-
if err != nil {
1089-
t.Fatalf("couldn't parse httptest servername")
1090-
}
10911038
server.WriteSecurityCredentials = notFound
10921039

10931040
tfc := testFileConfig
@@ -1117,10 +1064,6 @@ func TestAWSCredential_RequestWithBadFinalCredentialURL(t *testing.T) {
11171064
func TestAWSCredential_ShouldNotCallMetadataEndpointWhenCredsAreInEnv(t *testing.T) {
11181065
server := createDefaultAwsTestServer()
11191066
ts := httptest.NewServer(server)
1120-
_, err := neturl.Parse(ts.URL)
1121-
if err != nil {
1122-
t.Fatalf("couldn't parse httptest servername")
1123-
}
11241067

11251068
metadataTs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
11261069
t.Error("Metadata server should not have been called.")
@@ -1169,10 +1112,6 @@ func TestAWSCredential_ShouldNotCallMetadataEndpointWhenCredsAreInEnv(t *testing
11691112
func TestAWSCredential_ShouldCallMetadataEndpointWhenNoRegion(t *testing.T) {
11701113
server := createDefaultAwsTestServerWithImdsv2(t)
11711114
ts := httptest.NewServer(server)
1172-
_, err := neturl.Parse(ts.URL)
1173-
if err != nil {
1174-
t.Fatalf("couldn't parse httptest servername")
1175-
}
11761115

11771116
tfc := testFileConfig
11781117
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -1215,10 +1154,6 @@ func TestAWSCredential_ShouldCallMetadataEndpointWhenNoRegion(t *testing.T) {
12151154
func TestAWSCredential_ShouldCallMetadataEndpointWhenNoAccessKey(t *testing.T) {
12161155
server := createDefaultAwsTestServerWithImdsv2(t)
12171156
ts := httptest.NewServer(server)
1218-
_, err := neturl.Parse(ts.URL)
1219-
if err != nil {
1220-
t.Fatalf("couldn't parse httptest servername")
1221-
}
12221157

12231158
tfc := testFileConfig
12241159
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -1261,10 +1196,6 @@ func TestAWSCredential_ShouldCallMetadataEndpointWhenNoAccessKey(t *testing.T) {
12611196
func TestAWSCredential_ShouldCallMetadataEndpointWhenNoSecretAccessKey(t *testing.T) {
12621197
server := createDefaultAwsTestServerWithImdsv2(t)
12631198
ts := httptest.NewServer(server)
1264-
_, err := neturl.Parse(ts.URL)
1265-
if err != nil {
1266-
t.Fatalf("couldn't parse httptest servername")
1267-
}
12681199

12691200
tfc := testFileConfig
12701201
tfc.CredentialSource = server.getCredentialSource(ts.URL)
@@ -1303,61 +1234,3 @@ func TestAWSCredential_ShouldCallMetadataEndpointWhenNoSecretAccessKey(t *testin
13031234
t.Errorf("subjectToken = \n%q\n want \n%q", got, want)
13041235
}
13051236
}
1306-
1307-
func TestAWSCredential_Validations(t *testing.T) {
1308-
var metadataServerValidityTests = []struct {
1309-
name string
1310-
credSource CredentialSource
1311-
errText string
1312-
}{
1313-
{
1314-
name: "No Metadata Server URLs",
1315-
credSource: CredentialSource{
1316-
EnvironmentID: "aws1",
1317-
RegionURL: "",
1318-
URL: "",
1319-
IMDSv2SessionTokenURL: "",
1320-
},
1321-
}, {
1322-
name: "IPv4 Metadata Server URLs",
1323-
credSource: CredentialSource{
1324-
EnvironmentID: "aws1",
1325-
RegionURL: "http://169.254.169.254/latest/meta-data/placement/availability-zone",
1326-
URL: "http://169.254.169.254/latest/meta-data/iam/security-credentials",
1327-
IMDSv2SessionTokenURL: "http://169.254.169.254/latest/api/token",
1328-
},
1329-
}, {
1330-
name: "IPv6 Metadata Server URLs",
1331-
credSource: CredentialSource{
1332-
EnvironmentID: "aws1",
1333-
RegionURL: "http://[fd00:ec2::254]/latest/meta-data/placement/availability-zone",
1334-
URL: "http://[fd00:ec2::254]/latest/meta-data/iam/security-credentials",
1335-
IMDSv2SessionTokenURL: "http://[fd00:ec2::254]/latest/api/token",
1336-
},
1337-
},
1338-
}
1339-
1340-
for _, tt := range metadataServerValidityTests {
1341-
t.Run(tt.name, func(t *testing.T) {
1342-
tfc := testFileConfig
1343-
tfc.CredentialSource = tt.credSource
1344-
1345-
oldGetenv := getenv
1346-
defer func() { getenv = oldGetenv }()
1347-
getenv = setEnvironment(map[string]string{})
1348-
1349-
_, err := tfc.parse(context.Background())
1350-
if err != nil {
1351-
if tt.errText == "" {
1352-
t.Errorf("Didn't expect an error, but got %v", err)
1353-
} else if tt.errText != err.Error() {
1354-
t.Errorf("Expected %v, but got %v", tt.errText, err)
1355-
}
1356-
} else {
1357-
if tt.errText != "" {
1358-
t.Errorf("Expected error %v, but got none", tt.errText)
1359-
}
1360-
}
1361-
})
1362-
}
1363-
}

0 commit comments

Comments
 (0)