Skip to content

Commit

Permalink
Bump client-go
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bamarni committed Sep 10, 2019
1 parent 47e15e3 commit ba931f7
Show file tree
Hide file tree
Showing 55 changed files with 3,284 additions and 204 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## 1.0.1

* Fixes

* Fix `dcos package install dcos-core-cli` error on air-gapped environments.

## 1.0.0

* Breaking changes
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require (
github.com/VividCortex/ewma v1.1.1 // indirect
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/docker/go-units v0.4.0 // indirect
github.com/go-openapi/analysis v0.19.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ github.com/dcos/client-go v0.0.0-20190418124828-a5c3660ae957 h1:cSXScdOP3VTlXQtG
github.com/dcos/client-go v0.0.0-20190418124828-a5c3660ae957/go.mod h1:dyBl1aNzJ19ktYyJ7trgCrwz0sBzDwaDkKR2mnXqFgU=
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202 h1:yD1zCtFFIi+64+RveUS/nm8fXCe3YVwfsZ2UTHzVJ84=
github.com/dcos/client-go v0.0.0-20190509135418-77e5e2d8c202/go.mod h1:wDbV2eOyjoUmqPZ9cxE5VCc/YIPvriRYWWnYnF5bRoA=
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484 h1:lmN2mFdB7L5wntsIP/T0IRhC0h/umwdcDQeUL+ryKjE=
github.com/dcos/client-go v0.0.0-20190910161559-e3e16c6d1484/go.mod h1:wDbV2eOyjoUmqPZ9cxE5VCc/YIPvriRYWWnYnF5bRoA=
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/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
22 changes: 22 additions & 0 deletions tests/integration/test_corecli.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import os

import pytest

from .common import exec_cmd, default_cluster # noqa: F401


Expand All @@ -13,3 +17,21 @@ def test_update_core(default_cluster):
code, out, _ = exec_cmd(cmd)
assert code == 0
assert out == ''


@pytest.mark.skipif(
os.environ.get('DCOS_TEST_DEFAULT_CLUSTER_VARIANT') == 'open',
reason="This test needs the Bootstrap Registry, only available on DC/OS EE."
)
def test_update_core_with_bootstrap_registry(default_cluster):
code, _, _ = exec_cmd(['dcos', 'package', 'repo', 'remove', 'Universe'])
assert code == 0

try:
code, out, _ = exec_cmd(['dcos', 'package', 'install', 'dcos-core-cli'])
assert code == 0
assert out == ''
finally:
code, _, _ = exec_cmd(['dcos', 'package', 'repo', 'add', '--index=0',
'Universe', 'https://universe.mesosphere.com/repo'])
assert code == 0
61 changes: 56 additions & 5 deletions vendor/github.com/dcos/client-go/dcos/README.md

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

Loading

0 comments on commit ba931f7

Please sign in to comment.