Merge pull request #2589 from 89luca89/main

FabianKramm · web-flow · commit da772969542f · 2023-03-06T14:05:19.000+01:00
chore: update loft-sh/utils to latest version
diff --git a/go.mod b/go.mod
@@ -21,7 +21,6 @@ require (
 	github.com/gliderlabs/ssh v0.3.5
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/google/go-containerregistry v0.13.0
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/invopop/jsonschema v0.3.0
@@ -32,6 +31,7 @@ require (
 	github.com/loft-sh/go-github-selfupdate v1.0.0
 	github.com/loft-sh/loft-util v0.0.9-alpha
 	github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee
+	github.com/loft-sh/utils v0.0.16
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/moby/buildkit v0.11.0
diff --git a/go.sum b/go.sum
@@ -678,6 +678,8 @@ github.com/loft-sh/loft-util v0.0.9-alpha h1:kGcyTQWxWHWy7bbjhS8Hsq/JRdlSztAU++a
 github.com/loft-sh/loft-util v0.0.9-alpha/go.mod h1:lsjG5Exh5iEf7Z/87nqwkxx3GRQTizFRLGuS1knF6Cg=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee h1:hZ79+pKEbCBrH1dVmgZ4jtFrrDPxgM4zqEP1lHlSnvI=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee/go.mod h1:pq83B8lgfCY7tKdegTTXU6DZxGQkcWMowUTOTpTQmqk=
+github.com/loft-sh/utils v0.0.16 h1:XnD6Sb6gRWIHgM34U94dHcQ5MtxN5kAGZQ5eddAxC+c=
+github.com/loft-sh/utils v0.0.16/go.mod h1:n2L3X4i7d8kb2NF+q5duKa41N+N6fBde6XY2AolgSBI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
diff --git a/pkg/devspace/build/builder/buildkit/buildkit.go b/pkg/devspace/build/builder/buildkit/buildkit.go
@@ -17,7 +17,7 @@ import (
 	"mvdan.cc/sh/v3/expand"
 
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	command2 "github.com/loft-sh/loft-util/pkg/command"
+	command2 "github.com/loft-sh/utils/pkg/command"
 
 	cliconfig "github.com/docker/cli/cli/config"
 	"github.com/docker/docker/api/types"
diff --git a/pkg/devspace/build/builder/custom/custom.go b/pkg/devspace/build/builder/custom/custom.go
@@ -13,7 +13,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/hash"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 
 	dockerterm "github.com/moby/term"
 	"github.com/pkg/errors"
diff --git a/pkg/devspace/build/builder/docker/docker.go b/pkg/devspace/build/builder/docker/docker.go
@@ -12,7 +12,7 @@ import (
 	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
-	command2 "github.com/loft-sh/loft-util/pkg/command"
+	command2 "github.com/loft-sh/utils/pkg/command"
 	"io"
 
 	"github.com/docker/docker/api/types"
diff --git a/pkg/devspace/build/builder/helper/helper.go b/pkg/devspace/build/builder/helper/helper.go
@@ -24,7 +24,7 @@ import (
 	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/util/hash"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 )
diff --git a/pkg/devspace/config/loader/loader.go b/pkg/devspace/config/loader/loader.go
@@ -16,7 +16,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
 	"github.com/loft-sh/devspace/pkg/devspace/config/remotecache"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 
 	"github.com/loft-sh/devspace/pkg/util/constraint"
 
diff --git a/pkg/devspace/config/loader/variable/command_variable.go b/pkg/devspace/config/loader/variable/command_variable.go
@@ -11,7 +11,7 @@ import (
 	"mvdan.cc/sh/v3/expand"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/devspace/config/loader/variable/predefined_variable.go b/pkg/devspace/config/loader/variable/predefined_variable.go
@@ -16,8 +16,8 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/downloader"
-	"github.com/loft-sh/loft-util/pkg/downloader/commands"
+	"github.com/loft-sh/utils/pkg/downloader"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
 	"github.com/sirupsen/logrus"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
diff --git a/pkg/devspace/configure/image.go b/pkg/devspace/configure/image.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/util/encoding"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/sirupsen/logrus"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
diff --git a/pkg/devspace/deploy/deployer/kubectl/builder.go b/pkg/devspace/deploy/deployer/kubectl/builder.go
@@ -17,7 +17,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
diff --git a/pkg/devspace/deploy/deployer/kubectl/kubectl.go b/pkg/devspace/deploy/deployer/kubectl/kubectl.go
@@ -17,11 +17,11 @@ import (
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"github.com/loft-sh/devspace/pkg/util/stringutil"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/sirupsen/logrus"
 
-	"github.com/loft-sh/loft-util/pkg/downloader"
-	"github.com/loft-sh/loft-util/pkg/downloader/commands"
+	"github.com/loft-sh/utils/pkg/downloader"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/ghodss/yaml"
diff --git a/pkg/devspace/docker/cli.go b/pkg/devspace/docker/cli.go
@@ -3,7 +3,7 @@ package docker
 import (
 	"context"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/env"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"io"
 	"mvdan.cc/sh/v3/expand"
 	"strings"
diff --git a/pkg/devspace/docker/client.go b/pkg/devspace/docker/client.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"mvdan.cc/sh/v3/expand"
 
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
diff --git a/pkg/devspace/helm/generic/generic.go b/pkg/devspace/helm/generic/generic.go
@@ -5,17 +5,17 @@ import (
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"os"
 	"strings"
 
 	"gopkg.in/yaml.v3"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/downloader"
-	"github.com/loft-sh/loft-util/pkg/downloader/commands"
-	"github.com/loft-sh/loft-util/pkg/extract"
+	"github.com/loft-sh/utils/pkg/downloader"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
+	"github.com/loft-sh/utils/pkg/extract"
 
 	"github.com/pkg/errors"
 )
diff --git a/pkg/devspace/helm/v3/client.go b/pkg/devspace/helm/v3/client.go
@@ -17,7 +17,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/helm/generic"
 	"github.com/loft-sh/devspace/pkg/devspace/helm/types"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/downloader/commands"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
 )
 
 type client struct {
diff --git a/pkg/devspace/hook/hook.go b/pkg/devspace/hook/hook.go
@@ -8,7 +8,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/devspace/services/targetselector"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/mgutz/ansi"
 	dockerterm "github.com/moby/term"
 	"github.com/pkg/errors"
diff --git a/pkg/devspace/hook/local_command.go b/pkg/devspace/hook/local_command.go
@@ -17,7 +17,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/devspace/pipeline/engine/basichandler/handler.go b/pkg/devspace/pipeline/engine/basichandler/handler.go
@@ -10,8 +10,8 @@ import (
 	enginecommands "github.com/loft-sh/devspace/pkg/devspace/pipeline/engine/basichandler/commands"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine/types"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/downloader"
-	"github.com/loft-sh/loft-util/pkg/downloader/commands"
+	"github.com/loft-sh/utils/pkg/downloader"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
 	"github.com/pkg/errors"
 	"mvdan.cc/sh/v3/interp"
 )
diff --git a/pkg/devspace/sync/upstream.go b/pkg/devspace/sync/upstream.go
@@ -23,7 +23,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"github.com/loft-sh/devspace/pkg/util/fsutil"
 
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/loft-sh/notify"
 
 	"github.com/bmatcuk/doublestar"
diff --git a/pkg/util/git/git.go b/pkg/util/git/git.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"mvdan.cc/sh/v3/expand"
 
 	"github.com/pkg/errors"
diff --git a/pkg/util/git/helper.go b/pkg/util/git/helper.go
@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"mvdan.cc/sh/v3/expand"
 
 	"github.com/pkg/errors"
diff --git a/pkg/util/log/logger.go b/pkg/util/log/logger.go
@@ -2,7 +2,7 @@ package log
 
 import (
 	"github.com/loft-sh/devspace/pkg/util/survey"
-	log "github.com/loft-sh/loft-util/pkg/logger"
+	log "github.com/loft-sh/utils/pkg/log"
 	"github.com/sirupsen/logrus"
 	"io"
 )
diff --git a/vendor/github.com/loft-sh/utils/LICENSE b/vendor/github.com/loft-sh/utils/LICENSE
diff --git a/vendor/github.com/loft-sh/utils/pkg/command/command.go b/vendor/github.com/loft-sh/utils/pkg/command/command.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/command/fake.go b/vendor/github.com/loft-sh/utils/pkg/command/fake.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/command/prefixed_saver.go b/vendor/github.com/loft-sh/utils/pkg/command/prefixed_saver.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/downloader/commands/helm_v3.go b/vendor/github.com/loft-sh/utils/pkg/downloader/commands/helm_v3.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/downloader/commands/kubectl.go b/vendor/github.com/loft-sh/utils/pkg/downloader/commands/kubectl.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/downloader/commands/types.go b/vendor/github.com/loft-sh/utils/pkg/downloader/commands/types.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/downloader/downloader.go b/vendor/github.com/loft-sh/utils/pkg/downloader/downloader.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/extract/unzip.go b/vendor/github.com/loft-sh/utils/pkg/extract/unzip.go
diff --git a/vendor/github.com/loft-sh/utils/pkg/log/logger.go b/vendor/github.com/loft-sh/utils/pkg/log/logger.go
diff --git a/vendor/modules.txt b/vendor/modules.txt

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"`
`25`	`25`	`"github.com/loft-sh/devspace/pkg/devspace/kubectl"`
`26`	`26`	`"github.com/loft-sh/devspace/pkg/util/hash"`
`27`		`- "github.com/loft-sh/loft-util/pkg/command"`
	`27`	`+ "github.com/loft-sh/utils/pkg/command"`
`28`	`28`	`"github.com/pkg/errors"`
`29`	`29`	`"gopkg.in/yaml.v3"`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"mvdan.cc/sh/v3/expand"`
`12`	`12`
`13`	`13`	`"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"`
`14`		`- "github.com/loft-sh/loft-util/pkg/command"`
	`14`	`+ "github.com/loft-sh/utils/pkg/command"`
`15`	`15`	`"github.com/pkg/errors"`
`16`	`16`	`)`
`17`	`17`