multiple params to struct of params

Signed-off-by: Mattia Lavacca <[email protected]>
Kong · Oct 9, 2024 · c4adc17 · c4adc17
1 parent 31932a7
commit c4adc17
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/controller/dataplane/konnect_extension.go b/controller/dataplane/konnect_extension.go
@@ -57,11 +57,12 @@ func applyDataPlaneKonnectExtension(ctx context.Context, cl client.Client, datap
 		d.WithVolume(kongInKonnectClusterCertVolume(konnectExt.Spec.AuthConfiguration.ClusterCertificateSecretRef.Name))
 		d.WithVolumeMount(kongInKonnectClusterVolumeMount(), consts.DataPlaneProxyContainerName)
 
-		// Only KonnectID currently supported. It's existence is enforced via CEL.
-		envSet := dputils.KongInKonnectDefaults(
-			*konnectExt.Spec.ControlPlaneRef.KonnectID,
-			konnectExt.Spec.ControlPlaneRegion,
-			konnectExt.Spec.ServerHostname)
+		// KonnectID is the only supported type for now, and its presence is guaranteed by a proper CEL rule.
+		envSet := dputils.KongInKonnectDefaults(dputils.KongInKonnectParams{
+			ControlPlane: *konnectExt.Spec.ControlPlaneRef.KonnectID,
+			Region:       konnectExt.Spec.ControlPlaneRegion,
+			Server:       konnectExt.Spec.ServerHostname,
+		})
 
 		dputils.FillDataPlaneProxyContainerEnvs(nil, &d.Spec.Template, envSet)
 		dataplane.Spec.Deployment.PodTemplateSpec = &d.Spec.Template

diff --git a/controller/dataplane/konnect_extension_test.go b/controller/dataplane/konnect_extension_test.go
@@ -258,12 +258,11 @@ func TestApplyDataPlaneKonnectExtension(t *testing.T) {
 
 func getKongInKonnectEnvVars(konnectExt operatorv1alpha1.DataPlaneKonnectExtension) []corev1.EnvVar {
 	envSet := []corev1.EnvVar{}
-	envMap := dputils.KongInKonnectDefaults(
-		*konnectExt.Spec.ControlPlaneRef.KonnectID,
-		konnectExt.Spec.ControlPlaneRegion,
-		konnectExt.Spec.ServerHostname,
-	)
-	for k, v := range envMap {
+	for k, v := range dputils.KongInKonnectDefaults(dputils.KongInKonnectParams{
+		ControlPlane: *konnectExt.Spec.ControlPlaneRef.KonnectID,
+		Region:       konnectExt.Spec.ControlPlaneRegion,
+		Server:       konnectExt.Spec.ServerHostname,
+	}) {
 		envSet = append(envSet, corev1.EnvVar{
 			Name:  k,
 			Value: v,

diff --git a/internal/utils/dataplane/env.go b/internal/utils/dataplane/env.go
@@ -52,17 +52,21 @@ var kongInKonnectDefaultsTemplate = map[string]string{
 	"KONG_VITALS":                        "off",
 }
 
+// KongInKonnectParams is a struct that holds the parameters needed to customize
+// the KongInKonnectDefaultsTemplate map.
+type KongInKonnectParams struct {
+	ControlPlane string
+	Region       string
+	Server       string
+}
+
 // KongInKonnectDefaults returnes the map of Konnect-related env vars properly configured.
-func KongInKonnectDefaults(
-	controlPlane,
-	region,
-	server string,
-) map[string]string {
+func KongInKonnectDefaults(params KongInKonnectParams) map[string]string {
 	newEnvSet := make(map[string]string, len(kongInKonnectDefaultsTemplate))
 	for k, v := range kongInKonnectDefaultsTemplate {
-		v = strings.ReplaceAll(v, "<CP-ID>", controlPlane)
-		v = strings.ReplaceAll(v, "<REGION>", region)
-		v = strings.ReplaceAll(v, "<SERVER>", server)
+		v = strings.ReplaceAll(v, "<CP-ID>", params.ControlPlane)
+		v = strings.ReplaceAll(v, "<REGION>", params.Region)
+		v = strings.ReplaceAll(v, "<SERVER>", params.Server)
 		newEnvSet[k] = v
 	}
 	return newEnvSet