Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delete t.FailNow after t.Fatalf #14014

Merged
merged 1 commit into from
Jul 22, 2022
Merged

delete t.FailNow after t.Fatalf #14014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions util/pkg/vfs/tests/gsfs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ func TestGSRenderTerraform(t *testing.T) {
creds, err := filepath.Abs(credsFile)
if err != nil {
t.Fatalf("failed to prepare mock gcp credentials: %v", err)
t.FailNow()
}
t.Setenv("GOOGLE_APPLICATION_CREDENTIALS", creds)

Expand Down Expand Up @@ -80,13 +79,11 @@ func TestGSRenderTerraform(t *testing.T) {
path, err := vfs.Context.BuildVfsPath(tc.gsPath)
if err != nil {
t.Fatalf("error building VFS path: %v", err)
t.FailNow()
}

vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()
if err != nil {
t.Fatalf("error building VFS Terraform provider: %v", err)
t.FailNow()
}
target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)

Expand All @@ -103,32 +100,26 @@ func TestGSRenderTerraform(t *testing.T) {
)
if err != nil {
t.Fatalf("error rendering terraform %v", err)
t.FailNow()
}
res, err := target.GetResourcesByType()
if err != nil {
t.Fatalf("error fetching terraform resources: %v", err)
t.FailNow()
}
if objs := res["google_storage_bucket_object"]; objs == nil {
t.Fatalf("google_storage_bucket_object resources not found: %v", res)
t.FailNow()
}
if obj := res["google_storage_bucket_object"][tc.gsObject]; obj == nil {
t.Fatalf("google_storage_bucket_object object not found: %v", res["google_storage_bucket_object"])
t.FailNow()
}
obj, err := json.Marshal(res["google_storage_bucket_object"][tc.gsObject])
if err != nil {
t.Fatalf("error marshaling gs object: %v", err)
t.FailNow()
}
if !assert.JSONEq(t, tc.expectedObjectJSON, string(obj), "JSON representation of terraform resource did not match") {
t.FailNow()
}
if objs := target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)]; objs == nil {
t.Fatalf("google_storage_bucket_object content file not found: %v", target.TerraformWriter.Files)
t.FailNow()
}
actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/google_storage_bucket_object_%v_content", tc.gsObject)])
if !assert.Equal(t, content, actualContent, "google_storage_bucket_object content did not match") {
Expand All @@ -137,16 +128,13 @@ func TestGSRenderTerraform(t *testing.T) {

if objs := res["google_storage_object_access_control"]; objs == nil {
t.Fatalf("google_storage_object_access_control resources not found: %v", res)
t.FailNow()
}
if obj := res["google_storage_object_access_control"][tc.gsObject]; obj == nil {
t.Fatalf("google_storage_object_access_control object not found: %v", res["google_storage_object_access_control"])
t.FailNow()
}
actualACL, err := json.Marshal(res["google_storage_object_access_control"][tc.gsObject])
if err != nil {
t.Fatalf("error marshaling gs ACL: %v", err)
t.FailNow()
}
if !assert.JSONEq(t, tc.expectedACLJSON, string(actualACL), "JSON representation of terraform resource did not match") {
t.FailNow()
Expand Down
8 changes: 0 additions & 8 deletions util/pkg/vfs/tests/s3fs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@ func TestS3RenderTerraform(t *testing.T) {
path, err := vfs.Context.BuildVfsPath(tc.s3Path)
if err != nil {
t.Fatalf("error building VFS path: %v", err)
t.FailNow()
}

vfsProvider, err := path.(vfs.TerraformPath).TerraformProvider()
if err != nil {
t.Fatalf("error building VFS Terraform provider: %v", err)
t.FailNow()
}
target := terraform.NewTerraformTarget(cloud, "", vfsProvider, "/dev/null", nil)

Expand All @@ -76,32 +74,26 @@ func TestS3RenderTerraform(t *testing.T) {
)
if err != nil {
t.Fatalf("error rendering terraform %v", err)
t.FailNow()
}
res, err := target.GetResourcesByType()
if err != nil {
t.Fatalf("error fetching terraform resources: %v", err)
t.FailNow()
}
if objs := res["aws_s3_object"]; objs == nil {
t.Fatalf("aws_s3_object resources not found: %v", res)
t.FailNow()
}
if obj := res["aws_s3_object"][tc.s3Object]; obj == nil {
t.Fatalf("aws_s3_object object not found: %v", res["aws_s3_object"])
t.FailNow()
}
obj, err := json.Marshal(res["aws_s3_object"][tc.s3Object])
if err != nil {
t.Fatalf("error marshaling s3 object: %v", err)
t.FailNow()
}
if !assert.JSONEq(t, tc.expectedJSON, string(obj), "JSON representation of terraform resource did not match") {
t.FailNow()
}
if objs := target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)]; objs == nil {
t.Fatalf("aws_s3_object content file not found: %v", target.TerraformWriter.Files)
t.FailNow()
}
actualContent := string(target.TerraformWriter.Files[fmt.Sprintf("data/aws_s3_object_%v_content", tc.s3Object)])
if !assert.Equal(t, content, actualContent, "aws_s3_object content did not match") {
Expand Down