Remove unnecessarry if statements for operationWaiter errors (#8860) (#…

…15724) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 5, 2023 · ff4d3a7 · ff4d3a7
1 parent c3acecd
commit ff4d3a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.changelog/8860.txt b/.changelog/8860.txt
@@ -0,0 +1,3 @@
+```release-note:none
+Remove unnecessary if statements for OperationWait
+```
diff --git a/google/tpgresource/common_operation.go b/google/tpgresource/common_operation.go
@@ -140,10 +140,7 @@ func CommonRefreshFunc(w Waiter) resource.StateRefreshFunc {
 
 func OperationWait(w Waiter, activity string, timeout time.Duration, pollInterval time.Duration) error {
 	if OperationDone(w) {
-		if w.Error() != nil {
-			return w.Error()
-		}
-		return nil
+		return w.Error()
 	}
 
 	c := &resource.StateChangeConf{
@@ -163,11 +160,8 @@ func OperationWait(w Waiter, activity string, timeout time.Duration, pollInterva
 	if err != nil {
 		return err
 	}
-	if w.Error() != nil {
-		return w.Error()
-	}
 
-	return nil
+	return w.Error()
 }
 
 // The cloud resource manager API operation is an example of one of many