chore: bump sdk-konnect-go to 0.1.2 and kcfg

Kong · Oct 29, 2024 · 73b907c · 73b907c
1 parent 03d0015
commit 73b907c
Show file tree

Hide file tree

Showing 27 changed files with 95 additions and 75 deletions.
diff --git a/controller/konnect/index_konnectgatewaycontrolplane.go b/controller/konnect/index_konnectgatewaycontrolplane.go
@@ -41,7 +41,7 @@ func konnectGatewayControlPlaneGroupMembers(object client.Object) []string {
 		return nil
 	}
 
-	if string(*clusterType) != string(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup) {
+	if string(*clusterType) != string(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup) {
 		return nil
 	}
 

diff --git a/controller/konnect/ops/ops.go b/controller/konnect/ops/ops.go
@@ -445,21 +445,34 @@ func logEntityNotFoundRecreating[
 		)
 }
 
-type entityWithID interface {
-	GetID() *string
+// sliceToEntityWithIDPtrSlice converts a slice of entities to a slice of entityWithIDPtr.
+func sliceToEntityWithIDPtrSlice[
+	T any,
+	TPtr interface {
+		*T
+		GetID() *string
+	},
+](
+	slice []T,
+) []TPtr {
+	result := make([]TPtr, 0, len(slice))
+	for _, item := range slice {
+		result = append(result, TPtr(&item))
+	}
+	return result
 }
 
 // sliceToEntityWithIDSlice converts a slice of entities to a slice of entityWithID.
 func sliceToEntityWithIDSlice[
 	T any,
 	TPtr interface {
 		*T
-		GetID() *string
+		GetID() string
 	},
 ](
 	slice []T,
-) []entityWithID {
-	result := make([]entityWithID, 0, len(slice))
+) []TPtr {
+	result := make([]TPtr, 0, len(slice))
 	for _, item := range slice {
 		result = append(result, TPtr(&item))
 	}
@@ -470,16 +483,29 @@ func sliceToEntityWithIDSlice[
 // It returns an error if no entry with a non-empty ID was found.
 // It is used in conjunction with the list operation to get the ID of the entity that matches the UID
 // hence no filtering is done here because it is assumed that the provided list response data is already filtered.
-func getMatchingEntryFromListResponseData(
-	data []entityWithID,
+func getMatchingEntryFromListResponseData[
+	T interface {
+		GetID() IDType
+	},
+	IDType string | *string,
+](
+	data []T,
 	entity entity,
 ) (string, error) {
 	var id string
 	for _, entry := range data {
 		entryID := entry.GetID()
-		if entryID != nil && *entryID != "" {
-			id = *entryID
-			break
+		switch entryID := any(entryID).(type) {
+		case string:
+			if entryID != "" {
+				id = entryID
+				break
+			}
+		case *string:
+			if entryID != nil && *entryID != "" {
+				id = *entryID
+				break
+			}
 		}
 	}
 

diff --git a/controller/konnect/ops/ops_controlplane.go b/controller/konnect/ops/ops_controlplane.go
@@ -38,12 +38,12 @@ func createControlPlane(
 		return errWrap
 	}
 
-	if resp == nil || resp.ControlPlane == nil || resp.ControlPlane.ID == nil {
+	if resp == nil || resp.ControlPlane == nil || resp.ControlPlane.ID == "" {
 		return fmt.Errorf("failed creating %s: %w", cp.GetTypeName(), ErrNilResponse)
 	}
 
 	// At this point, the ControlPlane has been created in Konnect.
-	id := *resp.ControlPlane.ID
+	id := resp.ControlPlane.ID
 	cp.SetKonnectID(id)
 
 	if err := setGroupMembers(ctx, cl, cp, id, sdkGroups); err != nil {
@@ -106,7 +106,7 @@ func updateControlPlane(
 	if resp == nil || resp.ControlPlane == nil {
 		return fmt.Errorf("failed updating ControlPlane: %w", ErrNilResponse)
 	}
-	id = *resp.ControlPlane.ID
+	id = resp.ControlPlane.ID
 
 	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
@@ -130,7 +130,7 @@ func setGroupMembers(
 ) error {
 	if len(cp.Spec.Members) == 0 ||
 		cp.Spec.ClusterType == nil ||
-		*cp.Spec.ClusterType != sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup {
+		*cp.Spec.ClusterType != sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup {
 		return nil
 	}
 

diff --git a/controller/konnect/ops/ops_controlplane_test.go b/controller/konnect/ops/ops_controlplane_test.go
@@ -61,7 +61,7 @@ func TestCreateControlPlane(t *testing.T) {
 					Return(
 						&sdkkonnectops.CreateControlPlaneResponse{
 							ControlPlane: &sdkkonnectcomp.ControlPlane{
-								ID: lo.ToPtr(cpID),
+								ID: cpID,
 							},
 						},
 						nil,
@@ -136,7 +136,7 @@ func TestCreateControlPlane(t *testing.T) {
 					},
 					Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 						CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
-							ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+							ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 							Name:        "cpg-1",
 						},
 						Members: []corev1.LocalObjectReference{
@@ -154,7 +154,7 @@ func TestCreateControlPlane(t *testing.T) {
 					Return(
 						&sdkkonnectops.CreateControlPlaneResponse{
 							ControlPlane: &sdkkonnectcomp.ControlPlane{
-								ID: lo.ToPtr(cpgID),
+								ID: cpgID,
 							},
 						},
 						nil,
@@ -205,7 +205,7 @@ func TestCreateControlPlane(t *testing.T) {
 					},
 					Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 						CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
-							ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+							ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 							Name:        "cpg-1",
 						},
 						Members: []corev1.LocalObjectReference{
@@ -223,7 +223,7 @@ func TestCreateControlPlane(t *testing.T) {
 					Return(
 						&sdkkonnectops.CreateControlPlaneResponse{
 							ControlPlane: &sdkkonnectcomp.ControlPlane{
-								ID: lo.ToPtr(cpgID),
+								ID: cpgID,
 							},
 						},
 						nil,
@@ -439,7 +439,7 @@ func TestUpdateControlPlane(t *testing.T) {
 					Return(
 						&sdkkonnectops.UpdateControlPlaneResponse{
 							ControlPlane: &sdkkonnectcomp.ControlPlane{
-								ID: lo.ToPtr("12345"),
+								ID: "12345",
 							},
 						},
 						nil,
@@ -543,7 +543,7 @@ func TestUpdateControlPlane(t *testing.T) {
 					Return(
 						&sdkkonnectops.CreateControlPlaneResponse{
 							ControlPlane: &sdkkonnectcomp.ControlPlane{
-								ID: lo.ToPtr("12345"),
+								ID: "12345",
 							},
 						},
 						nil,
@@ -615,7 +615,7 @@ func TestCreateAndUpdateControlPlane_KubernetesMetadataConsistency(t *testing.T)
 		}).
 		Return(&sdkkonnectops.CreateControlPlaneResponse{
 			ControlPlane: &sdkkonnectcomp.ControlPlane{
-				ID: lo.ToPtr("12345"),
+				ID: "12345",
 			},
 		}, nil)
 	_, err := Create(ctx, sdk.SDK, fakeClient, cp)
@@ -629,7 +629,7 @@ func TestCreateAndUpdateControlPlane_KubernetesMetadataConsistency(t *testing.T)
 		}).
 		Return(&sdkkonnectops.UpdateControlPlaneResponse{
 			ControlPlane: &sdkkonnectcomp.ControlPlane{
-				ID: lo.ToPtr("12345"),
+				ID: "12345",
 			},
 		}, nil)
 	_, err = Update(ctx, sdk.SDK, 0, fakeClient, cp)
@@ -654,7 +654,7 @@ func TestSetGroupMembers(t *testing.T) {
 				Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 					CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
 						Name:        "cp-group",
-						ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+						ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 					},
 				},
 			},
@@ -673,7 +673,7 @@ func TestSetGroupMembers(t *testing.T) {
 				Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 					CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
 						Name:        "cp-group",
-						ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+						ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 					},
 					Members: []corev1.LocalObjectReference{
 						{
@@ -726,7 +726,7 @@ func TestSetGroupMembers(t *testing.T) {
 				Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 					CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
 						Name:        "cp-group",
-						ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+						ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 					},
 					Members: []corev1.LocalObjectReference{
 						{
@@ -760,7 +760,7 @@ func TestSetGroupMembers(t *testing.T) {
 				Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 					CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
 						Name:        "cp-group",
-						ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+						ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 					},
 					Members: []corev1.LocalObjectReference{
 						{
@@ -830,7 +830,7 @@ func TestSetGroupMembers(t *testing.T) {
 				Spec: konnectv1alpha1.KonnectGatewayControlPlaneSpec{
 					CreateControlPlaneRequest: sdkkonnectcomp.CreateControlPlaneRequest{
 						Name:        "cp-group",
-						ClusterType: lo.ToPtr(sdkkonnectcomp.ClusterTypeClusterTypeControlPlaneGroup),
+						ClusterType: lo.ToPtr(sdkkonnectcomp.CreateControlPlaneRequestClusterTypeClusterTypeControlPlaneGroup),
 					},
 					Members: []corev1.LocalObjectReference{
 						{

diff --git a/controller/konnect/ops/ops_credentialacl.go b/controller/konnect/ops/ops_credentialacl.go
@@ -134,6 +134,7 @@ func getKongCredentialACLForUID(
 	if resp == nil || resp.Object == nil {
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
+	x := sliceToEntityWithIDPtrSlice(resp.Object.Data)
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cred)
+	return getMatchingEntryFromListResponseData(x, cred)
 }
diff --git a/controller/konnect/ops/ops_credentialapikey.go b/controller/konnect/ops/ops_credentialapikey.go
@@ -132,5 +132,5 @@ func getKongCredentialAPIKeyForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cred)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
 }
diff --git a/controller/konnect/ops/ops_credentialbasicauth.go b/controller/konnect/ops/ops_credentialbasicauth.go
@@ -132,5 +132,5 @@ func getKongCredentialBasicAuthForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cred)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
 }
diff --git a/controller/konnect/ops/ops_credentialhmac.go b/controller/konnect/ops/ops_credentialhmac.go
@@ -134,5 +134,5 @@ func getKongCredentialHMACForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cred)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
 }
diff --git a/controller/konnect/ops/ops_credentialjwt.go b/controller/konnect/ops/ops_credentialjwt.go
@@ -136,5 +136,5 @@ func getKongCredentialJWTForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cred.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cred)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cred)
 }
diff --git a/controller/konnect/ops/ops_kongcacertificate.go b/controller/konnect/ops/ops_kongcacertificate.go
@@ -117,5 +117,5 @@ func getKongCACertificateForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cert)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
 }
diff --git a/controller/konnect/ops/ops_kongcertificate.go b/controller/konnect/ops/ops_kongcertificate.go
@@ -125,5 +125,5 @@ func getKongCertificateForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cert.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cert)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cert)
 }
diff --git a/controller/konnect/ops/ops_kongconsumer.go b/controller/konnect/ops/ops_kongconsumer.go
@@ -342,5 +342,5 @@ func getKongConsumerForUID(
 		return "", fmt.Errorf("failed listing %s: %w", consumer.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), consumer)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), consumer)
 }
diff --git a/controller/konnect/ops/ops_kongconsumergroup.go b/controller/konnect/ops/ops_kongconsumergroup.go
@@ -119,5 +119,5 @@ func getKongConsumerGroupForUID(
 		return "", fmt.Errorf("failed listing %s: %w", cg.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), cg)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), cg)
 }
diff --git a/controller/konnect/ops/ops_kongkey.go b/controller/konnect/ops/ops_kongkey.go
@@ -131,5 +131,5 @@ func getKongKeyForUID(
 		return "", fmt.Errorf("failed to list KongKeys: %w", ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), key)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), key)
 }
diff --git a/controller/konnect/ops/ops_kongkeyset.go b/controller/konnect/ops/ops_kongkeyset.go
@@ -116,5 +116,5 @@ func getKongKeySetForUID(
 		return "", fmt.Errorf("failed listing %s: %w", keySet.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), keySet)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), keySet)
 }
