fix: Always use the correct casing for the 'kind' field (#88)

Author: davidgubler

internal/util/argParser.go

@@ -3,8 +3,6 @@ package util
 import (
 	"fmt"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 type Input struct {
@@ -100,14 +98,20 @@ func CheckForMissingValues(arguments []string) error {
 
 	return nil
 }
-func FilterServiceKind(input []Input) (string, error) {
-	serviceKindIndex := slices.IndexFunc(input, func(input Input) bool {
-		return input.ParameterHierarchy[0] == K8S_SERVICE_KIND
-	})
-	if serviceKindIndex == -1 {
-		return "", fmt.Errorf("ServiceKind is missing")
+func FilterServiceKind(input []Input) (string, []Input, error) {
+	others := []Input{}
+	kind := ""
+	for _, input := range input {
+		if input.ParameterHierarchy[0] == K8S_SERVICE_KIND {
+			kind = input.Value
+		} else {
+			others = append(others, input)
+		}
+	}
+	if kind == "" {
+		return "", others, fmt.Errorf("ServiceKind is missing")
 	} else {
-		return input[serviceKindIndex].Value, nil
+		return kind, others, nil
 	}
 }
 

main.go

@@ -73,7 +73,7 @@ func Main(apps applications.AppMap, args []string, out io.Writer) int {
 		return 1
 	}
 
-	serviceKind, err := util.FilterServiceKind(parameters)
+	serviceKind, parameters, err := util.FilterServiceKind(parameters)
 	if err != nil {
 		logrus.Errorf("%s", err)
 		printUsage(args[0], apps)

tests/golden/vshnPostgreSQL.json

@@ -1,5 +1,6 @@
 {
     "default": "postgres-default --kind VSHNPostgreSQL",
+    "lowercase": "postgres-lowercase --kind vshnpostgresql",
     "secret-ref": "postgres-secret-ref --kind VSHNPostgreSQL --spec.writeconnectionsecrettoref.name new-cred",
     "parameters": "postgres-parameters --kind VSHNPostgreSQL --spec.parameters.backup.retention=9999 --spec.parameters.backup.schedule \"1 1 1 1 1\" --spec.parameters.size.CPU 100000m",
     "unset": "postgres-unset --kind VSHNPostgreSQL --spec.parameters.size.disk- --spec.parameters.service- --spec.parameters.scheduling.nodeSelector-",

tests/golden/vshnPostgreSQL/lowercase.yaml

@@ -0,0 +1,37 @@
+apiVersion: vshn.appcat.vshn.io/v1
+kind: VSHNPostgreSQL
+metadata:
+  creationTimestamp: null
+  name: postgres-lowercase
+spec:
+  parameters:
+    backup:
+      retention: 12
+      schedule: 30 23 * * *
+    encryption: {}
+    maintenance: {}
+    monitoring: {}
+    network: {}
+    replication: {}
+    scheduling:
+      nodeSelector:
+        appuio.io/node-class: plus
+    security: {}
+    service:
+      majorVersion: "14"
+      pgSettings: null
+      tls: {}
+    size:
+      cpu: 600m
+      disk: 80Gi
+      memory: 3500Mi
+      requests:
+        cpu: 300m
+        memory: 1000Mi
+    updateStrategy: {}
+  writeConnectionSecretToRef:
+    name: postgres-lowercase-creds
+    namespace: ""
+status:
+  schedules:
+    maintenance: {}