Skip to content

Commit ba931f7

Browse files
committed
Bump client-go
This fixes a bug which started to happen recently, the `releaseVersion` in Cosmos package payloads can now be too high to fit into an int32. It also adds an integration test for this. https://jira.mesosphere.com/browse/DCOS-58300
1 parent 47e15e3 commit ba931f7

File tree

55 files changed

+3284
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3284
-204
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## 1.0.1
4+
5+
* Fixes
6+
7+
* Fix `dcos package install dcos-core-cli` error on air-gapped environments.
8+
39
## 1.0.0
410

511
* Breaking changes

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require (
44
github.com/VividCortex/ewma v1.1.1 // indirect
55
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
66
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
7-
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202
7+
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484
88
github.com/dgrijalva/jwt-go v3.2.0+incompatible
99
github.com/docker/go-units v0.4.0 // indirect
1010
github.com/go-openapi/analysis v0.19.0 // indirect

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ github.com/dcos/client-go v0.0.0-20190418124828-a5c3660ae957 h1:cSXScdOP3VTlXQtG
1616
github.com/dcos/client-go v0.0.0-20190418124828-a5c3660ae957/go.mod h1:dyBl1aNzJ19ktYyJ7trgCrwz0sBzDwaDkKR2mnXqFgU=
1717
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202 h1:yD1zCtFFIi+64+RveUS/nm8fXCe3YVwfsZ2UTHzVJ84=
1818
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202/go.mod h1:wDbV2eOyjoUmqPZ9cxE5VCc/YIPvriRYWWnYnF5bRoA=
19+
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484 h1:lmN2mFdB7L5wntsIP/T0IRhC0h/umwdcDQeUL+ryKjE=
20+
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484/go.mod h1:wDbV2eOyjoUmqPZ9cxE5VCc/YIPvriRYWWnYnF5bRoA=
1921
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
2022
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
2123
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

tests/integration/test_corecli.py

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import os
2+
3+
import pytest
4+
15
from .common import exec_cmd, default_cluster # noqa: F401
26

37

@@ -13,3 +17,21 @@ def test_update_core(default_cluster):
1317
code, out, _ = exec_cmd(cmd)
1418
assert code == 0
1519
assert out == ''
20+
21+
22+
@pytest.mark.skipif(
23+
os.environ.get('DCOS_TEST_DEFAULT_CLUSTER_VARIANT') == 'open',
24+
reason="This test needs the Bootstrap Registry, only available on DC/OS EE."
25+
)
26+
def test_update_core_with_bootstrap_registry(default_cluster):
27+
code, _, _ = exec_cmd(['dcos', 'package', 'repo', 'remove', 'Universe'])
28+
assert code == 0
29+
30+
try:
31+
code, out, _ = exec_cmd(['dcos', 'package', 'install', 'dcos-core-cli'])
32+
assert code == 0
33+
assert out == ''
34+
finally:
35+
code, _, _ = exec_cmd(['dcos', 'package', 'repo', 'add', '--index=0',
36+
'Universe', 'https://universe.mesosphere.com/repo'])
37+
assert code == 0

vendor/github.com/dcos/client-go/dcos/README.md

+56-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)