This is an automated email from the ASF dual-hosted git repository.
duncangrant pushed a commit to branch fix-sslcheck
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git
commit f32914a806d85a1a62ffe4986b3a1411f2c288d5
Author: Duncan Grant <duncan.gr...@cloudsoft.io>
AuthorDate: Fri Mar 10 16:35:07 2023 +0000
Issue with sslcheck flag
There was a global flag and a command flag and both are not supported
so now there's only a command flag
Also updated to latest go, which had some knock-on effects.
---
Dockerfile | 16 ++++++++--------
cli/app/app.go | 8 ++++----
cli/go.mod | 20 +++++++++++++-------
cli/go.sum | 51 ++++++++++++++++++---------------------------------
4 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 23d4703..527aaff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,23 +16,23 @@
# under the License.
# For Brooklyn Client, we use a debian distribution instead of alpine as there
are some libgcc incompatibilities with GO
-FROM maven:3.5.4-jdk-8
+FROM --platform=linux/amd64 maven:3.9.0-amazoncorretto-8
# Install necessary binaries to build brooklyn-client
-RUN apt-get update && apt-get install -y git-core
+RUN yum update && yum install -y git-core
# Download Go 1.15 and verify checksum against value from
https://golang.org/dl/
# then install to /usr/local
RUN cd /tmp \
-&& curl -O https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
-&& CKSUM=$(sha256sum go1.15.8.linux-amd64.tar.gz | awk '{print $1}') \
-&& [ ${CKSUM} =
"d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b" ] \
-&& tar xf go1.15.8.linux-amd64.tar.gz \
-&& rm go1.15.8.linux-amd64.tar.gz \
+&& curl -O https://dl.google.com/go/go1.20.2.linux-amd64.tar.gz \
+&& CKSUM=$(sha256sum go1.20.2.linux-amd64.tar.gz | awk '{print $1}') \
+&& [ ${CKSUM} =
"4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768" ] \
+&& tar xf go1.20.2.linux-amd64.tar.gz \
+&& rm go1.20.2.linux-amd64.tar.gz \
&& chown -R root:root ./go \
&& mv go /usr/local
ENV PATH="${PATH}:/usr/local/go/bin"
RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
-ENV MAVEN_CONFIG=/var/maven/.m2
\ No newline at end of file
+ENV MAVEN_CONFIG=/var/maven/.m2
diff --git a/cli/app/app.go b/cli/app/app.go
index fea7214..bb2a2a5 100644
--- a/cli/app/app.go
+++ b/cli/app/app.go
@@ -52,10 +52,10 @@ func NewApp(baseName string, cmdRunner
command_runner.Runner, metadatas ...comma
app.Version = appConfig.Version
app.Flags = []cli.Flag{
- &cli.BoolFlag{
- Name: "skipSslChecks",
- Usage: "Skip verification of server's certificate chain
and hostname (for use with self-signed certs)",
- },
+ //&cli.BoolFlag{
+ // Name: "skipSslChecks",
+ // Usage: "Skip verification of server's certificate chain
and hostname (for use with self-signed certs)",
+ //},
&cli.StringFlag{
Name: "json",
Aliases: []string{"j"},
diff --git a/cli/go.mod b/cli/go.mod
index c89553b..057d5fe 100644
--- a/cli/go.mod
+++ b/cli/go.mod
@@ -16,13 +16,19 @@
// under the License.
module github.com/apache/brooklyn-client/cli
-go 1.15
+go 1.20
require (
- github.com/matryer/is v1.2.0
- github.com/urfave/cli/v2 v2.3.0
- golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
- golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
- golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
- k8s.io/client-go v11.0.0+incompatible
+ github.com/matryer/is v1.4.1
+ github.com/urfave/cli/v2 v2.25.0
+ golang.org/x/crypto v0.7.0
+ k8s.io/client-go v0.26.2
+)
+
+require (
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+ golang.org/x/sys v0.6.0 // indirect
+ golang.org/x/term v0.6.0 // indirect
)
diff --git a/cli/go.sum b/cli/go.sum
index ab9eb3e..798e389 100644
--- a/cli/go.sum
+++ b/cli/go.sum
@@ -1,33 +1,18 @@
-github.com/BurntSushi/toml v0.3.1/go.mod
h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d
h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod
h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
-github.com/matryer/is v1.2.0/go.mod
h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
-github.com/pmezard/go-difflib v1.0.0
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.0.1
h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shurcooL/sanitized_anchor_name v1.0.0
h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod
h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
-github.com/urfave/cli/v2 v2.3.0/go.mod
h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod
h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod
h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037
h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod
h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/client-go v11.0.0+incompatible
h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
-k8s.io/client-go v11.0.0+incompatible/go.mod
h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+github.com/cpuguy83/go-md2man/v2 v2.0.2
h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
+github.com/matryer/is v1.4.1/go.mod
h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
+github.com/russross/blackfriday/v2 v2.1.0
h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/urfave/cli/v2 v2.25.0
h1:ykdZKuQey2zq0yin/l7JOm9Mh+pg72ngYMeB0ABn6q8=
+github.com/urfave/cli/v2 v2.25.0/go.mod
h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod
h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod
h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
+k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
