Do not return most sweeper errors (#3315) (#1909)

* Do not return sql database instance sweeper errors

* Fix some other sweepers

* Fix typo

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/3315.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/resource_access_context_manager_access_policy_test.go

@@ -42,7 +42,8 @@ func testSweepAccessContextManagerPolicies(region string) error {
 
 	resp, err := sendRequest(config, "GET", "", listUrl, nil)
 	if err != nil && !isGoogleApiErrorWithCode(err, 404) {
-		return fmt.Errorf("unable to list AccessPolicies for organization %q: %v", testOrg, err)
+		log.Printf("unable to list AccessPolicies for organization %q: %v", testOrg, err)
+		return nil
 	}
 	var policies []interface{}
 	if resp != nil {
@@ -56,15 +57,17 @@ func testSweepAccessContextManagerPolicies(region string) error {
 		return nil
 	}
 	if len(policies) > 1 {
-		return fmt.Errorf("unexpected - more than one access policies found, change the tests")
+		log.Printf("unexpected - more than one access policies found, change the tests")
+		return nil
 	}
 
 	policy := policies[0].(map[string]interface{})
 	log.Printf("[DEBUG] Deleting test Access Policies %q", policy["name"])
 
 	policyUrl := config.AccessContextManagerBasePath + policy["name"].(string)
 	if _, err := sendRequest(config, "DELETE", "", policyUrl, nil); err != nil && !isGoogleApiErrorWithCode(err, 404) {
-		return fmt.Errorf("unable to delete access policy %q", policy["name"].(string))
+		log.Printf("unable to delete access policy %q", policy["name"].(string))
+		return nil
 	}
 
 	return nil

google-beta/resource_cloudfunctions_function_test.go

@@ -513,7 +513,8 @@ func createZIPArchiveForCloudFunctionSource(t *testing.T, sourcePath string) str
 func sweepCloudFunctionSourceZipArchives(_ string) error {
 	files, err := ioutil.ReadDir(os.TempDir())
 	if err != nil {
-		return err
+		log.Printf("Error reading files: %s", err)
+		return nil
 	}
 	for _, f := range files {
 		if f.IsDir() {
@@ -522,7 +523,8 @@ func sweepCloudFunctionSourceZipArchives(_ string) error {
 		if strings.HasPrefix(f.Name(), testFunctionsSourceArchivePrefix) {
 			filepath := fmt.Sprintf("%s/%s", os.TempDir(), f.Name())
 			if err := os.Remove(filepath); err != nil {
-				return err
+				log.Printf("Error removing files: %s", err)
+				return nil
 			}
 			log.Printf("[INFO] cloud functions sweeper removed old file %s", filepath)
 		}

google-beta/resource_sql_database_instance_test.go

@@ -48,7 +48,8 @@ func testSweepDatabases(region string) error {
 
 	found, err := config.clientSqlAdmin.Instances.List(config.Project).Do()
 	if err != nil {
-		log.Fatalf("error listing databases: %s", err)
+		log.Printf("error listing databases: %s", err)
+		return nil
 	}
 
 	if len(found.Items) == 0 {
@@ -99,15 +100,17 @@ func testSweepDatabases(region string) error {
 			op, err := config.clientSqlAdmin.Instances.StopReplica(config.Project, replicaName).Do()
 
 			if err != nil {
-				return fmt.Errorf("error, failed to stop replica instance (%s) for instance (%s): %s", replicaName, d.Name, err)
+				log.Printf("error, failed to stop replica instance (%s) for instance (%s): %s", replicaName, d.Name, err)
+				return nil
 			}
 
 			err = sqlAdminOperationWait(config, op, config.Project, "Stop Replica")
 			if err != nil {
 				if strings.Contains(err.Error(), "does not exist") {
 					log.Printf("Replication operation not found")
 				} else {
-					return err
+					log.Printf("Error waiting for sqlAdmin operation: %s", err)
+					return nil
 				}
 			}
 
@@ -129,7 +132,8 @@ func testSweepDatabases(region string) error {
 					continue
 				}
 
-				return fmt.Errorf("Error, failed to delete instance %s: %s", db, err)
+				log.Printf("Error, failed to delete instance %s: %s", db, err)
+				return nil
 			}
 
 			err = sqlAdminOperationWait(config, op, config.Project, "Delete Instance")
@@ -138,7 +142,8 @@ func testSweepDatabases(region string) error {
 					log.Printf("SQL instance not found")
 					continue
 				}
-				return err
+				log.Printf("Error, failed to delete instance %s: %s", db, err)
+				return nil
 			}
 		}
 	}