fix(storage): Avoid integration test segfaults. (#12419)

cjc25 · web-flow · commit a9dec0763f85 · 2025-06-09T17:17:31.000-04:00
* fix(storage): Avoid integration test segfaults.

If the JWT private key file is not specified in an environment variable,
then skip the tests which would otherwise require it. This matches what
other tests do. Without this change, `jwt.Email` results in a nil
dereference.

* fix typo

* Move from skip to fatal
diff --git a/storage/integration_test.go b/storage/integration_test.go
@@ -2682,7 +2682,7 @@ func TestIntegration_SignedURL(t *testing.T) {
 			t.Fatal(err)
 		}
 		if jwtConf == nil {
-			t.Skip("JSON key file is not present")
+			t.Fatal("JSON key file is not present")
 		}
 
 		bkt := client.Bucket(bucket)
@@ -2803,7 +2803,7 @@ func TestIntegration_SignedURL_WithEncryptionKeys(t *testing.T) {
 			t.Fatal(err)
 		}
 		if jwtConf == nil {
-			t.Skip("JSON key file is not present")
+			t.Fatal("JSON key file is not present")
 		}
 
 		bkt := client.Bucket(bucket)
@@ -2890,7 +2890,7 @@ func TestIntegration_SignedURL_EmptyStringObjectName(t *testing.T) {
 			t.Fatal(err)
 		}
 		if jwtConf == nil {
-			t.Skip("JSON key file is not present")
+			t.Fatal("JSON key file is not present")
 		}
 
 		opts := &SignedURLOptions{
@@ -4048,6 +4048,10 @@ func TestIntegration_RequesterPaysOwner(t *testing.T) {
 		if err != nil {
 			t.Fatalf("testutil.JWTConfig: %v", err)
 		}
+		if jwt == nil {
+			t.Fatal("JSON key file is not present")
+		}
+
 		// an account that has permissions on the project that owns the bucket
 		mainUserEmail := jwt.Email
 
@@ -6468,7 +6472,7 @@ func TestIntegration_PostPolicyV4(t *testing.T) {
 			t.Fatal(err)
 		}
 		if jwtConf == nil {
-			t.Skip("JSON key file is not present")
+			t.Fatal("JSON key file is not present")
 		}
 
 		projectID := testutil.ProjID()
@@ -6651,6 +6655,9 @@ func TestIntegration_SignedURL_DefaultSignBytes(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unable to find test credentials: %v", err)
 		}
+		if jwt == nil {
+			t.Fatal("JSON key file is not present")
+		}
 
 		obj := "testBucketSignedURL"
 		contents := []byte("test")
@@ -6745,6 +6752,9 @@ func TestIntegration_PostPolicyV4_BucketDefault(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unable to find test credentials: %v", err)
 		}
+		if jwt == nil {
+			t.Fatal("JSON key file is not present")
+		}
 
 		statusCodeToRespond := 200
 
@@ -6810,7 +6820,7 @@ func TestIntegration_PostPolicyV4_SignedURL_WithSignBytes(t *testing.T) {
 			t.Fatal(err)
 		}
 		if jwtConf == nil {
-			t.Skip("JSON key file is not present")
+			t.Fatal("JSON key file is not present")
 		}
 
 		signingFunc := func(b []byte) ([]byte, error) {

Original file line number	Diff line number	Diff line change
`@@ -2682,7 +2682,7 @@ func TestIntegration_SignedURL(t *testing.T) {`
`2682`	`2682`	`t.Fatal(err)`
`2683`	`2683`	`}`
`2684`	`2684`	`if jwtConf == nil {`
`2685`		`- t.Skip("JSON key file is not present")`
	`2685`	`+ t.Fatal("JSON key file is not present")`
`2686`	`2686`	`}`
`2687`	`2687`
`2688`	`2688`	`bkt := client.Bucket(bucket)`
`@@ -2803,7 +2803,7 @@ func TestIntegration_SignedURL_WithEncryptionKeys(t *testing.T) {`
`2803`	`2803`	`t.Fatal(err)`
`2804`	`2804`	`}`
`2805`	`2805`	`if jwtConf == nil {`
`2806`		`- t.Skip("JSON key file is not present")`
	`2806`	`+ t.Fatal("JSON key file is not present")`
`2807`	`2807`	`}`
`2808`	`2808`
`2809`	`2809`	`bkt := client.Bucket(bucket)`
`@@ -2890,7 +2890,7 @@ func TestIntegration_SignedURL_EmptyStringObjectName(t *testing.T) {`
`2890`	`2890`	`t.Fatal(err)`
`2891`	`2891`	`}`
`2892`	`2892`	`if jwtConf == nil {`
`2893`		`- t.Skip("JSON key file is not present")`
	`2893`	`+ t.Fatal("JSON key file is not present")`
`2894`	`2894`	`}`
`2895`	`2895`
`2896`	`2896`	`opts := &SignedURLOptions{`
`@@ -4048,6 +4048,10 @@ func TestIntegration_RequesterPaysOwner(t *testing.T) {`
`4048`	`4048`	`if err != nil {`
`4049`	`4049`	`t.Fatalf("testutil.JWTConfig: %v", err)`
`4050`	`4050`	`}`
	`4051`	`+ if jwt == nil {`
	`4052`	`+ t.Fatal("JSON key file is not present")`
	`4053`	`+ }`
	`4054`	`+`
`4051`	`4055`	`// an account that has permissions on the project that owns the bucket`
`4052`	`4056`	`mainUserEmail := jwt.Email`
`4053`	`4057`
`@@ -6468,7 +6472,7 @@ func TestIntegration_PostPolicyV4(t *testing.T) {`
`6468`	`6472`	`t.Fatal(err)`
`6469`	`6473`	`}`
`6470`	`6474`	`if jwtConf == nil {`
`6471`		`- t.Skip("JSON key file is not present")`
	`6475`	`+ t.Fatal("JSON key file is not present")`
`6472`	`6476`	`}`
`6473`	`6477`
`6474`	`6478`	`projectID := testutil.ProjID()`
`@@ -6651,6 +6655,9 @@ func TestIntegration_SignedURL_DefaultSignBytes(t *testing.T) {`
`6651`	`6655`	`if err != nil {`
`6652`	`6656`	`t.Fatalf("unable to find test credentials: %v", err)`
`6653`	`6657`	`}`
	`6658`	`+ if jwt == nil {`
	`6659`	`+ t.Fatal("JSON key file is not present")`
	`6660`	`+ }`
`6654`	`6661`
`6655`	`6662`	`obj := "testBucketSignedURL"`
`6656`	`6663`	`contents := []byte("test")`
`@@ -6745,6 +6752,9 @@ func TestIntegration_PostPolicyV4_BucketDefault(t *testing.T) {`
`6745`	`6752`	`if err != nil {`
`6746`	`6753`	`t.Fatalf("unable to find test credentials: %v", err)`
`6747`	`6754`	`}`
	`6755`	`+ if jwt == nil {`
	`6756`	`+ t.Fatal("JSON key file is not present")`
	`6757`	`+ }`
`6748`	`6758`
`6749`	`6759`	`statusCodeToRespond := 200`
`6750`	`6760`
`@@ -6810,7 +6820,7 @@ func TestIntegration_PostPolicyV4_SignedURL_WithSignBytes(t *testing.T) {`
`6810`	`6820`	`t.Fatal(err)`
`6811`	`6821`	`}`
`6812`	`6822`	`if jwtConf == nil {`
`6813`		`- t.Skip("JSON key file is not present")`
	`6823`	`+ t.Fatal("JSON key file is not present")`
`6814`	`6824`	`}`
`6815`	`6825`
`6816`	`6826`	`signingFunc := func(b []byte) ([]byte, error) {`