wip

pmalek · pmalek · commit c9975ee0523e · 2026-03-03T18:08:14.000+01:00
diff --git a/controller/konnect/ops/ops.go b/controller/konnect/ops/ops.go
@@ -795,15 +795,20 @@ func getMatchingEntryFromListResponseData[
 ](
 	data []T,
 	entity entity,
-) (string, error) {
-	var id string
+) (T, string, error) {
+	var (
+		id  string
+		ret T
+	)
 	for _, entry := range data {
 		entryID := entry.GetID()
 		switch entryID := any(entryID).(type) {
 		case string:
 			if entryID != "" {
 				id = entryID
+				ret = entry
 				break
+
 			}
 		case *string:
 			if entryID != nil && *entryID != "" {
@@ -814,12 +819,12 @@ func getMatchingEntryFromListResponseData[
 	}
 
 	if id == "" {
-		return "", EntityWithMatchingUIDNotFoundError{
+		return ret, "", EntityWithMatchingUIDNotFoundError{
 			Entity: entity,
 		}
 	}
 
-	return id, nil
+	return ret, id, nil
 }
 
 // ClearInstanceFromError clears the instance field from the error.
diff --git a/controller/konnect/ops/ops_controlplane.go b/controller/konnect/ops/ops_controlplane.go
@@ -285,11 +285,19 @@ func getControlPlaneForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cp.GetTypeName(), ErrNilResponse)
 	}
 
-	id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.ListControlPlanesResponse.Data), cp)
+	entry, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.ListControlPlanesResponse.Data), cp)
 	if err != nil {
 		return "", err
 	}
 
+	old := cp.DeepCopy()
+	if fillKonnectGatewayControlPlaneStatusFromResponse(cp, entry.Config) {
+		_, err = patch.ApplyStatusPatchIfNotEmpty(ctx, cl, ctrllog.FromContext(ctx), cp, old)
+		if err != nil {
+			return id, err
+		}
+	}
+
 	if err := setGroupMembers(ctx, cl, cp, id, sdkGroups); err != nil {
 		// If we failed to set group membership, we should return a specific error with a reason
 		// so the downstream can handle it properly.
diff --git a/controller/konnect/ops/ops_credentialacl.go b/controller/konnect/ops/ops_credentialacl.go
@@ -204,7 +204,8 @@ func getKongCredentialACLForUID(
 	}
 	x := sliceToEntityWithIDPtrSlice(resp.Object.Data)
 
-	return getMatchingEntryFromListResponseData(x, cred)
+	_, id, err := getMatchingEntryFromListResponseData(x, cred)
+	return id, err
 }
 
 func credentialACLMatch(
diff --git a/controller/konnect/ops/ops_credentialapikey.go b/controller/konnect/ops/ops_credentialapikey.go
@@ -201,7 +201,8 @@ func getKongCredentialAPIKeyForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	return id, err
 }
 
 func credentialAPIKeyMatch(
diff --git a/controller/konnect/ops/ops_credentialbasicauth.go b/controller/konnect/ops/ops_credentialbasicauth.go
@@ -200,7 +200,8 @@ func getKongCredentialBasicAuthForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	return id, err
 }
 
 func credentialBasicAuthMatch(
diff --git a/controller/konnect/ops/ops_credentialhmac.go b/controller/konnect/ops/ops_credentialhmac.go
@@ -205,7 +205,8 @@ func getKongCredentialHMACForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	return id, err
 }
 
 func credentialHMACMatch(
diff --git a/controller/konnect/ops/ops_credentialjwt.go b/controller/konnect/ops/ops_credentialjwt.go
@@ -204,7 +204,8 @@ func getKongCredentialJWTForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
+	return id, err
 }
 
 func credentialJWTMatch(
diff --git a/controller/konnect/ops/ops_kongcacertificate.go b/controller/konnect/ops/ops_kongcacertificate.go
@@ -239,7 +239,8 @@ func getKongCACertificateForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
+	return id, err
 }
 
 func caCertificateMatch(
diff --git a/controller/konnect/ops/ops_kongcertificate.go b/controller/konnect/ops/ops_kongcertificate.go
@@ -289,7 +289,8 @@ func getKongCertificateForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
+	return id, err
 }
 
 func certificateMatch(
diff --git a/controller/konnect/ops/ops_kongconsumer.go b/controller/konnect/ops/ops_kongconsumer.go
@@ -460,5 +460,6 @@ func getKongConsumerForUID(
 		return "", fmt.Errorf("failed listing %s: %w", consumer.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), consumer)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), consumer)
