Do client-side blocking for group operations with an operation id in response (hashicorp#1260)

Author: ncabatoff

.changelog/1260.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+Group operations (create, delete, update, update members) now block client-side if an operationID is present in the response.
+```

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/go-version v1.7.0
-	github.com/hashicorp/hcp-sdk-go v0.140.0
+	github.com/hashicorp/hcp-sdk-go v0.141.0
 	github.com/hashicorp/terraform-plugin-docs v0.20.1
 	github.com/hashicorp/terraform-plugin-framework v1.14.1
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0

go.sum

@@ -126,8 +126,8 @@ github.com/hashicorp/hc-install v0.9.1 h1:gkqTfE3vVbafGQo6VZXcy2v5yoz2bE0+nhZXru
 github.com/hashicorp/hc-install v0.9.1/go.mod h1:pWWvN/IrfeBK4XPeXXYkL6EjMufHkCK5DvwxeLKuBf0=
 github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
 github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
-github.com/hashicorp/hcp-sdk-go v0.140.0 h1:SUbzlp7SfMwEFQXHhgq5CRVvfOkc7QrBM1CDk9OvW2M=
-github.com/hashicorp/hcp-sdk-go v0.140.0/go.mod h1:ZxsZZjErm3E2sj2OjDeVsGJAkWtcRLUS+FrNLGPsUyw=
+github.com/hashicorp/hcp-sdk-go v0.141.0 h1:5bRZa54gI4KYWceKWcZJwhy8ZV32ZdqUDLUa6ftUWBQ=
+github.com/hashicorp/hcp-sdk-go v0.141.0/go.mod h1:ZxsZZjErm3E2sj2OjDeVsGJAkWtcRLUS+FrNLGPsUyw=
 github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/terraform-exec v0.22.0 h1:G5+4Sz6jYZfRYUCg6eQgDsqTzkNXV+fP8l+uRmZHj64=

internal/clients/group.go

@@ -5,6 +5,7 @@ package clients
 
 import (
 	"github.com/cenkalti/backoff/v4"
+	sharedmodels "github.com/hashicorp/hcp-sdk-go/clients/cloud-shared/v1/models"
 
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-iam/stable/2019-12-10/client/groups_service"
 )
@@ -19,7 +20,14 @@ func CreateGroupRetry(client *Client, params *groups_service.GroupsServiceCreate
 	op := func() error {
 		var err error
 		res, err = client.Groups.GroupsServiceCreateGroup(params, nil)
-		return err
+		if err != nil {
+			return err
+		}
+		if res.Payload.OperationID != "" {
+			loc := &sharedmodels.HashicorpCloudLocationLocation{OrganizationID: client.Config.OrganizationID}
+			return WaitForOperation(params.Context, client, "create group", loc, res.Payload.OperationID)
+		}
+		return nil
 	}
 
 	serviceErr := &groups_service.GroupsServiceCreateGroupDefault{}
@@ -34,7 +42,14 @@ func UpdateGroupRetry(client *Client, params *groups_service.GroupsServiceUpdate
 	op := func() error {
 		var err error
 		res, err = client.Groups.GroupsServiceUpdateGroup2(params, nil)
-		return err
+		if err != nil {
+			return err
+		}
+		if res.Payload.OperationID != "" {
+			loc := &sharedmodels.HashicorpCloudLocationLocation{OrganizationID: client.Config.OrganizationID}
+			return WaitForOperation(params.Context, client, "update group", loc, res.Payload.OperationID)
+		}
+		return nil
 	}
 
 	serviceErr := &groups_service.GroupsServiceUpdateGroup2Default{}
@@ -49,7 +64,14 @@ func DeleteGroupRetry(client *Client, params *groups_service.GroupsServiceDelete
 	op := func() error {
 		var err error
 		res, err = client.Groups.GroupsServiceDeleteGroup(params, nil)
-		return err
+		if err != nil {
+			return err
+		}
+		if res.Payload.OperationID != "" {
+			loc := &sharedmodels.HashicorpCloudLocationLocation{OrganizationID: client.Config.OrganizationID}
+			return WaitForOperation(params.Context, client, "delete group", loc, res.Payload.OperationID)
+		}
+		return nil
 	}
 
 	serviceErr := &groups_service.GroupsServiceDeleteGroupDefault{}
@@ -66,7 +88,14 @@ func UpdateGroupMembersRetry(client *Client, params *groups_service.GroupsServic
 	op := func() error {
 		var err error
 		res, err = client.Groups.GroupsServiceUpdateGroupMembers(params, nil)
-		return err
+		if err != nil {
+			return err
+		}
+		if res.Payload.OperationID != "" {
+			loc := &sharedmodels.HashicorpCloudLocationLocation{OrganizationID: client.Config.OrganizationID}
+			return WaitForOperation(params.Context, client, "update group members", loc, res.Payload.OperationID)
+		}
+		return nil
 	}
 
 	serviceErr := &groups_service.GroupsServiceUpdateGroupMembersDefault{}

internal/clients/operation.go

@@ -29,7 +29,11 @@ func WaitForOperation(ctx context.Context, client *Client, operationName string,
 	waitParams.ID = operationID
 	waitParams.Timeout = &waitTimeout
 	waitParams.LocationOrganizationID = loc.OrganizationID
-	waitParams.LocationProjectID = loc.ProjectID
+	if loc.ProjectID == "" {
+		waitParams.LocationProjectID = "-"
+	} else {
+		waitParams.LocationProjectID = loc.ProjectID
+	}
 
 	// Start with no consecutive errors.
 	consecutiveErrors := 0