Fix build

Author: jakweg

go.mod

@@ -26,12 +26,12 @@ import (
 	"path"
 	"sync"
 
+	"dario.cat/mergo"
 	kfconfig "github.com/google/kf/v2/pkg/apis/kf/config"
 	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	kf "github.com/google/kf/v2/pkg/client/kf/clientset/versioned/typed/kf/v1alpha1"
 	"github.com/google/kf/v2/pkg/kf/injection"
 	utils "github.com/google/kf/v2/pkg/kf/internal/utils/cli"
-	"github.com/imdario/mergo"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"

go.sum

@@ -20,6 +20,7 @@ import (
 	"runtime"
 	"sync"
 
+	"dario.cat/mergo"
 	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	"github.com/google/kf/v2/pkg/kf/commands/completion"
 	"github.com/google/kf/v2/pkg/kf/commands/config"
@@ -31,7 +32,6 @@ import (
 	"github.com/google/kf/v2/pkg/kf/doctor/troubleshooter"
 	utils "github.com/google/kf/v2/pkg/kf/internal/utils/cli"
 	"github.com/google/kf/v2/third_party/k8s.io/kubectl/pkg/util/templates"
-	"github.com/imdario/mergo"
 	"github.com/spf13/cobra"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/kf/commands/config/config.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/alessio/shellescape"
+	"al.essio.dev/pkg/shellescape"
 	"github.com/fatih/color"
 	"github.com/google/kf/v2/pkg/kf/commands/config"
 	"github.com/google/kf/v2/pkg/kf/spaces"

pkg/kf/commands/root.go

@@ -25,9 +25,9 @@ import (
 	"sort"
 	"strings"
 
+	"dario.cat/mergo"
 	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	"github.com/google/kf/v2/pkg/internal/envutil"
-	"github.com/imdario/mergo"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"knative.dev/pkg/kmp"

pkg/kf/internal/genericcli/xargs.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/alessio/shellescape"
+	"al.essio.dev/pkg/shellescape"
 	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	"github.com/google/kf/v2/pkg/internal/selectorutil"
 	appsv1 "k8s.io/api/apps/v1"

pkg/kf/manifest/manifest.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alessio/shellescape"
+	"al.essio.dev/pkg/shellescape"
 	"github.com/google/kf/v2/pkg/apis/kf/config"
 	"github.com/google/kf/v2/pkg/apis/kf/v1alpha1"
 	appresources "github.com/google/kf/v2/pkg/reconciler/app/resources"

pkg/reconciler/app/resources/deployment.go

@@ -311,10 +311,7 @@ func BuildIgnoreFilter(srcPath string) (FileFilter, error) {
 	}
 
 	if gitignore == nil {
-		gitignore, err = ignore.CompileIgnoreLines(defaultIgnoreLines...)
-		if err != nil {
-			return nil, err
-		}
+		gitignore = ignore.CompileIgnoreLines(defaultIgnoreLines...)
 	}
 
 	return func(path string) bool {

pkg/reconciler/task/resources/task_run.go

@@ -8233,7 +8233,7 @@ SOFTWARE.
 
 
 ===========================================================
-Module: github.com/alessio/shellescape
+Module: al.essio.dev/pkg/shellescape
 
 
 The MIT License (MIT)