From db48440bbf68390dfcedb119b6b5891097c4fb0f Mon Sep 17 00:00:00 2001 From: Niklas Gehlen Date: Sun, 26 Jan 2025 01:50:47 +0100 Subject: [PATCH] Bump CUE dep (and resolve formatting fight from `ns fmt` vs VSCode formatters). --- internal/testdata/service/post/service.cue | 2 +- internal/versions/versions.json | 2 +- library/oss/localstack/templates/server.cue | 2 +- library/oss/postgres/templates/server.cue | 2 +- ns-workspace.cue | 2 +- std/fn/foundation.cue | 2 +- std/monitoring/prometheus/extension.cue | 3 +-- std/monitoring/tracing/extension.cue | 2 +- universe/networking/tailscale/extension.cue | 3 +-- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/internal/testdata/service/post/service.cue b/internal/testdata/service/post/service.cue index 7212a76dc..b83347fa6 100644 --- a/internal/testdata/service/post/service.cue +++ b/internal/testdata/service/post/service.cue @@ -15,7 +15,7 @@ service: fn.#Service & { instantiate: { main: datastore.#Exports.Database & { - name: "main" + name: "main" schemaFile: inputs.#FromFile & { path: "schema.txt" } diff --git a/internal/versions/versions.json b/internal/versions/versions.json index 4b231d159..478867b31 100644 --- a/internal/versions/versions.json +++ b/internal/versions/versions.json @@ -1,5 +1,5 @@ { - "api_version": 139, + "api_version": 140, "minimum_api_version": 40, "cache_version": 1 } \ No newline at end of file diff --git a/library/oss/localstack/templates/server.cue b/library/oss/localstack/templates/server.cue index 2b7455091..66b42419d 100644 --- a/library/oss/localstack/templates/server.cue +++ b/library/oss/localstack/templates/server.cue @@ -5,7 +5,7 @@ package templates image: *"localstack/localstack@sha256:4ebb75b927bcfc9a79c77075734e51ce6031054b776eed2defcb3c0dfa4cf699" | string ingress: *false | bool dataVolumeSize: *"10GiB" | string - dataVolume: *{ + dataVolume: *{ id: "localstack-server-data" size: dataVolumeSize } | { diff --git a/library/oss/postgres/templates/server.cue b/library/oss/postgres/templates/server.cue index e6df4e392..6e30d9d51 100644 --- a/library/oss/postgres/templates/server.cue +++ b/library/oss/postgres/templates/server.cue @@ -4,7 +4,7 @@ package templates spec: { image: *"postgres:14.0@sha256:db927beee892dd02fbe963559f29a7867708747934812a80f83bff406a0d54fd" | string dataVolumeSize: *"10GiB" | string - dataVolume: *{ + dataVolume: *{ id: "postgres-server-data" size: dataVolumeSize } | { diff --git a/ns-workspace.cue b/ns-workspace.cue index 1ea3627ec..d6ee4e016 100644 --- a/ns-workspace.cue +++ b/ns-workspace.cue @@ -1,6 +1,6 @@ module: "namespacelabs.dev/foundation" requirements: { - api: 81 + api: 140 toolsVersion: 4 } prebuilts: { diff --git a/std/fn/foundation.cue b/std/fn/foundation.cue index 8ca078db7..41e3758ce 100644 --- a/std/fn/foundation.cue +++ b/std/fn/foundation.cue @@ -58,7 +58,7 @@ _#Node: { #Extension: { _#Node - hasInitializerIn?: #Framework | [...#Framework] + hasInitializerIn?: #Framework | [...#Framework] hasPostInitializerIn?: #Framework initializeBefore: [...inputs.#Package] initializeAfter: [...inputs.#Package] diff --git a/std/monitoring/prometheus/extension.cue b/std/monitoring/prometheus/extension.cue index 5d87982ec..56534b4c4 100644 --- a/std/monitoring/prometheus/extension.cue +++ b/std/monitoring/prometheus/extension.cue @@ -3,8 +3,7 @@ import ( "namespacelabs.dev/foundation/std/fn:inputs" ) -extension: fn.#Extension & { -} +extension: fn.#Extension & {} $promServer: inputs.#Server & { packageName: "namespacelabs.dev/foundation/std/monitoring/prometheus/server" diff --git a/std/monitoring/tracing/extension.cue b/std/monitoring/tracing/extension.cue index 6bdad58b3..5b1914979 100644 --- a/std/monitoring/tracing/extension.cue +++ b/std/monitoring/tracing/extension.cue @@ -55,7 +55,7 @@ extension: fn.#Extension & { } instantiate: { - serverInfo: info.#Exports.ServerInfo + serverInfo: info.#Exports.ServerInfo "interceptors": interceptors.#Exports.InterceptorRegistration & { name: "otel-tracing" } diff --git a/universe/networking/tailscale/extension.cue b/universe/networking/tailscale/extension.cue index d68f2f97e..0d69c1e63 100644 --- a/universe/networking/tailscale/extension.cue +++ b/universe/networking/tailscale/extension.cue @@ -2,8 +2,7 @@ import ( "namespacelabs.dev/foundation/std/fn" ) -extension: fn.#Extension & { -} +extension: fn.#Extension & {} configure: fn.#Configure & { sidecar: tailscaled: {