feat: (storagetransfer) added user_project_override for storage_transfer_job (#15064)

Author: gurusai-voleti

mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go

@@ -989,11 +989,22 @@ func resourceStorageTransferJobCreate(d *schema.ResourceData, meta interface{})
 		ServiceAccount:     d.Get("service_account").(string),
 	}
 
+	billingProject := project
+
+	// err == nil indicates that the billing_project value was found
+	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
+		billingProject = bp
+	}
+
 	var res *storagetransfer.TransferJob
 
 	err = transport_tpg.Retry(transport_tpg.RetryOptions{
 		RetryFunc: func() error {
-			res, err = config.NewStorageTransferClient(userAgent).TransferJobs.Create(transferJob).Do()
+			createCall := config.NewStorageTransferClient(userAgent).TransferJobs.Create(transferJob)
+			if config.UserProjectOverride {
+				createCall.Header().Add("X-Goog-User-Project", billingProject)
+			}
+			res, err = createCall.Do()
 			return err
 		},
 	})
@@ -1025,8 +1036,19 @@ func resourceStorageTransferJobRead(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
+	billingProject := project
+	// err == nil indicates that the billing_project value was found
+	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
+		billingProject = bp
+	}
+
 	name := d.Get("name").(string)
-	res, err := config.NewStorageTransferClient(userAgent).TransferJobs.Get(name, project).Do()
+	readCall := config.NewStorageTransferClient(userAgent).TransferJobs.Get(name, project)
+	if config.UserProjectOverride {
+		readCall.Header().Add("X-Goog-User-Project", billingProject)
+	}
+
+	res, err := readCall.Do()
 	if err != nil {
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Transfer Job %q", name))
 	}
@@ -1184,7 +1206,18 @@ func resourceStorageTransferJobUpdate(d *schema.ResourceData, meta interface{})
 
 	updateRequest.UpdateTransferJobFieldMask = strings.Join(fieldMask, ",")
 
-	res, err := config.NewStorageTransferClient(userAgent).TransferJobs.Patch(d.Get("name").(string), updateRequest).Do()
+	billingProject := project
+	// err == nil indicates that the billing_project value was found
+	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
+		billingProject = bp
+	}
+
+	updateCall := config.NewStorageTransferClient(userAgent).TransferJobs.Patch(d.Get("name").(string), updateRequest)
+	if config.UserProjectOverride {
+		updateCall.Header().Add("X-Goog-User-Project", billingProject)
+	}
+
+	res, err := updateCall.Do()
 	if err != nil {
 		return err
 	}
@@ -1220,10 +1253,21 @@ func resourceStorageTransferJobDelete(d *schema.ResourceData, meta interface{})
 
 	updateRequest.UpdateTransferJobFieldMask = fieldMask
 
+	billingProject := project
+
+	// err == nil indicates that the billing_project value was found
+	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
+		billingProject = bp
+	}
+
 	// Update transfer job with status set to DELETE
 	log.Printf("[DEBUG] Setting status to DELETE for: %v\n\n", transferJobName)
 	err = retry.Retry(1*time.Minute, func() *retry.RetryError {
-		_, err := config.NewStorageTransferClient(userAgent).TransferJobs.Patch(transferJobName, updateRequest).Do()
+		deleteCall := config.NewStorageTransferClient(userAgent).TransferJobs.Patch(transferJobName, updateRequest)
+		if config.UserProjectOverride {
+			deleteCall.Header().Add("X-Goog-User-Project", billingProject)
+		}
+		_, err := deleteCall.Do()
 		if err != nil {
 			return retry.RetryableError(err)
 		}

mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go

@@ -194,6 +194,7 @@ func TestAccStorageTransferJob_transferJobName(t *testing.T) {
 	testDataSourceBucketName := acctest.RandString(t, 10)
 	testDataSinkName := acctest.RandString(t, 10)
 	testTransferJobDescription := acctest.RandString(t, 10)
+	testTransferUpdateJobDescription := acctest.RandString(t, 10)
 	testTransferJobName := fmt.Sprintf("tf-test-transfer-job-%s", acctest.RandString(t, 10))
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -209,6 +210,14 @@ func TestAccStorageTransferJob_transferJobName(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccStorageTransferJob_transferJobName(envvar.GetTestProjectFromEnv(), testDataSourceBucketName, testDataSinkName, testTransferUpdateJobDescription, testTransferJobName),
+			},
+			{
+				ResourceName:      "google_storage_transfer_job.transfer_job",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -1191,6 +1200,10 @@ resource "google_storage_transfer_job" "transfer_job" {
 
 func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketName string, dataSinkBucketName string, transferJobDescription string, testTransferJobName string) string {
 	return fmt.Sprintf(`
+  provider "google" {
+    alias                 = "user-project-override"
+    user_project_override = true
+  }
   data "google_storage_transfer_project_service_account" "default" {
     project = "%s"
   }
@@ -1227,6 +1240,7 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN
     name        = "transferJobs/%s"
     description = "%s"
     project     = "%s"
+    provider    = google.user-project-override
   
     transfer_spec {
       gcs_data_source {