Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl

@@ -36,6 +36,8 @@ import (
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 	backupdr "google.golang.org/api/backupdr/v1"
 	"cloud.google.com/go/bigquery"
+	"google.golang.org/api/option"
+	"google.golang.org/api/googleapi"
 )
 
 var SharedKeyRing = "tftest-shared-keyring-1"
@@ -2400,10 +2402,14 @@ func BootstrapIntegrationsClient(t *testing.T, locationID string) BootstrapClien
 		IsGMEK:    true,
 	}
 }
-func AddBigQueryDatasetReplica(projectID string, datasetID string, primaryLocation string, replicaLocation string) (string, error) {
+func AddBigQueryDatasetReplica(t *testing.T, projectID string, datasetID string, primaryLocation string, replicaLocation string) (string, error) {
 	ctx := context.Background()
+	config := BootstrapConfig(t)
+	if config == nil {
+		return "", fmt.Errorf("failed to bootstrap config")
+	}
 
-	client, err := bigquery.NewClient(ctx, projectID)
+	client, err := bigquery.NewClient(ctx, projectID, option.WithTokenSource(config.TokenSource), option.WithUserAgent(config.UserAgent))
 	if err != nil {
 		return "", fmt.Errorf("failed to create BigQuery client: %w", err)
 	}
@@ -2417,7 +2423,11 @@ func AddBigQueryDatasetReplica(projectID string, datasetID string, primaryLocati
 
 	err = datasetRef.Create(ctx, datasetMetadata)
 	if err != nil {
-		log.Printf("failed to create BigQuery dataset '%s'. Dataset already exists.", datasetID)
+		if ge, ok := err.(*googleapi.Error); ok && ge.Code == 409 {
+			log.Printf("INFO: BigQuery dataset '%s' already exists in project '%s' at location '%s'. Continuing.", datasetID, projectID, primaryLocation)
+		} else {
+			return "", fmt.Errorf("failed to create BigQuery dataset '%s': %w", datasetID, err)
+		}
 	} else {
 		log.Printf("INFO: Successfully created BigQuery dataset '%s' at location '%s'.", datasetID, primaryLocation)
 	}
@@ -2435,29 +2445,46 @@ func AddBigQueryDatasetReplica(projectID string, datasetID string, primaryLocati
 
 	job, err := query.Run(ctx)
 	if err != nil {
-		return "", fmt.Errorf("failed to submit BigQuery DDL job: %w", err)
-	}
-
-	status, err := job.Wait(ctx)
-	if err != nil {
-		log.Printf("failed to wait for BigQuery job completion: %v", err)
-	}
-
-	if status.Err() != nil {
-		log.Printf("BigQuery job completed with an error: %v", status.Err())
+		// Check if the error is an "Already Exists" error on submission
+		if ge, ok := err.(*googleapi.Error); ok && ge.Code == 409 && (strings.Contains(ge.Message, "Duplicate") || strings.Contains(ge.Message, "Already Exists")) {
+			log.Printf("INFO: Replica '%s' already exists for dataset '%s' (error on job submission). Continuing.", replicaLocation, datasetID)
+		} else {
+			return "", fmt.Errorf("failed to submit BigQuery DDL job for adding replica: %w", err)
+		}
+	} else {
+		status, waitErr := job.Wait(ctx)
+		if waitErr != nil {
+			// Check if the error is an "Already Exists" error after waiting
+			if ge, ok := waitErr.(*googleapi.Error); ok && ge.Code == 409 && (strings.Contains(ge.Message, "Duplicate") || strings.Contains(ge.Message, "Already Exists")) {
+				log.Printf("INFO: Replica '%s' already exists for dataset '%s' (error on job wait). Continuing.", replicaLocation, datasetID)
+			} else {
+				return "", fmt.Errorf("failed to wait for BigQuery job completion for adding replica: %w", waitErr)
+			}
+		} else if status != nil && status.Err() != nil {
+			// Check if the status error is an "Already Exists" error
+			if ge, ok := status.Err().(*googleapi.Error); ok && ge.Code == 409 && (strings.Contains(ge.Message, "Duplicate") || strings.Contains(ge.Message, "Already Exists")) {
+				 log.Printf("INFO: Replica '%s' already exists for dataset '%s' (error in job status). Continuing.", replicaLocation, datasetID)
+			} else {
+				return "", fmt.Errorf("BigQuery job for adding replica completed with an error: %w", status.Err())
+			}
+		} else {
+			log.Printf("INFO: Successfully added BigQuery dataset replica '%s' for dataset '%s'.", replicaLocation, datasetID)
+		}
 	}
 
-	log.Println("Successfully added BigQuery dataset replica using the Go client library.")
-
 	fullDatasetLocation := fmt.Sprintf("projects/%s/datasets/%s", projectID, datasetID)
 	return fullDatasetLocation, nil
 }
 
-func CleanupBigQueryDatasetAndReplica(projectID, datasetID, replicaLocation string) {
+func CleanupBigQueryDatasetAndReplica(t *testing.T, projectID, datasetID, replicaLocation string) {
 	log.Printf("[DEBUG] Cleanup: Starting cleanup for BigQuery dataset: projects/%s/datasets/%s", projectID, datasetID)
 	cleanupCtx := context.Background()
+	config := BootstrapConfig(t)
+	if config == nil {
+		return
+	}
 
-	client, cerr := bigquery.NewClient(cleanupCtx, projectID)
+	client, cerr := bigquery.NewClient(cleanupCtx, projectID, option.WithTokenSource(config.TokenSource), option.WithUserAgent(config.UserAgent))
 	if cerr != nil {
 		log.Printf("[ERROR] Cleanup: Failed to create BigQuery client for dataset %s: %v", datasetID, cerr)
 		return

mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_subscription_test.go.tmpl

@@ -57,7 +57,7 @@ func TestAccBigqueryAnalyticsHubListingSubscription_multiregion(t *testing.T) {
 	randomDatasetSuffix := acctest.RandString(t, 10)
 	datasetID := fmt.Sprintf("tf_test_sub_replica_%s", randomDatasetSuffix)
 
-	bqdataset, err := acctest.AddBigQueryDatasetReplica(envvar.GetTestProjectFromEnv(), datasetID, "us", "eu")
+	bqdataset, err := acctest.AddBigQueryDatasetReplica(t, envvar.GetTestProjectFromEnv(), datasetID, "us", "eu")
 	if err != nil {
 		t.Fatalf("Failed to create BigQuery dataset and add replica: %v", err)
 	}
@@ -68,7 +68,7 @@ func TestAccBigqueryAnalyticsHubListingSubscription_multiregion(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		acctest.CleanupBigQueryDatasetAndReplica(envvar.GetTestProjectFromEnv(), datasetID, "eu")
+		acctest.CleanupBigQueryDatasetAndReplica(t, envvar.GetTestProjectFromEnv(), datasetID, "eu")
 	})
 
 	acctest.VcrTest(t, resource.TestCase{

mmv1/third_party/terraform/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing_test.go.tmpl

@@ -60,7 +60,7 @@ func TestAccBigqueryAnalyticsHubListing_multiregion(t *testing.T) {
 	randomDatasetSuffix := acctest.RandString(t, 10)
 	datasetID := fmt.Sprintf("tf_test_listing_replica_%s", randomDatasetSuffix)
 
-	bqdataset, err := acctest.AddBigQueryDatasetReplica(envvar.GetTestProjectFromEnv(), datasetID, "us", "eu")
+	bqdataset, err := acctest.AddBigQueryDatasetReplica(t, envvar.GetTestProjectFromEnv(), datasetID, "us", "eu")
 	if err != nil {
 		t.Fatalf("Failed to create BigQuery dataset and add replica: %v", err)
 	}
@@ -71,7 +71,7 @@ func TestAccBigqueryAnalyticsHubListing_multiregion(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		acctest.CleanupBigQueryDatasetAndReplica(envvar.GetTestProjectFromEnv(), datasetID, "eu")
+		acctest.CleanupBigQueryDatasetAndReplica(t, envvar.GetTestProjectFromEnv(), datasetID, "eu")
 	})
 
 	acctest.VcrTest(t, resource.TestCase{