Fix imports

Author: aledbf

cmd/core/build.go

@@ -23,9 +23,10 @@ package core
 import (
 	"context"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/moby/buildkit/client"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // buildCmd represents the build command

cmd/core/combine.go

@@ -26,10 +26,11 @@ import (
 	"strings"
 
 	"github.com/docker/distribution/reference"
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/moby/buildkit/client"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // combineCmd represents the build command

cmd/core/project-add-combination.go

@@ -24,8 +24,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectAddCombinationCmd = &cobra.Command{

cmd/core/project-hash.go

@@ -25,8 +25,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectHashCmd = &cobra.Command{

cmd/core/project-ignore.go

@@ -24,8 +24,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectIgnoreCmd = &cobra.Command{

cmd/core/project-image-name.go

@@ -24,8 +24,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectImageNameOpts struct {

cmd/core/project-init.go

@@ -26,8 +26,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // projectInitCmd represents the version command

cmd/core/project-manifest.go

@@ -25,8 +25,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectManifestCmd = &cobra.Command{

cmd/core/root.go

@@ -27,9 +27,10 @@ import (
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
 	"github.com/docker/cli/cli/config"
-	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/fancylog"
 )
 
 var rootCfg struct {

cmd/util/test-add.go

@@ -33,7 +33,7 @@ import (
 	"github.com/manifoldco/promptui"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	"github.com/gitpod-io/dazzle/pkg/test"