+	return id, err
 }
diff --git a/controller/konnect/ops/ops_kongconsumergroup.go b/controller/konnect/ops/ops_kongconsumergroup.go
@@ -188,5 +188,6 @@ func getKongConsumerGroupForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cg.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cg)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cg)
+	return id, err
 }
diff --git a/controller/konnect/ops/ops_kongkey.go b/controller/konnect/ops/ops_kongkey.go
@@ -202,7 +202,8 @@ func getKongKeyForUID(
 		return "", fmt.Errorf("failed to list KongKeys: %w", ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), key)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), key)
+	return id, err
 }
 
 func keyMatch(konnectKey *sdkkonnectcomp.Key, key *configurationv1alpha1.KongKey) bool {
diff --git a/controller/konnect/ops/ops_kongkeyset.go b/controller/konnect/ops/ops_kongkeyset.go
@@ -178,7 +178,8 @@ func getKongKeySetForUID(
 		return "", fmt.Errorf("failed listing %s: %w", keySet.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), keySet)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), keySet)
+	return id, err
 }
 
 func keySetMatch(konnectKeySet *sdkkonnectcomp.KeySet, keySet *configurationv1alpha1.KongKeySet) bool {
diff --git a/controller/konnect/ops/ops_kongpluginbinding.go b/controller/konnect/ops/ops_kongpluginbinding.go
@@ -139,7 +139,8 @@ func getPluginForUID(
 		return "", fmt.Errorf("failed listing %s: %w", pluginBinding.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), pluginBinding)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), pluginBinding)
+	return id, err
 }
 
 func adoptPluginBinding(
diff --git a/controller/konnect/ops/ops_kongroute.go b/controller/konnect/ops/ops_kongroute.go
@@ -245,12 +245,13 @@ func getKongRouteForUID(
 		return "", fmt.Errorf("failed listing %s: %w", r.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(
+	_, id, err := getMatchingEntryFromListResponseData(
 		sliceToEntityWithIDPtrSlice(
 			lo.Map(resp.Object.Data, func(route sdkkonnectcomp.Route, _ int) sdkkonnectcomp.RouteJSON {
 				return *route.RouteJSON
 			}),
 		), r)
+	return id, err
 }
 
 // routeHeadersMatch compares two header matches in the two routes.
diff --git a/controller/konnect/ops/ops_kongservice.go b/controller/konnect/ops/ops_kongservice.go
@@ -208,7 +208,8 @@ func getKongServiceForUID(
 		return "", fmt.Errorf("failed listing %s: %w", svc.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), svc)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), svc)
+	return id, err
 }
 
 // serviceMatch compares the existing service fetched from Konnect and the spec of the KongService
diff --git a/controller/konnect/ops/ops_kongsni.go b/controller/konnect/ops/ops_kongsni.go
@@ -209,7 +209,8 @@ func getKongSNIForUID(ctx context.Context, sdk sdkkonnectgo.SNIsSDK, sni *config
 		return "", fmt.Errorf("failed listing %s: %w", sni.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), sni)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), sni)
+	return id, err
 }
 
 func sniMatch(konnectSNI *sdkkonnectcomp.Sni, sni *configurationv1alpha1.KongSNI) bool {
diff --git a/controller/konnect/ops/ops_kongtarget.go b/controller/konnect/ops/ops_kongtarget.go
@@ -194,7 +194,8 @@ func getKongTargetForUID(
 		return "", fmt.Errorf("failed listing %s: %w", target.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), target)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), target)
+	return id, err
 }
 
 func targetMatch(konnectTarget *sdkkonnectcomp.Target, target *configurationv1alpha1.KongTarget) bool {
diff --git a/controller/konnect/ops/ops_kongupstream.go b/controller/konnect/ops/ops_kongupstream.go
@@ -187,7 +187,8 @@ func getKongUpstreamForUID(
 		return "", fmt.Errorf("failed listing %s: %w", u.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), u)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), u)
