Skip to content

Commit

Permalink
Update dependencies and fix unit tests for MacOS
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed Oct 17, 2023
1 parent 4746367 commit f72db8d
Show file tree
Hide file tree
Showing 91 changed files with 661 additions and 2,261 deletions.
5 changes: 5 additions & 0 deletions commands/fetch_templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ func setupLocalTemplateRepo(t *testing.T) string {

_, v, _ := strings.Cut(strings.TrimSpace(res.Stdout), "git version ")

// On darwin the string has extra text: "git version 2.39.2 (Apple Git-143)", so requires more trimming.
if strings.Contains(v, " ") {
v = strings.TrimSpace(v[:strings.Index(v, " ")])
}

s := semver.MustParse(v)
initVersion := semver.MustParse("2.28.0")

Expand Down
27 changes: 22 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ require (
github.com/alexellis/go-execute/v2 v2.2.1
github.com/alexellis/hmac v1.3.0
github.com/drone/envsubst v1.0.3
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/mitchellh/go-homedir v1.1.0
github.com/morikuni/aec v1.0.0
github.com/openfaas/faas-provider v0.24.2
github.com/openfaas/faas/gateway v0.0.0-20230914090923-4f4e3d288a38
github.com/openfaas/faas/gateway v0.0.0-20231004143230-4cf5fb83698d
github.com/pkg/errors v0.9.1
github.com/ryanuber/go-glob v1.0.0
github.com/spf13/cobra v1.7.0
Expand All @@ -29,13 +29,15 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1
github.com/moby/term v0.5.0
github.com/openfaas/go-sdk v0.2.7
golang.org/x/sync v0.3.0
golang.org/x/sync v0.4.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cheggaaa/pb/v3 v3.1.4 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/docker/cli v24.0.5+incompatible // indirect
Expand All @@ -45,19 +47,34 @@ require (
github.com/fatih/color v1.15.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/nats-io/nats.go v1.22.1 // indirect
github.com/nats-io/nkeys v0.3.0 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nats-io/stan.go v0.10.4 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/openfaas/nats-queue-worker v0.0.0-20230303171817-9dfe6fa61387 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
116 changes: 116 additions & 0 deletions go.sum

Large diffs are not rendered by default.

38 changes: 20 additions & 18 deletions vendor/github.com/google/go-cmp/cmp/compare.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions vendor/github.com/google/go-cmp/cmp/export_panic.go

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading

0 comments on commit f72db8d

Please sign in to comment.