chore(deps): updates

.github/workflows/go.yml

@@ -13,12 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
-      - run: curl -sSLf https://raw.githubusercontent.com/octohelm/dagger/main/install.sh | sudo sh
+      - run: curl -sSLf https://raw.githubusercontent.com/octohelm/wagon/main/install.sh | sudo sh
 
       - run: make ship
         env:
           DAGGER_LOG_FORMAT: plain
           GH_USERNAME: ${{ github.actor }}
           GH_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          GIT_SHA: ${{ github.sha }}
-          GIT_REF: ${{ github.ref }}

.gitignore

@@ -5,4 +5,6 @@ dist/
 .build/
 .next/
 .turbo/
-.swc/
+.swc/
+
+.DS_Store

Makefile

@@ -1,6 +1,3 @@
-export GIT_SHA ?= $(shell git rev-parse HEAD)
-export GIT_REF ?= HEAD
-
 serve:
 	go run ./cmd/webappserve serve --help
 	go run ./cmd/webappserve serve --root=./cmd/webappserve/example/normal
@@ -38,14 +35,9 @@ build:
 pub:
 	pnpm -r publish --no-git-checks
 
+export BUILDKIT_HOST =
 ship:
-	dagger do go ship pushx
+	wagon do go ship pushx
 
 clean:
 	find . -name 'node_modules' -type d -prune -print -exec rm -rf '{}' \;
-
-#save:
-	#dagger --log-level=debug do go ship save linux/arm64
-#
-#devkit.save:
-#	dagger --log-level=debug do go devkit save linux/arm64

cmd/webappserve/main.go

@@ -8,17 +8,12 @@ import (
 )
 
 var (
-	version  = "devel"
-	revision = "-"
+	version = "devel"
 )
 
-func fullVersion() string {
-	return version + ".sha+" + revision
-}
-
 var App = cli.NewApp(
 	"app",
-	fullVersion(),
+	version,
 	cli.WithImageNamespace("ghcr.io/octohelm"),
 )
 

cue.mod/.gitignore

@@ -1,2 +1,3 @@
 gen/
-pkg/
+pkg/
+module.sum

cue.mod/module.cue

@@ -1,11 +1,6 @@
-module: "github.com/innai-tech/nodekit"
+module: "github.com/innoai-tech/nodekit"
 
 require: {
-	"dagger.io":                      "v0.3.0"
-	"github.com/innoai-tech/runtime": "v0.0.0-20221114082425-7a5e0cdc3035"
-}
-
-require: {
-	"universe.dagger.io":  "v0.3.0"                             @indirect()
-	"wagon.octohelm.tech": "v0.0.0-20200202235959-3d91e2e3161f" @indirect()
+	"github.com/innoai-tech/runtime": "v0.0.0-20230807071635-a566ade1c374"
+	"wagon.octohelm.tech":            "v0.0.0-20200202235959-3ffa3ac0907e"
 }

cue.mod/module.sum

@@ -1,4 +1,2 @@
-dagger.io v0.0.0-20200202235959-3d91e2e3161f 
-github.com/innoai-tech/runtime v0.0.0-20221114082425-7a5e0cdc3035 h1:TL/6kWrRlkmGImJ1/9Du2v0SdWwkZ39osFHq4qXhYtQ=
-universe.dagger.io v0.0.0-20200202235959-3d91e2e3161f 
-wagon.octohelm.tech v0.0.0-20200202235959-3d91e2e3161f h1:OaEdkpahmFFfrecqdNVZUuQ6F+CKNscSJjXIJUwFm7c=
+github.com/innoai-tech/runtime v0.0.0-20230807071635-a566ade1c374 h1:ROU6wwO9bta4UgGdSb1w2SEL6601m3dXTVPrh1D+Ggg=
+wagon.octohelm.tech v0.0.0-20200202235959-025ad40adac0 

go.mod

@@ -1,45 +1,90 @@
 module github.com/innoai-tech/nodekit
 
-go 1.20
+go 1.21
 
-require github.com/innoai-tech/infra v0.0.0-20230426074355-84a24dba7d07
+require github.com/innoai-tech/infra v0.0.0-20230809024609-b28415b90502
 
 require (
-	cuelang.org/go v0.5.0-beta.1 // indirect
+	cuelang.org/go v0.6.0-rc.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 // indirect
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
-	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
+	github.com/aws/aws-sdk-go v1.44.319 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cockroachdb/apd/v3 v3.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dennwc/varint v1.0.0 // indirect
+	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/go-courier/logr v0.2.0 // indirect
+	github.com/go-courier/logr v0.3.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
-	github.com/octohelm/courier v0.0.0-20230411024744-8654d7cf786d // indirect
-	github.com/octohelm/gengo v0.0.0-20230315080452-73cfd15ab4dc // indirect
-	github.com/octohelm/x v0.0.0-20220811034253-019992077a5d // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/octohelm/courier v0.0.0-20230809023744-57fc047576ed // indirect
+	github.com/octohelm/gengo v0.0.0-20230809023313-1339e47458a4 // indirect
+	github.com/octohelm/x v0.0.0-20230809022453-ac959a9edb9f // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/common/sigv4 v0.1.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/prometheus/prometheus v0.46.0 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.opentelemetry.io/otel v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
-	go.opentelemetry.io/otel/trace v1.14.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	go.opentelemetry.io/otel v1.16.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
+	go.opentelemetry.io/otel/metric v1.16.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.16.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/goleak v1.2.1 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/oauth2 v0.11.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/grpc v1.57.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )