Skip to content

Commit b4f3bc4

Browse files
stefanprodanstefanprodan
authored
Merge pull request #480 from stefanprodan/cue-v0.12.0
Update `cuelang.org/go` to v0.12.0
2 parents d32d940 + b299859 commit b4f3bc4

File tree

10 files changed

+62
-42
lines changed

10 files changed

+62
-42
lines changed

‎cmd/timoni/bundle_vet_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,16 @@ bundle:
257257
}
258258
namespace: "podinfo"
259259
values: {
260+
autoscaling: {
261+
enabled: true
262+
}
260263
caching: {
261264
enabled: true
262265
redisURL: "tcp://:[email protected]:6379"
263266
}
264267
monitoring: {
265268
enabled: true
266269
}
267-
autoscaling: {
268-
enabled: true
269-
}
270270
}
271271
}
272272
}
@@ -362,11 +362,11 @@ runtime: {
362362
}
363363
namespace: "fleet-test"
364364
values: {
365-
message: "Hello from cluster staging"
366-
replicas: 2
365+
message: "Hello from cluster staging"
367366
test: {
368367
enabled: true
369368
}
369+
replicas: 2
370370
}
371371
}
372372
}
@@ -382,11 +382,11 @@ runtime: {
382382
}
383383
namespace: "fleet-test"
384384
values: {
385-
message: "Hello from cluster production"
386-
replicas: 3
385+
message: "Hello from cluster production"
387386
test: {
388387
enabled: true
389388
}
389+
replicas: 3
390390
}
391391
}
392392
}

‎cmd/timoni/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535

3636
var (
3737
VERSION = "0.0.0-dev.0"
38-
CUE_VERSION = "0.11.0"
38+
CUE_VERSION = "0.12.0"
3939
)
4040

4141
var rootCmd = &cobra.Command{

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,18 @@ import "strings"
408408
// group (such as for a "Service" kind referent), Group must be
409409
// explicitly set to "" (empty string).
410410
// Support: Core
411-
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"
411+
group?: strings.MaxRunes(253) & {
412+
=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
413+
}
412414

413415
// Kind is kind of the referent.
414416
// There are two kinds of parent resources with "Core" support:
415417
// * Gateway (Gateway conformance profile) * Service (Mesh
416418
// conformance profile, experimental, ClusterIP Services only)
417419
// Support for other resources is Implementation-Specific.
418-
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
420+
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
421+
=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
422+
}
419423

420424
// Name is the name of the referent.
421425
// Support: Core

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -492,14 +492,18 @@ import "strings"
492492
// group (such as for a "Service" kind referent), Group must be
493493
// explicitly set to "" (empty string).
494494
// Support: Core
495-
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"
495+
group?: strings.MaxRunes(253) & {
496+
=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
497+
}
496498

497499
// Kind is kind of the referent.
498500
// There are two kinds of parent resources with "Core" support:
499501
// * Gateway (Gateway conformance profile) * Service (Mesh
500502
// conformance profile, experimental, ClusterIP Services only)
501503
// Support for other resources is Implementation-Specific.
502-
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
504+
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
505+
=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
506+
}
503507

504508
// Name is the name of the referent.
505509
// Support: Core

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,18 @@ import "strings"
491491
// group (such as for a "Service" kind referent), Group must be
492492
// explicitly set to "" (empty string).
493493
// Support: Core
494-
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"
494+
group?: strings.MaxRunes(253) & {
495+
=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
496+
}
495497

496498
// Kind is kind of the referent.
497499
// There are two kinds of parent resources with "Core" support:
498500
// * Gateway (Gateway conformance profile) * Service (Mesh
499501
// conformance profile, experimental, ClusterIP Services only)
500502
// Support for other resources is Implementation-Specific.
501-
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
503+
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
504+
=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
505+
}
502506

503507
// Name is the name of the referent.
504508
// Support: Core

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

+15-7
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ import (
201201

202202
// MaxAge indicates the number of seconds until the session
203203
// affinity cookie will expire.
204-
maxAge?: number | *86400
204+
maxAge?: number
205205
}
206206

