In logging batched requests, use slightly fewer quotes / escapes. (#5308) (#3723)

Fixes hashicorp/terraform-provider-google#7628.
Equally clear in the worst case, but less escaping most of the time.

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

Author: modular-magician

.changelog/5308.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+iam: fixed request batching bug where failed requests would show unnecessary backslash escaping to the user.
+```

google-beta/batcher.go

@@ -3,10 +3,11 @@ package google
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/errwrap"
 	"log"
 	"sync"
 	"time"
+
+	"github.com/hashicorp/errwrap"
 )
 
 const defaultBatchSendIntervalSec = 3
@@ -177,7 +178,7 @@ func (b *RequestBatcher) SendRequestWithTimeout(batchKey string, request *BatchR
 	case resp := <-respCh:
 		if resp.err != nil {
 			return nil, errwrap.Wrapf(
-				fmt.Sprintf("Request %q returned error: {{err}}", request.DebugId),
+				fmt.Sprintf("Request `%s` returned error: {{err}}", request.DebugId),
 				resp.err)
 		}
 		return resp.body, nil

google-beta/resource_iam_member.go

@@ -203,7 +203,7 @@ func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBat
 		}
 		if enableBatching {
 			err = BatchRequestModifyIamPolicy(updater, modifyF, config,
-				fmt.Sprintf("Create IAM Members %s %+v for %q", memberBind.Role, memberBind.Members[0], updater.DescribeResource()))
+				fmt.Sprintf("Create IAM Members %s %+v for %s", memberBind.Role, memberBind.Members[0], updater.DescribeResource()))
 		} else {
 			err = iamPolicyReadModifyWrite(updater, modifyF)
 		}