Replace joshcarp/gop with anz-bank/gop (#96)

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38
+	github.com/anz-bank/gop v0.19.0
 	github.com/anz-bank/pkg v0.0.25
 	github.com/anz-bank/protoc-gen-sysl v0.0.28
 	github.com/anz-bank/sysl v0.352.0
@@ -16,7 +17,6 @@ require (
 	github.com/gohugoio/hugo v0.74.1
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/iancoleman/strcase v0.1.1
-	github.com/joshcarp/gop v0.4.0
 	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1

main.go

@@ -9,14 +9,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/anz-bank/sysl-catalog/pkg/catalog"
+	"github.com/anz-bank/sysl-catalog/pkg/watcher"
+
+	"github.com/anz-bank/gop/pkg/cli"
 	"github.com/anz-bank/sysl/pkg/env"
 	"github.com/anz-bank/sysl/pkg/parse"
-	"github.com/joshcarp/gop/gop/cli"
-
 	"github.com/anz-bank/sysl/pkg/sysl"
-
-	"github.com/anz-bank/sysl-catalog/pkg/catalog"
-	"github.com/anz-bank/sysl-catalog/pkg/watcher"
 	"github.com/gohugoio/hugo/livereload"
 	watch "github.com/radovskyb/watcher"
 	"github.com/sirupsen/logrus"
@@ -177,5 +176,5 @@ func Retriever(fs afero.Fs) (cli.Retriever, error) {
 		cache = env.SYSL_CACHE.Value()
 		proxy = env.SYSL_PROXY.Value()
 	}
-	return cli.Moduler(fs, "sysl_modules.yaml", cache, proxy, tokenmap, log.Printf), nil
+	return cli.Moduler(fs, "sysl_modules.yaml", cache, proxy, tokenmap, "", "", log.Printf), nil
 }

pkg/catalog/generator.go

@@ -10,18 +10,13 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/joshcarp/gop/gop"
-
 	"github.com/Masterminds/sprig"
-
-	"github.com/iancoleman/strcase"
-
+	"github.com/anz-bank/gop/pkg/gop"
+	"github.com/anz-bank/sysl/pkg/sysl"
 	"github.com/anz-bank/sysl/pkg/syslutil"
 	"github.com/anz-bank/sysl/pkg/syslwrapper"
-
+	"github.com/iancoleman/strcase"
 	"github.com/sirupsen/logrus"
-
-	"github.com/anz-bank/sysl/pkg/sysl"
 	"github.com/spf13/afero"
 )
 

pkg/catalog/openapi.go

@@ -4,8 +4,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/joshcarp/gop/gop"
-
+	"github.com/anz-bank/gop/pkg/gop"
 	"github.com/anz-bank/pkg/mod"
 	"github.com/anz-bank/sysl/pkg/sysl"
 )