Merge pull request #870 from mjudeikis/mjudeikis/npe

jbw976 · web-flow · commit 5ea4f6f6dd05 · 2025-09-09T17:15:38.000-07:00
Fix npe in reconciler
diff --git a/pkg/reconciler/managed/reconciler.go b/pkg/reconciler/managed/reconciler.go
@@ -1107,9 +1107,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (resu
 			record.Event(managed, event.Warning(reasonCannotDisconnect, err))
 		}
 
-		if err := external.Disconnect(ctx); err != nil {
-			log.Debug("Cannot disconnect from provider", "error", err)
-			record.Event(managed, event.Warning(reasonCannotDisconnect, err))
+		if external != nil {
+			if err := external.Disconnect(ctx); err != nil {
+				log.Debug("Cannot disconnect from provider", "error", err)
+				record.Event(managed, event.Warning(reasonCannotDisconnect, err))
+			}
 		}
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -1107,9 +1107,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (resu`
`1107`	`1107`	`record.Event(managed, event.Warning(reasonCannotDisconnect, err))`
`1108`	`1108`	`}`
`1109`	`1109`
`1110`		`- if err := external.Disconnect(ctx); err != nil {`
`1111`		`- log.Debug("Cannot disconnect from provider", "error", err)`
`1112`		`- record.Event(managed, event.Warning(reasonCannotDisconnect, err))`
	`1110`	`+ if external != nil {`
	`1111`	`+ if err := external.Disconnect(ctx); err != nil {`
	`1112`	`+ log.Debug("Cannot disconnect from provider", "error", err)`
	`1113`	`+ record.Event(managed, event.Warning(reasonCannotDisconnect, err))`
	`1114`	`+ }`
`1113`	`1115`	`}`
`1114`	`1116`	`}()`
`1115`	`1117`