From 4ead788840c32669477efcdc73b1b6abf01f2cbb Mon Sep 17 00:00:00 2001
From: Danny McCormick <dannymccormick@google.com>
Date: Mon, 9 Oct 2023 14:00:30 -0400
Subject: [PATCH] Reenable TestFhirIO.* on GHA (#28435)

* Reenable TestFhirIO.* on GHA

* Propogate last error

* temporarily only look at failing test and better error

* temporarily only look at failing test and better error

* temporarily only look at failing test and better error

* Restore integration.go
---
 sdks/go/test/integration/integration.go       |  6 ------
 .../test/integration/io/fhirio/fhirio_test.go | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/sdks/go/test/integration/integration.go b/sdks/go/test/integration/integration.go
index f3cffd176110..d3eb1c3ee7c3 100644
--- a/sdks/go/test/integration/integration.go
+++ b/sdks/go/test/integration/integration.go
@@ -304,12 +304,6 @@ func CheckFilters(t *testing.T) {
 		panic("ptest.Main() has not been called: please override TestMain to ensure that the integration test runs properly.")
 	}
 
-	// TODO(https://github.com/apache/beam/issues/28227): Grant github-actions service account permission to healthcare.fhirStores.create.
-	var user = os.Getenv("USER")
-	if user == "github-actions" {
-		dataflowFilters = append(dataflowFilters, "TestFhirIO.*")
-	}
-
 	// Check for sickbaying first.
 	n := t.Name()
 	for _, f := range sickbay {
diff --git a/sdks/go/test/integration/io/fhirio/fhirio_test.go b/sdks/go/test/integration/io/fhirio/fhirio_test.go
index 03e3654d5c49..01f6db9324f3 100644
--- a/sdks/go/test/integration/io/fhirio/fhirio_test.go
+++ b/sdks/go/test/integration/io/fhirio/fhirio_test.go
@@ -96,9 +96,9 @@ func setupFhirStore(t *testing.T, shouldPopulateStore bool) (fhirStoreInfo, func
 
 	var resourcePaths [][]byte
 	if shouldPopulateStore {
-		resourcePaths = populateStore(createdFhirStorePath)
-		if len(resourcePaths) == 0 {
-			t.Fatal("No data got populated to test")
+		resourcePaths, err = populateStore(createdFhirStorePath)
+		if err != nil {
+			t.Fatal(err)
 		}
 	}
 
@@ -127,11 +127,13 @@ func deleteStore(storePath string) (*healthcare.Empty, error) {
 
 // Populates fhir store with data. Note that failure to populate some data is not
 // detrimental to the tests, so it is fine to ignore.
-func populateStore(storePath string) [][]byte {
+func populateStore(storePath string) ([][]byte, error) {
 	resourcePaths := make([][]byte, 0)
+	bufferedErrors := make([]string, 0)
 	for _, bundle := range readPrettyBundles() {
 		response, err := storeService.ExecuteBundle(storePath, strings.NewReader(bundle)).Do()
 		if err != nil {
+			bufferedErrors = append(bufferedErrors, err.Error())
 			continue
 		}
 
@@ -145,23 +147,30 @@ func populateStore(storePath string) [][]byte {
 		}
 		err = json.NewDecoder(response.Body).Decode(&body)
 		if err != nil {
+			bufferedErrors = append(bufferedErrors, err.Error())
 			continue
 		}
 
 		for _, entry := range body.Entry {
 			bundleFailedToBeCreated := !strings.Contains(entry.Response.Status, "201")
 			if bundleFailedToBeCreated {
+				bufferedErrors = append(bufferedErrors, fmt.Sprintf("Bundle creation failed with: %v", entry.Response))
 				continue
 			}
 
 			resourcePath, err := extractResourcePathFrom(entry.Response.Location)
 			if err != nil {
+				bufferedErrors = append(bufferedErrors, err.Error())
 				continue
 			}
 			resourcePaths = append(resourcePaths, resourcePath)
 		}
 	}
-	return resourcePaths
+	if len(resourcePaths) == 0 {
+		return nil, fmt.Errorf("failed to populate fhir store with any data. Errors with requests: %s", bufferedErrors)
+	}
+
+	return resourcePaths, nil
 }
 
 func readPrettyBundles() []string {