From 7790a6f3c0abf756a7b69136ea64bad16907e6e4 Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Mon, 19 Oct 2020 16:58:35 +0000
Subject: [PATCH] mark nil errors as nil instead of non-retryable (#4124)

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 .changelog/4124.txt       | 3 +++
 google/retry_transport.go | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 .changelog/4124.txt

diff --git a/.changelog/4124.txt b/.changelog/4124.txt
new file mode 100644
index 00000000000..cf5a201cfdd
--- /dev/null
+++ b/.changelog/4124.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+all: fixed misleading "empty non-retryable error" message that was appearing in debug logs
+```
diff --git a/google/retry_transport.go b/google/retry_transport.go
index 843dc7c6168..3f3bb445edf 100644
--- a/google/retry_transport.go
+++ b/google/retry_transport.go
@@ -201,6 +201,9 @@ func (t *retryTransport) checkForRetryableError(resp *http.Response, respErr err
 		errToCheck = googleapi.CheckResponse(&respToCheck)
 	}
 
+	if errToCheck == nil {
+		return nil
+	}
 	if isRetryableError(errToCheck, t.retryPredicates...) {
 		return resource.RetryableError(errToCheck)
 	}