Adapt tests to CUE v0.12.0

Signed-off-by: Stefan Prodan <[email protected]>

Author: stefanprodan

cmd/timoni/bundle_vet_test.go

@@ -257,16 +257,16 @@ bundle:
 			}
 			namespace: "podinfo"
 			values: {
+				autoscaling: {
+					enabled: true
+				}
 				caching: {
 					enabled:  true
 					redisURL: "tcp://:[email protected]:6379"
 				}
 				monitoring: {
 					enabled: true
 				}
-				autoscaling: {
-					enabled: true
-				}
 			}
 		}
 	}
@@ -362,11 +362,11 @@ runtime: {
 			}
 			namespace: "fleet-test"
 			values: {
-				message:  "Hello from cluster staging"
-				replicas: 2
+				message: "Hello from cluster staging"
 				test: {
 					enabled: true
 				}
+				replicas: 2
 			}
 		}
 	}
@@ -382,11 +382,11 @@ runtime: {
 			}
 			namespace: "fleet-test"
 			values: {
-				message:  "Hello from cluster production"
-				replicas: 3
+				message: "Hello from cluster production"
 				test: {
 					enabled: true
 				}
+				replicas: 3
 			}
 		}
 	}

cmd/timoni/testdata/crd/golden/cue.mod/gen/acme.cert-manager.io/challenge/v1/types_gen.cue

@@ -408,14 +408,18 @@ import "strings"
 					// group (such as for a "Service" kind referent), Group must be
 					// explicitly set to "" (empty string).
 					// Support: Core
-					group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *"gateway.networking.k8s.io"
+					group?: strings.MaxRunes(253) & {
+						=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
+					}
 
 					// Kind is kind of the referent.
 					// There are two kinds of parent resources with "Core" support:
 					// * Gateway (Gateway conformance profile) * Service (Mesh
 					// conformance profile, experimental, ClusterIP Services only)
 					// Support for other resources is Implementation-Specific.
-					kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
+					kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
+						=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
+					}
 
 					// Name is the name of the referent.
 					// Support: Core

cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/clusterissuer/v1/types_gen.cue

@@ -492,14 +492,18 @@ import "strings"
 						// group (such as for a "Service" kind referent), Group must be
 						// explicitly set to "" (empty string).
 						// Support: Core
-						group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *"gateway.networking.k8s.io"
+						group?: strings.MaxRunes(253) & {
+							=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
+						}
 
 						// Kind is kind of the referent.
 						// There are two kinds of parent resources with "Core" support:
 						// * Gateway (Gateway conformance profile) * Service (Mesh
 						// conformance profile, experimental, ClusterIP Services only)
 						// Support for other resources is Implementation-Specific.
-						kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
+						kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
+							=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
+						}
 
 						// Name is the name of the referent.
 						// Support: Core

cmd/timoni/testdata/crd/golden/cue.mod/gen/cert-manager.io/issuer/v1/types_gen.cue

@@ -491,14 +491,18 @@ import "strings"
 						// group (such as for a "Service" kind referent), Group must be
 						// explicitly set to "" (empty string).
 						// Support: Core
-						group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *"gateway.networking.k8s.io"
+						group?: strings.MaxRunes(253) & {
+							=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
+						}
 
 						// Kind is kind of the referent.
 						// There are two kinds of parent resources with "Core" support:
 						// * Gateway (Gateway conformance profile) * Service (Mesh
 						// conformance profile, experimental, ClusterIP Services only)
 						// Support for other resources is Implementation-Specific.
-						kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
+						kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
+							=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
+						}
 
 						// Name is the name of the referent.
 						// Support: Core

cmd/timoni/testdata/crd/golden/cue.mod/gen/flagger.app/canary/v1beta1/types_gen.cue

@@ -201,7 +201,7 @@ import (
 
 			// MaxAge indicates the number of seconds until the session
 			// affinity cookie will expire.
-			maxAge?: number | *86400
+			maxAge?: number
 		}
 
 		// Incremental traffic step weight for the analysis phase
@@ -343,9 +343,13 @@ import (
 
 		// The list of parent Gateways for a HTTPRoute
 		gatewayRefs?: list.MaxItems(32) & [...{
-			group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *"gateway.networking.k8s.io"
-			kind?:  strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
-			name!:  strings.MaxRunes(253) & strings.MinRunes(1)
+			group?: strings.MaxRunes(253) & {
+				=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
+			}
+			kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
+				=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
+			}
+			name!: strings.MaxRunes(253) & strings.MinRunes(1)
 			namespace?: strings.MaxRunes(63) & strings.MinRunes(1) & {
 				=~"^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
 			}
@@ -564,9 +568,13 @@ import (
 		// Mirror defines a schema for a filter that mirrors requests.
 		mirror?: [...{
 			backendRef?: {
-				group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *""
-				kind?:  strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Service"
-				name!:  strings.MaxRunes(253) & strings.MinRunes(1)
+				group?: strings.MaxRunes(253) & {
+					=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
+				}
+				kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
+					=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
+				}
+				name!: strings.MaxRunes(253) & strings.MinRunes(1)
 				namespace?: strings.MaxRunes(63) & strings.MinRunes(1) & {
 					=~"^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
 				}

internal/engine/testdata/module-golden/overlay.cue

@@ -7,7 +7,7 @@ objects: [{
 	}
 	data: {
 		url:           "https://test.internal"
-		kubeVersion:   "1.25.3"
 		moduleVersion: "0.0.0-devel"
+		kubeVersion:   "1.25.3"
 	}
 }]

internal/engine/testdata/values/golden.cue

@@ -1,15 +1,15 @@
 values: {
 	securityContext: {
-		seccompProfile: {
-			type: "RuntimeDefault"
-		}
-		readOnlyRootFilesystem:   false
 		allowPrivilegeEscalation: false
-		runAsNonRoot:             true
 		capabilities: {
 			add: ["NET_BIND_SERVICE"]
 			drop: ["ALL"]
 		}
+		readOnlyRootFilesystem: false
+		runAsNonRoot:           true
+		seccompProfile: {
+			type: "RuntimeDefault"
+		}
 	}
 	resources: {
 		limits: {