207207
// Incremental traffic step weight for the analysis phase
@@ -343,9 +343,13 @@ import (
343343

344344
// The list of parent Gateways for a HTTPRoute
345345
gatewayRefs?: list.MaxItems(32) & [...{
346-
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"
347-
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Gateway"
348-
name!: strings.MaxRunes(253) & strings.MinRunes(1)
346+
group?: strings.MaxRunes(253) & {
347+
=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
348+
}
349+
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
350+
=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
351+
}
352+
name!: strings.MaxRunes(253) & strings.MinRunes(1)
349353
namespace?: strings.MaxRunes(63) & strings.MinRunes(1) & {
350354
=~"^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
351355
}
@@ -564,9 +568,13 @@ import (
564568
// Mirror defines a schema for a filter that mirrors requests.
565569
mirror?: [...{
566570
backendRef?: {
567-
group?: strings.MaxRunes(253) & =~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" | *""
568-
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & =~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$" | *"Service"
569-
name!: strings.MaxRunes(253) & strings.MinRunes(1)
571+
group?: strings.MaxRunes(253) & {
572+
=~"^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
573+
}
574+
kind?: strings.MaxRunes(63) & strings.MinRunes(1) & {
575+
=~"^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$"
576+
}
577+
name!: strings.MaxRunes(253) & strings.MinRunes(1)
570578
namespace?: strings.MaxRunes(63) & strings.MinRunes(1) & {
571579
=~"^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
572580
}

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/stefanprodan/timoni
33
go 1.23.0
44

55
require (
6-
cuelang.org/go v0.11.0
6+
cuelang.org/go v0.12.0
77
github.com/Masterminds/semver/v3 v3.3.1
88
github.com/briandowns/spinner v1.23.2
99
github.com/distribution/distribution/v3 v3.0.0-rc.2
@@ -38,7 +38,7 @@ require (
3838
)
3939

4040
require (
41-
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565 // indirect
41+
cuelabs.dev/go/oci/ociregistry v0.0.0-20241125120445-2c00c104c6e1 // indirect
4242
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4343
github.com/BurntSushi/toml v1.4.0 // indirect
4444
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -62,7 +62,7 @@ require (
6262
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6363
github.com/docker/go-metrics v0.0.1 // indirect
6464
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
65-
github.com/emicklei/proto v1.13.2 // indirect
65+
github.com/emicklei/proto v1.13.4 // indirect
6666
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6767
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6868
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -131,12 +131,12 @@ require (
131131
github.com/prometheus/client_model v0.6.1 // indirect
132132
github.com/prometheus/common v0.62.0 // indirect
133133
github.com/prometheus/procfs v0.15.1 // indirect
134-
github.com/protocolbuffers/txtpbfmt v0.0.0-20240823084532-8e6b51fa9bef // indirect
134+
github.com/protocolbuffers/txtpbfmt v0.0.0-20241112170944-20d2c9ebc01d // indirect
135135
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
136136
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
137137
github.com/redis/go-redis/v9 v9.1.0 // indirect
138138
github.com/rivo/uniseg v0.4.7 // indirect
139-
github.com/rogpeppe/go-internal v1.13.1 // indirect
139+
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a // indirect
140140
github.com/russross/blackfriday/v2 v2.1.0 // indirect
141141
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
142142
github.com/spf13/pflag v1.0.6 // indirect

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565 h1:R5wwEcbEZSBmeyg91MJZTxfd7WpBo2jPof3AYjRbxwY=
2-
cuelabs.dev/go/oci/ociregistry v0.0.0-20240906074133-82eb438dd565/go.mod h1:5A4xfTzHTXfeVJBU6RAUf+QrlfTCW+017q/QiW+sMLg=
3-
cuelang.org/go v0.11.0 h1:2af2nhipqlUHtXk2dtOP5xnMm1ObGvKqIsJUJL1sRE4=
4-
cuelang.org/go v0.11.0/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0=
1+
cuelabs.dev/go/oci/ociregistry v0.0.0-20241125120445-2c00c104c6e1 h1:mRwydyTyhtRX2wXS3mqYWzR2qlv6KsmoKXmlz5vInjg=
2+
cuelabs.dev/go/oci/ociregistry v0.0.0-20241125120445-2c00c104c6e1/go.mod h1:5A4xfTzHTXfeVJBU6RAUf+QrlfTCW+017q/QiW+sMLg=
3+
cuelang.org/go v0.12.0 h1:q4W5I+RtDIA27rslQyyt6sWkXX0YS9qm43+U1/3e0kU=
4+
cuelang.org/go v0.12.0/go.mod h1:B4+kjvGGQnbkz+GuAv1dq/R308gTkp0sO28FdMrJ2Kw=
55
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
66
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
77
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
@@ -71,8 +71,8 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
7171
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
7272
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
7373
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
74-
github.com/emicklei/proto v1.13.2 h1:z/etSFO3uyXeuEsVPzfl56WNgzcvIr42aQazXaQmFZY=
75-
github.com/emicklei/proto v1.13.2/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
74+
github.com/emicklei/proto v1.13.4 h1:myn1fyf8t7tAqIzV91Tj9qXpvyXXGXk8OS2H6IBSc9g=
75+
github.com/emicklei/proto v1.13.4/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
7676
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
7777
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
7878
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
@@ -312,8 +312,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
312312
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
313313
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
314314
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
315-
github.com/protocolbuffers/txtpbfmt v0.0.0-20240823084532-8e6b51fa9bef h1:ej+64jiny5VETZTqcc1GFVAPEtaSk6U1D0kKC2MS5Yc=
316-
github.com/protocolbuffers/txtpbfmt v0.0.0-20240823084532-8e6b51fa9bef/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c=
315+
github.com/protocolbuffers/txtpbfmt v0.0.0-20241112170944-20d2c9ebc01d h1:HWfigq7lB31IeJL8iy7jkUmU/PG1Sr8jVGhS749dbUA=
316+
github.com/protocolbuffers/txtpbfmt v0.0.0-20241112170944-20d2c9ebc01d/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c=
317317
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
318318
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
319319
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc=
@@ -324,8 +324,8 @@ github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH
324324
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
325325
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
326326
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
327-
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
328-
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
327+
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a h1:w3tdWGKbLGBPtR/8/oO74W6hmz0qE5q0z9aqSAewaaM=
328+
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a/go.mod h1:S8kfXMp+yh77OxPD4fdM6YUknrZpQxLhvxzS4gDHENY=
329329
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
330330
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
331331
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ objects: [{
77
}
88
data: {
99
url: "https://test.internal"
10-
kubeVersion: "1.25.3"
1110
moduleVersion: "0.0.0-devel"
11+
kubeVersion: "1.25.3"
1212
}
1313
}]

‎internal/engine/testdata/values/golden.cue

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
values: {
22
securityContext: {
3-
seccompProfile: {
4-
type: "RuntimeDefault"
5-
}
6-
readOnlyRootFilesystem: false
73
allowPrivilegeEscalation: false
8-
runAsNonRoot: true
94
capabilities: {
105
add: ["NET_BIND_SERVICE"]
116
drop: ["ALL"]
127
}
8+
readOnlyRootFilesystem: false
9+
runAsNonRoot: true
10+
seccompProfile: {
11+
type: "RuntimeDefault"
12+
}
1313
}
1414
resources: {
1515
limits: {

0 commit comments

Comments
 (0)