From af776b8abe5a18290abfcdcce2aa1c5b3b6e507b Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 25 May 2021 16:53:26 -0700 Subject: [PATCH] cleanup: move packages to top level, change vanity URL Signed-off-by: Andrea Luzzardi --- .golangci.yml | 2 +- Makefile | 4 ++-- {dagger/client => client}/client.go | 18 +++++++++--------- cmd/dagger/cmd/common/common.go | 8 ++++---- cmd/dagger/cmd/compute.go | 8 ++++---- cmd/dagger/cmd/init.go | 4 ++-- cmd/dagger/cmd/input/container.go | 4 ++-- cmd/dagger/cmd/input/dir.go | 6 +++--- cmd/dagger/cmd/input/git.go | 4 ++-- cmd/dagger/cmd/input/json.go | 4 ++-- cmd/dagger/cmd/input/list.go | 14 +++++++------- cmd/dagger/cmd/input/root.go | 4 ++-- cmd/dagger/cmd/input/secret.go | 4 ++-- cmd/dagger/cmd/input/text.go | 4 ++-- cmd/dagger/cmd/input/unset.go | 4 ++-- cmd/dagger/cmd/input/yaml.go | 4 ++-- cmd/dagger/cmd/list.go | 4 ++-- cmd/dagger/cmd/new.go | 4 ++-- cmd/dagger/cmd/query.go | 8 ++++---- cmd/dagger/cmd/root.go | 6 +++--- cmd/dagger/cmd/up.go | 4 ++-- cmd/dagger/cmd/version.go | 2 +- cmd/dagger/main.go | 2 +- {dagger/compiler => compiler}/build.go | 0 {dagger/compiler => compiler}/compiler.go | 0 {dagger/compiler => compiler}/compiler_test.go | 0 {dagger/compiler => compiler}/json.go | 0 {dagger/compiler => compiler}/value.go | 0 .../environment => environment}/environment.go | 8 ++++---- .../environment_test.go | 2 +- .../environment => environment}/inputs_scan.go | 2 +- .../environment => environment}/pipeline.go | 4 ++-- go.mod | 2 +- {dagger/keychain => keychain}/encrypt.go | 0 {dagger/keychain => keychain}/keys.go | 0 {dagger/solver => solver}/fs.go | 0 {dagger/solver => solver}/registryauth.go | 0 {dagger/solver => solver}/solver.go | 0 {dagger/state => state}/input.go | 2 +- {dagger/state => state}/state.go | 0 {dagger/state => state}/workspace.go | 2 +- {dagger/state => state}/workspace_test.go | 0 {pkg => util}/buildkitd/buildkitd.go | 0 {pkg => util}/progressui/display.go | 0 {pkg => util}/progressui/printer.go | 0 45 files changed, 74 insertions(+), 74 deletions(-) rename {dagger/client => client}/client.go (93%) rename {dagger/compiler => compiler}/build.go (100%) rename {dagger/compiler => compiler}/compiler.go (100%) rename {dagger/compiler => compiler}/compiler_test.go (100%) rename {dagger/compiler => compiler}/json.go (100%) rename {dagger/compiler => compiler}/value.go (100%) rename {dagger/environment => environment}/environment.go (98%) rename {dagger/environment => environment}/environment_test.go (94%) rename {dagger/environment => environment}/inputs_scan.go (97%) rename {dagger/environment => environment}/pipeline.go (99%) rename {dagger/keychain => keychain}/encrypt.go (100%) rename {dagger/keychain => keychain}/keys.go (100%) rename {dagger/solver => solver}/fs.go (100%) rename {dagger/solver => solver}/registryauth.go (100%) rename {dagger/solver => solver}/solver.go (100%) rename {dagger/state => state}/input.go (99%) rename {dagger/state => state}/state.go (100%) rename {dagger/state => state}/workspace.go (99%) rename {dagger/state => state}/workspace_test.go (100%) rename {pkg => util}/buildkitd/buildkitd.go (100%) rename {pkg => util}/progressui/display.go (100%) rename {pkg => util}/progressui/printer.go (100%) diff --git a/.golangci.yml b/.golangci.yml index 3e2d26a7..d6625717 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,7 @@ run: skip-dirs: # progressui is a modified 3rd party library from buildkit - - pkg/progressui + - util/progressui linters: disable-all: true diff --git a/Makefile b/Makefile index 50641073..84457c4c 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,8 @@ lint: shellcheck cuelint golint check-buildkit-version check-buildkit-version: @test \ "$(shell grep buildkit ./go.mod | cut -d' ' -f2)" = \ - "$(shell grep ' = "v' ./pkg/buildkitd/buildkitd.go | sed -E 's/^.*version.*=.*\"(v.*)\"/\1/' )" \ - || { echo buildkit version mismatch go.mod != pkg/buildkitd/buildkitd.go ; exit 1; } + "$(shell grep ' = "v' ./util/buildkitd/buildkitd.go | sed -E 's/^.*version.*=.*\"(v.*)\"/\1/' )" \ + || { echo buildkit version mismatch go.mod != util/buildkitd/buildkitd.go ; exit 1; } .PHONY: integration integration: dagger-debug diff --git a/dagger/client/client.go b/client/client.go similarity index 93% rename from dagger/client/client.go rename to client/client.go index b732b483..15506007 100644 --- a/dagger/client/client.go +++ b/client/client.go @@ -23,13 +23,13 @@ import ( "github.com/moby/buildkit/session" // docker output - "dagger.io/go/pkg/buildkitd" - "dagger.io/go/pkg/progressui" + "go.dagger.io/dagger/util/buildkitd" + "go.dagger.io/dagger/util/progressui" - "dagger.io/go/dagger/compiler" - "dagger.io/go/dagger/environment" - "dagger.io/go/dagger/solver" - "dagger.io/go/dagger/state" + "go.dagger.io/dagger/compiler" + "go.dagger.io/dagger/environment" + "go.dagger.io/dagger/solver" + "go.dagger.io/dagger/state" ) // A dagger client @@ -64,10 +64,10 @@ func New(ctx context.Context, host string, noCache bool) (*Client, error) { }, nil } -type ClientDoFunc func(context.Context, *environment.Environment, solver.Solver) error +type DoFunc func(context.Context, *environment.Environment, solver.Solver) error // FIXME: return completed *Route, instead of *compiler.Value -func (c *Client) Do(ctx context.Context, state *state.State, fn ClientDoFunc) (*environment.Environment, error) { +func (c *Client) Do(ctx context.Context, state *state.State, fn DoFunc) (*environment.Environment, error) { lg := log.Ctx(ctx) eg, gctx := errgroup.WithContext(ctx) @@ -93,7 +93,7 @@ func (c *Client) Do(ctx context.Context, state *state.State, fn ClientDoFunc) (* return environment, eg.Wait() } -func (c *Client) buildfn(ctx context.Context, env *environment.Environment, fn ClientDoFunc, ch chan *bk.SolveStatus) error { +func (c *Client) buildfn(ctx context.Context, env *environment.Environment, fn DoFunc, ch chan *bk.SolveStatus) error { lg := log.Ctx(ctx) // Scan local dirs to grant access diff --git a/cmd/dagger/cmd/common/common.go b/cmd/dagger/cmd/common/common.go index 5be2c947..cac81e68 100644 --- a/cmd/dagger/cmd/common/common.go +++ b/cmd/dagger/cmd/common/common.go @@ -3,12 +3,12 @@ package common import ( "context" - "dagger.io/go/dagger/client" - "dagger.io/go/dagger/environment" - "dagger.io/go/dagger/solver" - "dagger.io/go/dagger/state" "github.com/rs/zerolog/log" "github.com/spf13/viper" + "go.dagger.io/dagger/client" + "go.dagger.io/dagger/environment" + "go.dagger.io/dagger/solver" + "go.dagger.io/dagger/state" ) func CurrentWorkspace(ctx context.Context) *state.Workspace { diff --git a/cmd/dagger/cmd/compute.go b/cmd/dagger/cmd/compute.go index 2fb4b8b4..da719543 100644 --- a/cmd/dagger/cmd/compute.go +++ b/cmd/dagger/cmd/compute.go @@ -8,10 +8,10 @@ import ( "strings" "cuelang.org/go/cue" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/compiler" - "dagger.io/go/dagger/state" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/compiler" + "go.dagger.io/dagger/state" "go.mozilla.org/sops/v3" "go.mozilla.org/sops/v3/decrypt" diff --git a/cmd/dagger/cmd/init.go b/cmd/dagger/cmd/init.go index c47346f7..9d5d1872 100644 --- a/cmd/dagger/cmd/init.go +++ b/cmd/dagger/cmd/init.go @@ -3,10 +3,10 @@ package cmd import ( "os" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var initCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/container.go b/cmd/dagger/cmd/input/container.go index 6ced900f..c9da5d41 100644 --- a/cmd/dagger/cmd/input/container.go +++ b/cmd/dagger/cmd/input/container.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var containerCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/dir.go b/cmd/dagger/cmd/input/dir.go index 0e23ccee..8d389cdd 100644 --- a/cmd/dagger/cmd/input/dir.go +++ b/cmd/dagger/cmd/input/dir.go @@ -4,11 +4,11 @@ import ( "path/filepath" "strings" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var dirCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/git.go b/cmd/dagger/cmd/input/git.go index f718b395..4fdd5898 100644 --- a/cmd/dagger/cmd/input/git.go +++ b/cmd/dagger/cmd/input/git.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var gitCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/json.go b/cmd/dagger/cmd/input/json.go index 508328bf..03f5ec9d 100644 --- a/cmd/dagger/cmd/input/json.go +++ b/cmd/dagger/cmd/input/json.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var jsonCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/list.go b/cmd/dagger/cmd/input/list.go index 313f68e9..6dd65538 100644 --- a/cmd/dagger/cmd/input/list.go +++ b/cmd/dagger/cmd/input/list.go @@ -6,13 +6,13 @@ import ( "os" "text/tabwriter" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/client" - "dagger.io/go/dagger/compiler" - "dagger.io/go/dagger/environment" - "dagger.io/go/dagger/solver" - "dagger.io/go/dagger/state" + "go.dagger.io/dagger/client" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/compiler" + "go.dagger.io/dagger/environment" + "go.dagger.io/dagger/solver" + "go.dagger.io/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/dagger/cmd/input/root.go b/cmd/dagger/cmd/input/root.go index e9cf2e75..ef1ae3cf 100644 --- a/cmd/dagger/cmd/input/root.go +++ b/cmd/dagger/cmd/input/root.go @@ -5,11 +5,11 @@ import ( "io" "os" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/dagger/state" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/state" ) // Cmd exposes the top-level command diff --git a/cmd/dagger/cmd/input/secret.go b/cmd/dagger/cmd/input/secret.go index 24e4f29c..9570d99a 100644 --- a/cmd/dagger/cmd/input/secret.go +++ b/cmd/dagger/cmd/input/secret.go @@ -4,10 +4,10 @@ import ( "fmt" "syscall" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" "golang.org/x/term" ) diff --git a/cmd/dagger/cmd/input/text.go b/cmd/dagger/cmd/input/text.go index 19f32520..d5cfbe10 100644 --- a/cmd/dagger/cmd/input/text.go +++ b/cmd/dagger/cmd/input/text.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var textCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/unset.go b/cmd/dagger/cmd/input/unset.go index 9b643c0b..b122d7f7 100644 --- a/cmd/dagger/cmd/input/unset.go +++ b/cmd/dagger/cmd/input/unset.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" ) var unsetCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/input/yaml.go b/cmd/dagger/cmd/input/yaml.go index 6afceecd..db1b0025 100644 --- a/cmd/dagger/cmd/input/yaml.go +++ b/cmd/dagger/cmd/input/yaml.go @@ -1,10 +1,10 @@ package input import ( - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/state" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/state" ) var yamlCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/list.go b/cmd/dagger/cmd/list.go index 4e1fb8d0..ea29b2a5 100644 --- a/cmd/dagger/cmd/list.go +++ b/cmd/dagger/cmd/list.go @@ -8,10 +8,10 @@ import ( "strings" "text/tabwriter" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" ) var listCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/new.go b/cmd/dagger/cmd/new.go index c2c019c0..81979cfc 100644 --- a/cmd/dagger/cmd/new.go +++ b/cmd/dagger/cmd/new.go @@ -1,10 +1,10 @@ package cmd import ( - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" ) var newCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/query.go b/cmd/dagger/cmd/query.go index 2149fc8a..d4b895de 100644 --- a/cmd/dagger/cmd/query.go +++ b/cmd/dagger/cmd/query.go @@ -4,10 +4,10 @@ import ( "fmt" "cuelang.org/go/cue" - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" - "dagger.io/go/dagger/client" - "dagger.io/go/dagger/compiler" + "go.dagger.io/dagger/client" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" + "go.dagger.io/dagger/compiler" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/dagger/cmd/root.go b/cmd/dagger/cmd/root.go index 77006d9c..19ab0229 100644 --- a/cmd/dagger/cmd/root.go +++ b/cmd/dagger/cmd/root.go @@ -4,14 +4,14 @@ import ( "os" "strings" - "dagger.io/go/cmd/dagger/cmd/input" - "dagger.io/go/cmd/dagger/cmd/output" - "dagger.io/go/cmd/dagger/logger" "github.com/moby/buildkit/util/appcontext" "github.com/opentracing/opentracing-go" otlog "github.com/opentracing/opentracing-go/log" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.dagger.io/dagger/cmd/dagger/cmd/input" + "go.dagger.io/dagger/cmd/dagger/cmd/output" + "go.dagger.io/dagger/cmd/dagger/logger" ) var rootCmd = &cobra.Command{ diff --git a/cmd/dagger/cmd/up.go b/cmd/dagger/cmd/up.go index 440216c5..bd4d72a9 100644 --- a/cmd/dagger/cmd/up.go +++ b/cmd/dagger/cmd/up.go @@ -1,8 +1,8 @@ package cmd import ( - "dagger.io/go/cmd/dagger/cmd/common" - "dagger.io/go/cmd/dagger/logger" + "go.dagger.io/dagger/cmd/dagger/cmd/common" + "go.dagger.io/dagger/cmd/dagger/logger" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/dagger/cmd/version.go b/cmd/dagger/cmd/version.go index 66b3bfe8..665cc2fb 100644 --- a/cmd/dagger/cmd/version.go +++ b/cmd/dagger/cmd/version.go @@ -25,7 +25,7 @@ const ( ) // set by goreleaser or other builder using -// -ldflags='-X dagger.io/go/cmd/dagger/cmd.version=' +// -ldflags='-X go.dagger.io/dagger/cmd/dagger/cmd.version=' var ( version = defaultVersion versionMessage = "" diff --git a/cmd/dagger/main.go b/cmd/dagger/main.go index 71a7cdaa..88d325d5 100644 --- a/cmd/dagger/main.go +++ b/cmd/dagger/main.go @@ -1,7 +1,7 @@ package main import ( - "dagger.io/go/cmd/dagger/cmd" + "go.dagger.io/dagger/cmd/dagger/cmd" ) func main() { diff --git a/dagger/compiler/build.go b/compiler/build.go similarity index 100% rename from dagger/compiler/build.go rename to compiler/build.go diff --git a/dagger/compiler/compiler.go b/compiler/compiler.go similarity index 100% rename from dagger/compiler/compiler.go rename to compiler/compiler.go diff --git a/dagger/compiler/compiler_test.go b/compiler/compiler_test.go similarity index 100% rename from dagger/compiler/compiler_test.go rename to compiler/compiler_test.go diff --git a/dagger/compiler/json.go b/compiler/json.go similarity index 100% rename from dagger/compiler/json.go rename to compiler/json.go diff --git a/dagger/compiler/value.go b/compiler/value.go similarity index 100% rename from dagger/compiler/value.go rename to compiler/value.go diff --git a/dagger/environment/environment.go b/environment/environment.go similarity index 98% rename from dagger/environment/environment.go rename to environment/environment.go index 1007569a..e6db32bc 100644 --- a/dagger/environment/environment.go +++ b/environment/environment.go @@ -9,10 +9,10 @@ import ( "cuelang.org/go/cue" cueflow "cuelang.org/go/tools/flow" - "dagger.io/go/dagger/compiler" - "dagger.io/go/dagger/solver" - "dagger.io/go/dagger/state" - "dagger.io/go/stdlib" + "go.dagger.io/dagger/compiler" + "go.dagger.io/dagger/solver" + "go.dagger.io/dagger/state" + "go.dagger.io/dagger/stdlib" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" diff --git a/dagger/environment/environment_test.go b/environment/environment_test.go similarity index 94% rename from dagger/environment/environment_test.go rename to environment/environment_test.go index 49af60de..f35bc1c4 100644 --- a/dagger/environment/environment_test.go +++ b/environment/environment_test.go @@ -3,8 +3,8 @@ package environment import ( "testing" - "dagger.io/go/dagger/state" "github.com/stretchr/testify/require" + "go.dagger.io/dagger/state" ) func TestLocalDirs(t *testing.T) { diff --git a/dagger/environment/inputs_scan.go b/environment/inputs_scan.go similarity index 97% rename from dagger/environment/inputs_scan.go rename to environment/inputs_scan.go index 38d173b6..9fcea5b0 100644 --- a/dagger/environment/inputs_scan.go +++ b/environment/inputs_scan.go @@ -4,8 +4,8 @@ import ( "context" "cuelang.org/go/cue" - "dagger.io/go/dagger/compiler" "github.com/rs/zerolog/log" + "go.dagger.io/dagger/compiler" ) func isReference(val cue.Value) bool { diff --git a/dagger/environment/pipeline.go b/environment/pipeline.go similarity index 99% rename from dagger/environment/pipeline.go rename to environment/pipeline.go index 8657429c..226e0830 100644 --- a/dagger/environment/pipeline.go +++ b/environment/pipeline.go @@ -25,8 +25,8 @@ import ( "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" - "dagger.io/go/dagger/compiler" - "dagger.io/go/dagger/solver" + "go.dagger.io/dagger/compiler" + "go.dagger.io/dagger/solver" ) const ( diff --git a/go.mod b/go.mod index 5e742046..c21e5cdc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module dagger.io/go +module go.dagger.io/dagger go 1.16 diff --git a/dagger/keychain/encrypt.go b/keychain/encrypt.go similarity index 100% rename from dagger/keychain/encrypt.go rename to keychain/encrypt.go diff --git a/dagger/keychain/keys.go b/keychain/keys.go similarity index 100% rename from dagger/keychain/keys.go rename to keychain/keys.go diff --git a/dagger/solver/fs.go b/solver/fs.go similarity index 100% rename from dagger/solver/fs.go rename to solver/fs.go diff --git a/dagger/solver/registryauth.go b/solver/registryauth.go similarity index 100% rename from dagger/solver/registryauth.go rename to solver/registryauth.go diff --git a/dagger/solver/solver.go b/solver/solver.go similarity index 100% rename from dagger/solver/solver.go rename to solver/solver.go diff --git a/dagger/state/input.go b/state/input.go similarity index 99% rename from dagger/state/input.go rename to state/input.go index 4c06e47e..c29e5e0d 100644 --- a/dagger/state/input.go +++ b/state/input.go @@ -10,7 +10,7 @@ import ( "cuelang.org/go/cue" - "dagger.io/go/dagger/compiler" + "go.dagger.io/dagger/compiler" ) // An input is a value or artifact supplied by the user. diff --git a/dagger/state/state.go b/state/state.go similarity index 100% rename from dagger/state/state.go rename to state/state.go diff --git a/dagger/state/workspace.go b/state/workspace.go similarity index 99% rename from dagger/state/workspace.go rename to state/workspace.go index 4a516401..6b926390 100644 --- a/dagger/state/workspace.go +++ b/state/workspace.go @@ -9,8 +9,8 @@ import ( "path" "path/filepath" - "dagger.io/go/dagger/keychain" "github.com/rs/zerolog/log" + "go.dagger.io/dagger/keychain" "gopkg.in/yaml.v3" ) diff --git a/dagger/state/workspace_test.go b/state/workspace_test.go similarity index 100% rename from dagger/state/workspace_test.go rename to state/workspace_test.go diff --git a/pkg/buildkitd/buildkitd.go b/util/buildkitd/buildkitd.go similarity index 100% rename from pkg/buildkitd/buildkitd.go rename to util/buildkitd/buildkitd.go diff --git a/pkg/progressui/display.go b/util/progressui/display.go similarity index 100% rename from pkg/progressui/display.go rename to util/progressui/display.go diff --git a/pkg/progressui/printer.go b/util/progressui/printer.go similarity index 100% rename from pkg/progressui/printer.go rename to util/progressui/printer.go