+	return id, err
 }
 
 func upstreamMatch(konnectUpstream *sdkkonnectcomp.Upstream, upstream *configurationv1alpha1.KongUpstream) bool {
diff --git a/controller/konnect/ops/ops_kongvault.go b/controller/konnect/ops/ops_kongvault.go
@@ -195,5 +195,6 @@ func getKongVaultForUID(
 		return "", fmt.Errorf("failed to list KongVaults: %w", ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), vault)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), vault)
+	return id, err
 }
diff --git a/controller/konnect/ops/ops_konnectnetwork.go b/controller/konnect/ops/ops_konnectnetwork.go
@@ -109,7 +109,7 @@ func getKonnectNetworkMatchingSpecName(
 		return "", fmt.Errorf("failed listing %s: %w", n.GetTypeName(), ErrNilResponse)
 	}
 
-	id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.ListNetworksResponse.Data), n)
+	_, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.ListNetworksResponse.Data), n)
 	if err != nil {
 		return "", err
 	}
diff --git a/controller/konnect/ops/ops_konnecttransitgateway.go b/controller/konnect/ops/ops_konnecttransitgateway.go
@@ -139,7 +139,8 @@ func getKonnectTransitGatewayMatchingSpecName(
 		return "", fmt.Errorf("failed listing %s: %w", tg.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(listTransitGatewayResponseDataToEntityWithIDSlice(resp.ListTransitGatewaysResponse.Data), tg)
+	_, id, err := getMatchingEntryFromListResponseData(listTransitGatewayResponseDataToEntityWithIDSlice(resp.ListTransitGatewaysResponse.Data), tg)
+	return id, err
 }
 
 var transitGatewayTypeToSDKTransitGatewayType = map[konnectv1alpha1.TransitGatewayType]sdkkonnectcomp.CreateTransitGatewayRequestType{
diff --git a/test/envtest/konnect_entities_gatewaycontrolplane_test.go b/test/envtest/konnect_entities_gatewaycontrolplane_test.go
diff --git a/test/envtest/konnect_entities_suite_test.go b/test/envtest/konnect_entities_suite_test.go

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,8 @@ func getKongCredentialACLForUID(`
`204`	`204`	`}`
`205`	`205`	`x := sliceToEntityWithIDPtrSlice(resp.Object.Data)`
`206`	`206`
`207`		`- return getMatchingEntryFromListResponseData(x, cred)`
	`207`	`+ _, id, err := getMatchingEntryFromListResponseData(x, cred)`
	`208`	`+ return id, err`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`func credentialACLMatch(`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ func getKongCredentialAPIKeyForUID(`
`201`	`201`	`return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)`
`202`	`202`	`}`
`203`	`203`
`204`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`204`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`205`	`+ return id, err`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`func credentialAPIKeyMatch(`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ func getKongCredentialBasicAuthForUID(`
`200`	`200`	`return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)`
`201`	`201`	`}`
`202`	`202`
`203`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`203`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`204`	`+ return id, err`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`func credentialBasicAuthMatch(`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,8 @@ func getKongCredentialHMACForUID(`
`205`	`205`	`return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)`
`206`	`206`	`}`
`207`	`207`
`208`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`208`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)`
	`209`	`+ return id, err`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`func credentialHMACMatch(`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@ func getKongCACertificateForUID(`
`239`	`239`	`return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)`
`240`	`240`	`}`
`241`	`241`
`242`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)`
	`242`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)`
	`243`	`+ return id, err`
`243`	`244`	`}`
`244`	`245`
`245`	`246`	`func caCertificateMatch(`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,8 @@ func getKongCertificateForUID(`
`289`	`289`	`return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)`
`290`	`290`	`}`
`291`	`291`
`292`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)`
	`292`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)`
	`293`	`+ return id, err`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`func certificateMatch(`
Original file line number	Diff line number	Diff line change
`@@ -460,5 +460,6 @@ func getKongConsumerForUID(`
`460`	`460`	`return "", fmt.Errorf("failed listing %s: %w", consumer.GetTypeName(), ErrNilResponse)`
`461`	`461`	`}`
`462`	`462`
`463`		`- return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), consumer)`
	`463`	`+ _, id, err := getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), consumer)`
	`464`	`+ return id, err`
`464`	`465`	`}`