fix(konnect): handle KongTarget conflict on creation (#757)

controller/konnect/ops/kongtarget.go

@@ -11,4 +11,5 @@ type TargetsSDK interface {
 	CreateTargetWithUpstream(ctx context.Context, req sdkkonnectops.CreateTargetWithUpstreamRequest, opts ...sdkkonnectops.Option) (*sdkkonnectops.CreateTargetWithUpstreamResponse, error)
 	UpsertTargetWithUpstream(ctx context.Context, req sdkkonnectops.UpsertTargetWithUpstreamRequest, opts ...sdkkonnectops.Option) (*sdkkonnectops.UpsertTargetWithUpstreamResponse, error)
 	DeleteTargetWithUpstream(ctx context.Context, req sdkkonnectops.DeleteTargetWithUpstreamRequest, opts ...sdkkonnectops.Option) (*sdkkonnectops.DeleteTargetWithUpstreamResponse, error)
+	ListTargetWithUpstream(ctx context.Context, request sdkkonnectops.ListTargetWithUpstreamRequest, opts ...sdkkonnectops.Option) (*sdkkonnectops.ListTargetWithUpstreamResponse, error)
 }

controller/konnect/ops/ops.go

@@ -126,6 +126,8 @@ func Create[
 			id, err = getKongKeyForUID(ctx, sdk.GetKeysSDK(), ent)
 		case *configurationv1alpha1.KongUpstream:
 			id, err = getKongUpstreamForUID(ctx, sdk.GetUpstreamsSDK(), ent)
+		case *configurationv1alpha1.KongTarget:
+			id, err = getKongTargetForUID(ctx, sdk.GetTargetsSDK(), ent)
 			// ---------------------------------------------------------------------
 			// TODO: add other Konnect types
 		default:

controller/konnect/ops/ops_kongkey.go

@@ -42,7 +42,7 @@ func createKey(
 		return fmt.Errorf("failed creating %s: %w", key.GetTypeName(), ErrNilResponse)
 	}
 
-	key.Status.Konnect.SetKonnectID(*resp.Key.ID)
+	key.SetKonnectID(*resp.Key.ID)
 
 	return nil
 }

controller/konnect/ops/ops_kongtarget.go

@@ -37,12 +37,14 @@ func createTarget(
 	})
 
 	if errWrapped := wrapErrIfKonnectOpFailed(err, CreateOp, target); errWrapped != nil {
-		SetKonnectEntityProgrammedConditionFalse(target, "FailedToCreate", errWrapped.Error())
 		return errWrapped
 	}
 
-	target.Status.Konnect.SetKonnectID(*resp.Target.ID)
-	SetKonnectEntityProgrammedCondition(target)
+	if resp == nil || resp.Target == nil || resp.Target.ID == nil {
+		return fmt.Errorf("failed creating %s: %w", target.GetTypeName(), ErrNilResponse)
+	}
+
+	target.SetKonnectID(*resp.Target.ID)
 
 	return nil
 }
@@ -68,11 +70,9 @@ func updateTarget(
 	})
 
 	if errWrapped := wrapErrIfKonnectOpFailed(err, UpdateOp, target); errWrapped != nil {
-		SetKonnectEntityProgrammedConditionFalse(target, "FailedToUpdate", errWrapped.Error())
 		return errWrapped
 	}
 
-	SetKonnectEntityProgrammedCondition(target)
 	return nil
 }
 
@@ -128,3 +128,30 @@ func kongTargetToTargetWithoutParents(target *configurationv1alpha1.KongTarget)
 		Tags:   GenerateTagsForObject(target, target.Spec.Tags...),
 	}
 }
+
+// getKongTargetForUID returns the Konnect ID of the KongTarget
+// that matches the UID of the provided KongTarget.
+func getKongTargetForUID(
+	ctx context.Context,
+	sdk TargetsSDK,
+	target *configurationv1alpha1.KongTarget,
+) (string, error) {
+	reqList := sdkkonnectops.ListTargetWithUpstreamRequest{
+		// NOTE: only filter on object's UID.
+		// Other fields like name might have changed in the meantime but that's OK.
+		// Those will be enforced via subsequent updates.
+		Tags:           lo.ToPtr(UIDLabelForObject(target)),
+		ControlPlaneID: target.GetControlPlaneID(),
+	}
+
+	resp, err := sdk.ListTargetWithUpstream(ctx, reqList)
+	if err != nil {
+		return "", fmt.Errorf("failed listing %s: %w", target.GetTypeName(), err)
+	}
+
+	if resp == nil || resp.Object == nil {
+		return "", fmt.Errorf("failed listing %s: %w", target.GetTypeName(), ErrNilResponse)
+	}
+
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), target)
+}