From 7078cac838827e1a9e89c7ae80f7b91bdfc1a701 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 9 Jan 2020 13:16:57 -0800 Subject: [PATCH] Batch errors now indicate how to disable batching (#1620) * Allow domain mapping to succeed if DNS is pending Signed-off-by: Modular Magician * Update google_folder import description (#1592) Signed-off-by: Modular Magician Co-authored-by: Dana Hoffman * add google_kms_secret_ciphertext resource, deprecate datasource (#1586) Signed-off-by: Modular Magician Co-authored-by: Dana Hoffman * Allow add/removing Bigtable clusters (#1589) Signed-off-by: Modular Magician Co-authored-by: Riley Karson * Add bootstrapped test networks for service networking tests (#1588) Signed-off-by: Modular Magician Co-authored-by: emily * Update CHANGELOG.md * fix docs for google_bigquery_default_service_account (#1596) Signed-off-by: Modular Magician Co-authored-by: Martin Nowak * Nil return for absent Bigtable resources (#1597) Signed-off-by: Modular Magician Co-authored-by: Brian Hildebrandt * add lifecycle_config to dataproc_cluster.cluster_config Signed-off-by: Modular Magician * Add warnings about custom role format for IAM bindings (#1600) Signed-off-by: Modular Magician Co-authored-by: emily * Add mutex to peering create (#1601) Signed-off-by: Modular Magician Co-authored-by: emily * Handle aggregatedList case for generated sweepers Signed-off-by: Modular Magician * Add default_if_empty for quic_override (#1611) Signed-off-by: Modular Magician Co-authored-by: Riley Karson * Batch errors now indicate how to disable batching Signed-off-by: Modular Magician * Add default_if_empty to google_compute_router_nat defaults (#1613) Signed-off-by: Modular Magician Co-authored-by: Riley Karson * Allow for retries of single requests in a batch on failure (#1615) Signed-off-by: Modular Magician Co-authored-by: emily * Avoid panic in usage_export_bucket Signed-off-by: Modular Magician * Add validation for start_time to resource_policy Signed-off-by: Modular Magician * Batch errors now indicate how to disable batching (#2944) Merged PR #2944. Co-authored-by: Chris Stephens Co-authored-by: Dana Hoffman Co-authored-by: Riley Karson Co-authored-by: emily Co-authored-by: Paddy Co-authored-by: Martin Nowak Co-authored-by: Brian Hildebrandt Co-authored-by: megan07 Co-authored-by: Cameron Thornton --- .changelog/2944.txt | 3 +++ google-beta/batcher.go | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changelog/2944.txt diff --git a/.changelog/2944.txt b/.changelog/2944.txt new file mode 100644 index 0000000000..8ec013c069 --- /dev/null +++ b/.changelog/2944.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` diff --git a/google-beta/batcher.go b/google-beta/batcher.go index 26b8e6ed3e..972b12c8b0 100644 --- a/google-beta/batcher.go +++ b/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():