Skip to content

Commit

Permalink
cartridge: update to master
Browse files Browse the repository at this point in the history 
Updated fork of cartridge-cli to master.
Updated go.sum/mod and test due to new behaviour of cartridge.

Part of #124
  • Loading branch information
@better0fdead
better0fdead committed Nov 14, 2022
1 parent 2119837 commit 7590590
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cli/cartridge/third_party/cartridge-cli
Submodule cartridge-cli updated 63 files
+3 −3 .github/workflows/release.yml
+15 −3 .github/workflows/tests.yml
+31 −0 CHANGELOG.md
+85 −14 cli/bench/bench.go
+10 −0 cli/bench/config.go
+73 −0 cli/bench/requests.go
+82 −0 cli/bench/space.go
+36 −0 cli/bench/types.go
+22 −12 cli/cluster/instances.go
+26 −8 cli/cluster/membership.go
+9 −0 cli/commands/admin.go
+6 −0 cli/commands/bench.go
+1 −0 cli/commands/pack.go
+2 −0 cli/commands/usage.go
+138 −32 cli/common/tarantool.go
+154 −22 cli/common/tarantool_test.go
+16 −0 cli/common/utils.go
+15 −0 cli/connector/connector.go
+8 −3 cli/context/context.go
+2 −2 cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec
+63 −2 cli/pack/pack.go
+68 −3 cli/pack/pack_test.go
+8 −0 cli/pack/validate.go
+39 −6 cli/project/dockerfiles.go
+73 −0 cli/project/dockerfiles_test.go
+0 −21 cli/project/project.go
+1 −1 cli/replicasets/bootstrap_vshard.go
+1 −1 cli/replicasets/setup.go
+2 −2 doc/commands/build.rst
+5 −1 doc/commands/pack.rst
+3 −1 doc/commands/pack/building-in-docker.rst
+5 −0 doc/commands/pack/docker.rst
+1 −1 doc/commands/replicasets.rst
+1 −1 doc/commands/start.rst
+1 −1 doc/global-flags.rst
+1 −1 doc/installation.rst
+1 −1 doc/instance-paths.rst
+2 −2 doc/locale/ru/LC_MESSAGES/doc/commands/build.po
+13 −1 doc/locale/ru/LC_MESSAGES/doc/commands/pack.po
+5 −2 doc/locale/ru/LC_MESSAGES/doc/commands/pack/building-in-docker.po
+6 −0 doc/locale/ru/LC_MESSAGES/doc/commands/pack/docker.po
+2 −2 doc/locale/ru/LC_MESSAGES/doc/commands/replicasets.po
+1 −1 doc/locale/ru/LC_MESSAGES/doc/commands/start.po
+1 −1 doc/locale/ru/LC_MESSAGES/doc/global-flags.po
+1 −1 doc/locale/ru/LC_MESSAGES/doc/instance-paths.po
+2 −2 examples/getting-started-app/README.md
+2 −2 examples/getting-started-app/README_RUS.md
+2 −2 examples/getting-started-app/getting-started-app-scm-1.rockspec
+3 −1 go.mod
+4 −2 go.sum
+14 −3 magefile.go
+1 −0 magefile.publish.go
+17 −12 test/integration/admin/test_default.py
+8 −0 test/integration/bench/test_bench.py
+11 −41 test/integration/cli/test_version.py
+6 −7 test/integration/create/test_create.py
+104 −3 test/integration/pack/test_pack_docker.py
+4 −22 test/integration/repair/test_repair_reload.py
+1 −1 test/integration/replicasets/test_bootstrap_vshard.py
+9 −37 test/integration/replicasets/test_setup.py
+48 −0 test/make_preparations/test_build_projects.py
+6 −0 test/project.py
+4 −0 test/utils.py
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.2.0-beta.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e // indirect
github.com/shirou/gopsutil v3.21.2+incompatible // indirect
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG
github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ=
Expand Down Expand Up @@ -744,6 +743,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e h1:3/9k/etUfgykjM3Rx8X0echJzo7gNNeND/ubPkqYw1k=
github.com/robfig/config v0.0.0-20141207224736-0f78529c8c7e/go.mod h1:Zerq1qYbCKtIIU9QgPydffGlpYfZ8KI/si49wuTLY/Q=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
Expand Down
2 changes: 1 addition & 1 deletion test/integration/cartridge/test_cartridge.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def test_cartridge_base_functionality(tt_cmd, tmpdir_with_cfg):
"--run-dir", str(tmpdir) + "/run/" + cartridge_name]
setup_rc, setup_out = run_command_and_get_output(setup_cmd, cwd=tmpdir)
assert setup_rc == 0
assert re.search(r'Vshard is bootstrapped successfully', setup_out)
assert re.search(r'Bootstrap vshard task completed successfully', setup_out)

admin_cmd = [tt_cmd, "cartridge", "admin", "probe",
"--name", cartridge_name,
Expand Down

0 comments on commit 7590590

Please sign in to comment.