Batch errors now indicate how to disable batching (#1620)

* Allow domain mapping to succeed if DNS is pending

Signed-off-by: Modular Magician <magic-modules@google.com>

* Update google_folder import description (#1592)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Dana Hoffman <danahoffman@google.com>

* add google_kms_secret_ciphertext resource, deprecate datasource (#1586)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Dana Hoffman <danahoffman@google.com>

* Allow add/removing Bigtable clusters (#1589)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Riley Karson <rileykarson@google.com>

* Add bootstrapped test networks for service networking tests (#1588)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: emily <emilyye@google.com>

* Update CHANGELOG.md

* fix docs for google_bigquery_default_service_account (#1596)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Martin Nowak <code@dawg.eu>

* Nil return for absent Bigtable resources (#1597)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Brian Hildebrandt <brian3.14159@gmail.com>

* add lifecycle_config to dataproc_cluster.cluster_config

Signed-off-by: Modular Magician <magic-modules@google.com>

* Add warnings about custom role format for IAM bindings (#1600)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: emily <emilyye@google.com>

* Add mutex to peering create (#1601)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: emily <emilyye@google.com>

* Handle aggregatedList case for generated sweepers

Signed-off-by: Modular Magician <magic-modules@google.com>

* Add default_if_empty for quic_override (#1611)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Riley Karson <rileykarson@google.com>

* Batch errors now indicate how to disable batching

Signed-off-by: Modular Magician <magic-modules@google.com>

* Add default_if_empty to google_compute_router_nat defaults (#1613)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: Riley Karson <rileykarson@google.com>

* Allow for retries of single requests in a batch on failure (#1615)

Signed-off-by: Modular Magician <magic-modules@google.com>

Co-authored-by: emily <emilyye@google.com>

* Avoid panic in usage_export_bucket

Signed-off-by: Modular Magician <magic-modules@google.com>

* Add validation for start_time to resource_policy

Signed-off-by: Modular Magician <magic-modules@google.com>

* Batch errors now indicate how to disable batching (#2944)

Merged PR #2944.

Co-authored-by: Chris Stephens <chrisst@google.com>
Co-authored-by: Dana Hoffman <danahoffman@google.com>
Co-authored-by: Riley Karson <rileykarson@google.com>
Co-authored-by: emily <emilyye@google.com>
Co-authored-by: Paddy <paddy@hashicorp.com>
Co-authored-by: Martin Nowak <code@dawg.eu>
Co-authored-by: Brian Hildebrandt <brian3.14159@gmail.com>
Co-authored-by: megan07 <mbang@hashicorp.com>
Co-authored-by: Cameron Thornton <camthornton@google.com>

.changelog/2944.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/batcher.go

@@ -177,7 +177,10 @@ func (b *RequestBatcher) SendRequestWithTimeout(batchKey string, request *BatchR
 	case resp := <-respCh:
 		if resp.err != nil {
 			// use wrapf so we can potentially extract the original error type
-			return nil, errwrap.Wrapf(fmt.Sprintf("Batch %q for request %q returned error: {{err}}", batchKey, request.DebugId), resp.err)
+			errMsg := fmt.Sprintf(
+				"Batch %q for request %q returned error: {{err}}. To debug individual requests, try disabling batching: https://www.terraform.io/docs/providers/google/guides/provider_reference.html#enable_batching",
+				batchKey, request.DebugId)
+			return nil, errwrap.Wrapf(errMsg, resp.err)
 		}
 		return resp.body, nil
 	case <-ctx.Done():