Created
March 18, 2021 21:30
-
-
Save advancedwebdeveloper/bda9cfc45c8e133464f5eea9a4f0e50e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build.gradle b/build.gradle | |
index dde0a2f..7fb758f 100644 | |
--- a/build.gradle | |
+++ b/build.gradle | |
@@ -26,7 +26,7 @@ buildscript { | |
} | |
plugins { | |
- id 'com.github.blindpirate.gogradle' version '0.10' | |
+ id 'com.github.blindpirate.gogradle' version '0.11.4' | |
} | |
subprojects { | |
@@ -166,10 +166,7 @@ if (rootProject.hasProperty('buildPlatforms')) { | |
} else { | |
if (!rootProject.hasProperty('nativeCompile')) { | |
rootProject.ext.platforms = [ | |
- 'linux-386', 'linux-amd64', | |
- 'linux-s390x', 'linux-ppc64le', 'linux-arm', 'linux-arm64', | |
- 'darwin-amd64', | |
- 'windows-386', 'windows-amd64' | |
+ 'linux-arm64' | |
].collect { new OpenWhiskPlatform(it) } | |
} else { | |
rootProject.ext.platforms = [ rootProject.localPlatform ] | |
@@ -200,8 +197,8 @@ task getGoBinData(type: Exec) { | |
task goI18n(type: Exec) { | |
dependsOn 'getGoBinData' | |
- executable = "$System.env.GOPATH" + '/bin/go-bindata' | |
- // run '${GOPATH}/bin/go-bindata -pkg wski18n -o wski18n/i18n_resources.go wski18n/resources' | |
+ executable = 'go-bindata' | |
+ // run 'go-bindata -pkg wski18n -o wski18n/i18n_resources.go wski18n/resources' | |
args = ['-pkg', 'wski18n', '-o', 'wski18n/i18n_resources.go', 'wski18n/resources'] | |
doLast{ | |
@@ -293,7 +290,7 @@ task index() { | |
def pathObject = [ "path" : "${p.archiveDirName}/${p.archiveFileName}" ] | |
content.get(p.owOs,[:])[p.goArch] = pathObject | |
// TODO: Default architecture should be configurable as a property | |
- if (p.goArch == 'amd64') { | |
+ if (p.goArch == 'arm64') { | |
content.get(p.owOs,[:])['default'] = pathObject | |
} | |
} | |
diff --git a/commands/action.go b/commands/action.go | |
index 7d4f5fd..d89631e 100644 | |
--- a/commands/action.go | |
+++ b/commands/action.go | |
@@ -26,10 +26,11 @@ import ( | |
"math/rand" | |
"os" | |
"path/filepath" | |
- "reflect" | |
"strings" | |
"time" | |
+ reflect "github.com/goccy/go-reflect" | |
+ | |
"github.com/apache/openwhisk-cli/wski18n" | |
"github.com/apache/openwhisk-client-go/whisk" | |
diff --git a/commands/api.go b/commands/api.go | |
index 1956dad..7a6c50a 100644 | |
--- a/commands/api.go | |
+++ b/commands/api.go | |
@@ -22,18 +22,20 @@ import ( | |
"bytes" | |
"errors" | |
"fmt" | |
- "reflect" | |
"strconv" | |
"strings" | |
+ reflect "github.com/goccy/go-reflect" | |
+ | |
"github.com/apache/openwhisk-cli/wski18n" | |
"github.com/apache/openwhisk-client-go/whisk" | |
"encoding/json" | |
+ "regexp" | |
+ | |
"github.com/fatih/color" | |
"github.com/ghodss/yaml" | |
"github.com/spf13/cobra" | |
- "regexp" | |
) | |
const ( | |
diff --git a/commands/util.go b/commands/util.go | |
index 3fd930e..a244e72 100644 | |
--- a/commands/util.go | |
+++ b/commands/util.go | |
@@ -38,9 +38,10 @@ import ( | |
"io" | |
"io/ioutil" | |
"os" | |
- "reflect" | |
"regexp" | |
"sort" | |
+ | |
+ reflect "github.com/goccy/go-reflect" | |
) | |
func csvToQualifiedActions(artifacts string) []string { | |
diff --git a/go.mod b/go.mod | |
index 20b9949..3f5990d 100644 | |
--- a/go.mod | |
+++ b/go.mod | |
@@ -1,6 +1,6 @@ | |
module github.com/apache/openwhisk-cli | |
-go 1.14 | |
+go 1.16 | |
require ( | |
github.com/apache/openwhisk-client-go v0.0.0-20200824013630-44551f1f3b71 | |
@@ -8,6 +8,7 @@ require ( | |
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 | |
github.com/fatih/color v1.9.0 | |
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 | |
+ github.com/goccy/go-reflect v1.1.0 // indirect | |
github.com/google/go-querystring v1.0.0 // indirect | |
github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e // indirect | |
github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect | |
@@ -22,5 +23,6 @@ require ( | |
github.com/stretchr/testify v1.6.1 | |
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect | |
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect | |
+ golang.org/x/tools v0.1.0 // indirect | |
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | |
) | |
diff --git a/go.sum b/go.sum | |
index d556757..300f740 100644 | |
--- a/go.sum | |
+++ b/go.sum | |
@@ -43,6 +43,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 | |
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= | |
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= | |
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= | |
+github.com/goccy/go-reflect v1.1.0 h1:kiT3+exv9ULtdpawlMzCGT1y5bWOmuY3jgS86GB9t1s= | |
+github.com/goccy/go-reflect v1.1.0/go.mod h1:n0oYZn8VcV2CkWTxi8B9QjkCoq6GTtCEdfmR66YhFtE= | |
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | |
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= | |
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= | |
@@ -174,16 +176,20 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 | |
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= | |
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= | |
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= | |
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | |
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= | |
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= | |
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= | |
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= | |
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | |
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= | |
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= | |
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= | |
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | |
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |
@@ -191,6 +197,7 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r | |
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | |
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | |
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= | |
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= | |
golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= | |
@@ -199,6 +206,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG | |
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |
@@ -231,6 +240,11 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm | |
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |
golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ= | |
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | |
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | |
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= | |
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= | |
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | |
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | |
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= | |
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | |
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment