Don't attempt to close nil or previously-closed clients

Signed-off-by: Jake Utley <[email protected]>
crossplane-contrib · Jan 26, 2023 · 2ad8994 · 2ad8994
1 parent 6caae63
commit 2ad8994
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/internal/controller/acl/acl.go b/internal/controller/acl/acl.go
@@ -125,7 +125,10 @@ func (c *connectDisconnector) Connect(ctx context.Context, mg resource.Managed)
 }
 
 func (c *connectDisconnector) Disconnect(ctx context.Context) error {
-	c.cachedClient.Close()
+	if c.cachedClient != nil {
+		c.cachedClient.Close()
+	}
+	c.cachedClient = nil
 	return nil
 }
 

diff --git a/internal/controller/topic/topic.go b/internal/controller/topic/topic.go
@@ -121,7 +121,10 @@ func (c *connectDisconnector) Connect(ctx context.Context, mg resource.Managed)
 }
 
 func (c *connectDisconnector) Disconnect(ctx context.Context) error {
-	c.cachedClient.Close()
+	if c.cachedClient != nil {
+		c.cachedClient.Close()
+	}
+	c.cachedClient = nil
 	return nil
 }