diff --git a/controller/konnect/ops/ops_kongpluginbinding.go b/controller/konnect/ops/ops_kongpluginbinding.go
@@ -132,7 +132,7 @@ func getPluginForUID(
 		return "", fmt.Errorf("failed listing %s: %w", pluginBinding.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), pluginBinding)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), pluginBinding)
 }
 
 // -----------------------------------------------------------------------------

diff --git a/controller/konnect/ops/ops_kongroute.go b/controller/konnect/ops/ops_kongroute.go
@@ -137,5 +137,5 @@ func getKongRouteForUID(
 		return "", fmt.Errorf("failed listing %s: %w", r.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), r)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), r)
 }
diff --git a/controller/konnect/ops/ops_kongservice.go b/controller/konnect/ops/ops_kongservice.go
@@ -131,5 +131,5 @@ func getKongServiceForUID(
 		return "", fmt.Errorf("failed listing %s: %w", svc.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), svc)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), svc)
 }
diff --git a/controller/konnect/ops/ops_kongsni.go b/controller/konnect/ops/ops_kongsni.go
@@ -146,5 +146,5 @@ func getKongSNIForUID(ctx context.Context, sdk sdkops.SNIsSDK, sni *configuratio
 		return "", fmt.Errorf("failed listing %s: %w", sni.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), sni)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), sni)
 }
diff --git a/controller/konnect/ops/ops_kongtarget.go b/controller/konnect/ops/ops_kongtarget.go
@@ -133,5 +133,5 @@ func getKongTargetForUID(
 		return "", fmt.Errorf("failed listing %s: %w", target.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), target)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), target)
 }
diff --git a/controller/konnect/ops/ops_kongupstream.go b/controller/konnect/ops/ops_kongupstream.go
@@ -135,5 +135,5 @@ func getKongUpstreamForUID(
 		return "", fmt.Errorf("failed listing %s: %w", u.GetTypeName(), ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), u)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), u)
 }
diff --git a/controller/konnect/ops/ops_kongvault.go b/controller/konnect/ops/ops_kongvault.go
@@ -113,5 +113,5 @@ func getKongVaultForUID(
 		return "", fmt.Errorf("failed to list KongVaults: %w", ErrNilResponse)
 	}
 
-	return getMatchingEntryFromListResponseData(sliceToEntityWithIDSlice(resp.Object.Data), vault)
+	return getMatchingEntryFromListResponseData(sliceToEntityWithIDPtrSlice(resp.Object.Data), vault)
 }