Prevent panic when API call returns error

hashicorp · May 2, 2024 · 559461f · 559461f
1 parent 15af9f8
commit 559461f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go
@@ -575,8 +575,13 @@ func retryDataLakeConflictWithMutex[T any](ctx context.Context, timeout time.Dur
 	conns.GlobalMutexKV.Lock(dataLakeMutexKey)
 	defer conns.GlobalMutexKV.Unlock(dataLakeMutexKey)
 
-	result, err := tfresource.RetryWhenIsA[*awstypes.ConflictException](ctx, timeout, func() (any, error) {
+	raw, err := tfresource.RetryWhenIsA[*awstypes.ConflictException](ctx, timeout, func() (any, error) {
 		return f()
 	})
-	return result.(T), err
+	if err != nil {
+		var zero T
+		return zero, err
+	}
+
+	return raw.(T), err
 }