UserProjectOverride for ContainerOperationWaiter (#4874) (#3345)

* UserProjectOverride for ContainerOperationWaiter

fixes hashicorp/terraform-provider-google#9368

* Document container_cluster user_project_override

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

Author: modular-magician

.changelog/4874.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+container: Added `user_project_override` support to the ContainerOperationWaiter used by `google_container_cluster`
+```

google-beta/container_operation.go

@@ -11,11 +11,12 @@ import (
 )
 
 type ContainerOperationWaiter struct {
-	Service  *container.Service
-	Context  context.Context
-	Op       *container.Operation
-	Project  string
-	Location string
+	Service             *container.Service
+	Context             context.Context
+	Op                  *container.Operation
+	Project             string
+	Location            string
+	UserProjectOverride bool
 }
 
 func (w *ContainerOperationWaiter) State() string {
@@ -75,7 +76,11 @@ func (w *ContainerOperationWaiter) QueryOp() (interface{}, error) {
 		// default must be here to keep the previous case from blocking
 	}
 	err := retryTimeDuration(func() (opErr error) {
-		op, opErr = w.Service.Projects.Locations.Operations.Get(name).Do()
+		opGetCall := w.Service.Projects.Locations.Operations.Get(name)
+		if w.UserProjectOverride {
+			opGetCall.Header().Add("X-Goog-User-Project", w.Project)
+		}
+		op, opErr = opGetCall.Do()
 		return opErr
 	}, DefaultRequestTimeout)
 
@@ -99,11 +104,12 @@ func (w *ContainerOperationWaiter) TargetStates() []string {
 
 func containerOperationWait(config *Config, op *container.Operation, project, location, activity, userAgent string, timeout time.Duration) error {
 	w := &ContainerOperationWaiter{
-		Service:  config.NewContainerBetaClient(userAgent),
-		Context:  config.context,
-		Op:       op,
-		Project:  project,
-		Location: location,
+		Service:             config.NewContainerBetaClient(userAgent),
+		Context:             config.context,
+		Op:                  op,
+		Project:             project,
+		Location:            location,
+		UserProjectOverride: config.UserProjectOverride,
 	}
 
 	if err := w.SetOp(op); err != nil {

google-beta/resource_gke_hub_feature_membership_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
+	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

website/docs/r/container_cluster.html.markdown

@@ -947,3 +947,7 @@ For example, the following fields will show diffs if set in config:
 
 - `min_master_version`
 - `remove_default_node_pool`
+
+## User Project Overrides
+
+This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).