This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openserverless-cli.git
commit 9d0d0778709589a9110ca010fb25aa691335e950 Author: Michele Sciabarra <[email protected]> AuthorDate: Mon Jul 22 11:36:42 2024 +0200 gomod --- Taskfile.yml | 41 +--------------------------- go.mod | 71 ++++++++++++++++++++++++++++++++++++++++++------- main.go | 3 --- patches/runtimes.go | 8 +++--- patches/update-gomod.sh | 7 +++-- tools/wsk | 2 +- tools/wskdeploy | 2 +- 7 files changed, 72 insertions(+), 62 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 5d41f6a..ee9e17a 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -100,44 +100,5 @@ tasks: then go test -v | tee _difftest python3 difftest.py else python3 difftest.py {{.N}} - fi - - sync-wsk: - - | - NOW=$(date +%y%m%d%H%M) - cd tools/openwhisk-wskdeploy - git tag -d $(git tag) - git commit -m $NOW -a - git tag v0.0.0.$NOW - git push origin nuvolaris --tags - cd ../openwhisk-cli - git tag -d $(git tag) - go get github.com/nuvolaris/[email protected].$NOW - git commit -m $NOW -a - git tag v0.0.0.$NOW - git push origin nuvolaris --tags - cd ../.. - go get github.com/nuvolaris/[email protected].$NOW - git add tools/openwhisk-cli - git add tools/openwhisk-wskdeploy - git add go.mod go.sum - - sync-task: - - | - NOW=$(date +%y%m%d%H%M) - cd tools/sh - go get github.com/nuvolaris/nuv@9e76cabec87cc4908fd4c4a6571927283a28a991 - go mod tidy - git tag -d $(git tag) - git commit -m $NOW -a - git tag v3.7.1-nuv.$NOW - git push origin nuvolaris --tags - cd ../task - git tag -d $(git tag) - go get github.com/nuvolaris/sh/[email protected].$NOW - git commit -m $NOW -a - git tag v3.30.2-nuv.$NOW - git push origin nuvolaris --tags - cd ../.. - go get github.com/nuvolaris/task/[email protected].$NOW +x fi diff --git a/go.mod b/go.mod index 2fa8ff1..b6d7f84 100644 --- a/go.mod +++ b/go.mod @@ -1,55 +1,108 @@ -module github.com/nuvolaris/nuv +module github.com/apache/openserverless-cli go 1.21.0 toolchain go1.21.11 require ( + github.com/Masterminds/semver v1.5.0 + github.com/apache/openwhisk-client-go v0.0.0-20220811044404-a6921af2f086 + github.com/cenkalti/backoff/v4 v4.3.0 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/go-git/go-git/v5 v5.9.0 + github.com/google/uuid v1.6.0 + github.com/h2non/filetype v1.1.3 github.com/itchyny/gojq v0.12.13 github.com/mitchellh/go-homedir v1.1.0 github.com/nicksnyder/go-i18n v1.10.1 github.com/nuvolaris/envsubst/cmd/envsubstmain v0.0.0-20230603163828-10ca029cdb58 + github.com/nuvolaris/go-replace v0.0.0-20230515190028-12766da1824c github.com/nuvolaris/goawk v1.21.1-0.20230314201833-d0931fd55c2c + github.com/nuvolaris/gron v0.0.0-20231020134423-84e679ea6aad + github.com/nuvolaris/jj v0.0.0-20231020143327-10b90948a5d2 + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c + github.com/sciabarracom/openwhisk-cli v0.0.0-20240722090924-4c0fb99f0355 + github.com/sciabarracom/sh/v3 v3.8.1-0.20240719132627-8b997d445efa + github.com/sciabarracom/task/v3 v3.38.1-0.20240719132837-9f75ee2eb9d9 github.com/stretchr/testify v1.9.0 + github.com/zalando/go-keyring v0.2.5 + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 + golang.org/x/term v0.22.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( + dario.cat/mergo v1.0.0 // indirect github.com/Ladicle/tabwriter v1.0.0 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/a8m/envsubst v1.4.2 // indirect + github.com/acomagu/bufpipe v1.0.4 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect - github.com/apache/openwhisk-client-go v0.0.0-20210311185314-87edc2364717 // indirect + github.com/alessio/shellescape v1.4.1 // indirect + github.com/cloudflare/circl v1.3.3 // indirect github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/danieljoos/wincred v1.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dlclark/regexp2 v1.11.0 // indirect github.com/dominikbraun/graph v0.23.0 // indirect + github.com/emirpasic/gods v1.18.1 // indirect github.com/fatih/color v1.17.0 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // 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/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-task/template v0.0.0-20240602015157-960e6f576656 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519 // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/itchyny/timefmt-go v0.1.5 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jessevdk/go-flags v1.5.0 // indirect github.com/joho/godotenv v1.5.1 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect github.com/mattn/go-zglob v0.0.4 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/nwidger/jsoncolor v0.0.0-20170215171346-75a6de4340e5 // indirect github.com/pelletier/go-toml v1.8.1 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/radovskyb/watcher v1.0.7 // indirect + github.com/remeh/sizedwaitgroup v1.0.0 // indirect + github.com/rivo/uniseg v0.4.4 // indirect github.com/sajari/fuzzy v1.0.0 // indirect - github.com/sciabarracom/openwhisk-cli v0.0.0-20240719143129-f5b08a1992ca // indirect - github.com/sciabarracom/openwhisk-wskdeploy v0.0.0-20240719135002-a8f57f11e6b1 // indirect - github.com/sciabarracom/sh/v3 v3.8.1-0.20240719132627-8b997d445efa // indirect - github.com/sciabarracom/task/v3 v3.38.1-0.20240719132837-9f75ee2eb9d9 // indirect + github.com/sciabarracom/openwhisk-wskdeploy v0.0.0-20240722090825-60e821cec51f // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/skeema/knownhosts v1.2.0 // indirect github.com/spf13/cobra v1.1.3 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/tidwall/gjson v1.14.0 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect + github.com/tidwall/sjson v1.2.4 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/mod v0.19.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/tools v0.23.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/main.go b/main.go index a69916e..aecd1cf 100644 --- a/main.go +++ b/main.go @@ -28,9 +28,6 @@ import ( "time" "github.com/mitchellh/go-homedir" - "github.com/apache/openserverless-cli/auth" - "github.com/apache/openserverless-cli/config" - "github.com/apache/openserverless-cli/tools" _ "embed" ) diff --git a/patches/runtimes.go b/patches/runtimes.go index f6754d7..90f927e 100644 --- a/patches/runtimes.go +++ b/patches/runtimes.go @@ -29,10 +29,10 @@ import ( "time" "github.com/apache/openwhisk-client-go/whisk" - "github.com/nuvolaris/openwhisk-wskdeploy/utils" - "github.com/nuvolaris/openwhisk-wskdeploy/wskderrors" - "github.com/nuvolaris/openwhisk-wskdeploy/wski18n" - "github.com/nuvolaris/openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" ) const ( diff --git a/patches/update-gomod.sh b/patches/update-gomod.sh index 624c7e8..5e47c69 100644 --- a/patches/update-gomod.sh +++ b/patches/update-gomod.sh @@ -1,8 +1,7 @@ -cd "$(dirname $0)" +cd "$(dirname $0)"/.. git ls-remote https://github.com/sciabarracom/task | awk '/refs\/heads\/openserverless/{print $1}' >_task.hash git ls-remote https://github.com/sciabarracom/openwhisk-cli | awk '/refs\/heads\/openserverless/{print $1}' >_wsk.hash -cd .. -go get github.com/sciabarracom/task/v3@$(cat patches/_task.hash) -go get github.com/sciabarracom/openwhisk-cli@$(cat patches/_wsk.hash) +go get github.com/sciabarracom/task/v3@$(cat _task.hash) +go get github.com/sciabarracom/openwhisk-cli@$(cat _wsk.hash) go mod tidy diff --git a/tools/wsk b/tools/wsk index f5b08a1..4c0fb99 160000 --- a/tools/wsk +++ b/tools/wsk @@ -1 +1 @@ -Subproject commit f5b08a1992ca3d1a286f22dc17199d0a22061018 +Subproject commit 4c0fb99f0355006951312368c2c2a3133ccbcd17 diff --git a/tools/wskdeploy b/tools/wskdeploy index a8f57f1..60e821c 160000 --- a/tools/wskdeploy +++ b/tools/wskdeploy @@ -1 +1 @@ -Subproject commit a8f57f11e6b19f80afa66cd8c7693388ff22de14 +Subproject commit 60e821cec51fd0661af33b48097489c924c1ffdc
