Skip to content

Commit

Permalink
Update go to 1.15
Browse files Browse the repository at this point in the history 
Currently DC/OS CLI keeps backward compatibility for macOS 10.10 Yosemite (2014) after updating Go version we will drop it and support only macOS 10.12 Sierra or later.

It's now the industry standard to deprecate TLS 1.0 and 1.1.
See: https://tools.ietf.org/html/draft-ietf-tls-oldversions-deprecate-00

Refs: dcos/dcos-cli#1552
  • Loading branch information
@janisz
janisz committed Aug 21, 2020
1 parent 4d40370 commit e808d45
Show file tree
Hide file tree
Showing 78 changed files with 8,333 additions and 60 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
install:
- SET PATH=C:\msys64\mingw64\bin;c:\gopath\bin;%PATH%
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "c:\gopath\bin" v1.24.0
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "c:\gopath\bin" v1.30.0

build: off

Expand All @@ -11,7 +11,8 @@ environment:
NO_DOCKER: 1
GO111MODULE: off

stack: go 1.12
stack: go 1.15
image: Visual Studio 2019

test_script:
- SET GO111MODULE=on
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ os:

language: go

go: "1.12.x"
go: "1.15.x"

go_import_path: github.com/dcos/dcos-core-cli

env:
- NO_DOCKER=1 GO111MODULE=on

before_install:
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0

script:
- make
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# CHANGELOG

## 2.1-patch.x
## 2.2-patch.x

* Breaking changes

* Update Go to 1.15 – support only macOS 10.12 Sierra or later (#490)
* Require TLS 1.2 or above (#490)

## 2.1-patch.1

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.12
FROM golang:1.15

RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/dcos/dcos-core-cli
require (
github.com/antihax/optional v1.0.0
github.com/dcos/client-go v0.0.0-20200116122616-ec842e59a9e1
github.com/dcos/dcos-cli v1.1.3
github.com/dcos/dcos-cli v1.2.0
github.com/dustin/go-humanize v1.0.0
github.com/gambol99/go-marathon v0.7.2-0.20191203055606-2d3f62a40d37
github.com/gobwas/glob v0.2.3
Expand All @@ -16,12 +16,12 @@ require (
github.com/r3labs/sse v0.0.0-20181217150409-243b7807c4c4
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.6.0
github.com/spf13/afero v1.3.1
github.com/spf13/afero v1.3.4
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.6.1
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab // indirect
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
Expand Down
21 changes: 10 additions & 11 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dcos/client-go v0.0.0-20200116122616-ec842e59a9e1 h1:vOeIoWrjE5rw9Uu3/pVpDTraqjAUaT26QjckrNRJyg0=
github.com/dcos/client-go v0.0.0-20200116122616-ec842e59a9e1/go.mod h1:wDbV2eOyjoUmqPZ9cxE5VCc/YIPvriRYWWnYnF5bRoA=
github.com/dcos/dcos-cli v1.1.3 h1:c+V+AXSRnBgwz3mhAWg3mxxnwm5G8Y5AZjqgdrxR22g=
github.com/dcos/dcos-cli v1.1.3/go.mod h1:W6c9GRzuP1zU7IUsjY28Gq3LKmy0KFfKeIYbETwSGrQ=
github.com/dcos/dcos-cli v1.2.0 h1:oU1tslDPH80b59QrXg9s2i+URtgBuT2S4yjypqx8Y0k=
github.com/dcos/dcos-cli v1.2.0/go.mod h1:FrMpkLhfNvE2/bG+cW/h1nl9VDMyp7X/+mjsXJ0S2Cg=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
Expand Down Expand Up @@ -186,9 +186,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
github.com/spf13/afero v1.3.1 h1:GPTpEAuNr98px18yNQ66JllNil98wfRZ/5Ukny8FeQA=
github.com/spf13/afero v1.3.1/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=
github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
Expand Down Expand Up @@ -223,8 +222,8 @@ 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-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/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/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand All @@ -251,11 +250,11 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9 h1:MEU99+Z67sctTw1UjDlQ6wjRF77I43fOt7YKWktVvXw=
golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/pkg/package_install_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ func TestPkgInstallEmptyPackageNameShouldFail(t *testing.T) {
func TestPkgInstallShouldFailOnCosmosError(t *testing.T) {
ctx := mock.NewContext(nil)
err := pkgInstall(ctx, "helloworld", pkgInstallOptions{})
assert.EqualError(t, err, `Post /package/describe: unsupported protocol scheme ""`)
assert.EqualError(t, err, `Post "/package/describe": unsupported protocol scheme ""`)
}
2 changes: 1 addition & 1 deletion pkg/pluginutil/pluginutil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func HTTPClient(baseURL string, opts ...httpclient.Option) *httpclient.Client {
if err == nil {
certPool := x509.NewCertPool()
if certPool.AppendCertsFromPEM(rootCAsPEM) {
baseOpts = append(baseOpts, httpclient.TLS(&tls.Config{RootCAs: certPool}))
baseOpts = append(baseOpts, httpclient.TLS(&tls.Config{RootCAs: certPool, MinVersion: tls.VersionTLS12}))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/dcos/dcos-cli/pkg/login/flow.go
View file

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

2 changes: 1 addition & 1 deletion vendor/github.com/dcos/dcos-cli/pkg/setup/setup.go
View file

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

2 changes: 1 addition & 1 deletion vendor/github.com/spf13/afero/go.mod
View file

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

9 changes: 9 additions & 0 deletions vendor/github.com/spf13/afero/go.sum
View file

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

43 changes: 32 additions & 11 deletions vendor/github.com/spf13/afero/memmap.go
View file

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

9 changes: 8 additions & 1 deletion vendor/golang.org/x/sys/unix/mkerrors.sh
View file

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

0 comments on commit e808d45

Please sign in to comment.