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

* Use more markdown for Bug

* Consistently use sentences for each bullet

* Rewrite bug reproduction block

* Allow domain mapping to succeed if DNS is pending

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

* Updated google_folder.html (#4149)

* Updated google_folder.html

The page in the first example shows that you should use organization_id with value of 1234567. In the Import example, it's not clear whether organization_id is user, or folder_id is used. API call behind this import command is only accepting folder_id (can be checked when setting TF_LOG to trace and viewing the API call)

* Update website/docs/r/google_folder.html.markdown

Co-Authored-By: Dana Hoffman <[email protected]>

Co-authored-by: Dana Hoffman <[email protected]>

* add google_kms_secret_ciphertext resource, deprecate datasource (#5314)

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

Co-authored-by: Dana Hoffman <[email protected]>

* Allow add/removing Bigtable clusters (#5318)

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

Co-authored-by: Riley Karson <[email protected]>

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

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

Co-authored-by: emily <[email protected]>

* Update CHANGELOG.md

* fix docs for google_bigquery_default_service_account (#5329)

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

Co-authored-by: Martin Nowak <[email protected]>

* Nil return for absent Bigtable resources (#5331)

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

Co-authored-by: Brian Hildebrandt <[email protected]>

* add lifecycle_config to dataproc_cluster.cluster_config

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

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

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

Co-authored-by: emily <[email protected]>

* Add mutex to peering create (#5338)

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

Co-authored-by: emily <[email protected]>

* Handle aggregatedList case for generated sweepers

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

* Add default_if_empty for quic_override (#5351)

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

Co-authored-by: Riley Karson <[email protected]>

* Batch errors now indicate how to disable batching

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

* Add default_if_empty to google_compute_router_nat defaults (#5353)

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

Co-authored-by: Riley Karson <[email protected]>

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

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

Co-authored-by: emily <[email protected]>

* Avoid panic in usage_export_bucket

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

* Add validation for start_time to resource_policy

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

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

Merged PR #2944.

Co-authored-by: Josh Soref <[email protected]>
Co-authored-by: Chris Stephens <[email protected]>
Co-authored-by: Petar Marinkovic <[email protected]>
Co-authored-by: Dana Hoffman <[email protected]>
Co-authored-by: megan07 <[email protected]>
Co-authored-by: Riley Karson <[email protected]>
Co-authored-by: emily <[email protected]>
Co-authored-by: Paddy <[email protected]>
Co-authored-by: Martin Nowak <[email protected]>
Co-authored-by: Brian Hildebrandt <[email protected]>
Co-authored-by: Cameron Thornton <[email protected]>

.changelog/2944.txt

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

google/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():