chore: Update argocd, k8s & kustomize deps (#46)

* Update argocd dep

Signed-off-by: Siddhesh Ghadi <[email protected]>

* go mod tidy

Signed-off-by: Siddhesh Ghadi <[email protected]>

* Upgrade kustomize dep

Signed-off-by: Siddhesh Ghadi <[email protected]>

* Fix gofmt

Signed-off-by: Siddhesh Ghadi <[email protected]>

* Fix gomod

Signed-off-by: Siddhesh Ghadi <[email protected]>

---------

Signed-off-by: Siddhesh Ghadi <[email protected]>

Author: svghadi

Makefile

@@ -1,5 +1,9 @@
 default: test
 
+.PHONY: build
+build:
+	go build -v ./...
+
 .PHONY: test
 test:
 	go test `go list ./... | grep -v test`

go.mod

@@ -6,7 +6,7 @@ import (
 	"log"
 	"net/http"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

go.sum

@@ -3,13 +3,14 @@ package gitfs
 import (
 	"fmt"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing/storer"
 	"github.com/go-git/go-git/v5/storage/memory"
-	"sigs.k8s.io/kustomize/pkg/fs"
+	fs "sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 // gitFS is an internal implementation of the Kustomize
@@ -136,6 +137,16 @@ func (g gitFS) WriteFile(name string, data []byte) error {
 	return errNotSupported("WriteFile")
 }
 
+// Walk implementation for fs.FileSystem
+func (g gitFS) Walk(path string, walkFn filepath.WalkFunc) error {
+	return errNotSupported("Walk")
+}
+
+// ReadDir implementation for fs.FileSystem
+func (g gitFS) ReadDir(path string) ([]string, error) {
+	return []string{}, errNotSupported("ReadDir")
+}
+
 func errNotSupported(s string) error {
 	return notSupported(s)
 }

pkg/cmd/root.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"sigs.k8s.io/kustomize/pkg/fs"
+	fs "sigs.k8s.io/kustomize/kyaml/filesys"
 
 	"github.com/redhat-developer/gitops-backend/test"
 )

pkg/gitfs/gitfs.go

@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"strings"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/julienschmidt/httprouter"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/gitfs/gitfs_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/google/go-cmp/cmp"
 	"github.com/redhat-developer/gitops-backend/pkg/git"
@@ -32,6 +32,18 @@ const (
 	testRef = "7638417db6d59f3c431d3e1f261cc637155684cd"
 )
 
+func makeTestClient() ctrlclient.Client {
+	_ = argoV1aplha1.AddToScheme(scheme.Scheme)
+	builder := fake.NewClientBuilder().WithIndex(
+		&argoV1aplha1.Application{},
+		"metadata.name",
+		func(o ctrlclient.Object) []string {
+			return []string{o.GetName()}
+		},
+	)
+	return builder.Build()
+}
+
 func TestGetPipelines(t *testing.T) {
 	ts, c := makeServer(t)
 	c.addContents("example/gitops", "pipelines.yaml", "HEAD", "testdata/pipelines.yaml")
@@ -403,13 +415,8 @@ func TestListApplications_badURL(t *testing.T) {
 }
 
 func TestGetApplicationDetails(t *testing.T) {
-	err := argoV1aplha1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	builder := fake.NewClientBuilder()
-	kc := builder.Build()
+	var err error
+	kc := makeTestClient()
 
 	ts, _ := makeServer(t, func(router *APIRouter) {
 		router.k8sClient = kc
@@ -510,13 +517,8 @@ func TestGetApplicationDetails(t *testing.T) {
 }
 
 func TestGetApplicationHistory(t *testing.T) {
-	err := argoV1aplha1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	builder := fake.NewClientBuilder()
-	kc := builder.Build()
+	var err error
+	kc := makeTestClient()
 
 	ts, _ := makeServer(t, func(router *APIRouter) {
 		router.k8sClient = kc

pkg/httpapi/api.go

@@ -1,12 +1,13 @@
 package httpapi
 
 import (
-	log "github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sort"
 	"strings"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	log "github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 // TODO: this should really import the config from the upstream and use it to

pkg/httpapi/api_test.go

@@ -2,10 +2,11 @@ package httpapi
 
 import (
 	"fmt"
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	"testing"
 	"time"
 
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+
 	"github.com/google/go-cmp/cmp"
 )