Skip to content

Commit

Permalink
cartridge: bump 2.12.3 version
Browse files Browse the repository at this point in the history
Updated fork of cartridge-cli to 2.12.3.
Updated go.sum/mod and test due to new behaviour of cartridge.
Patch to reduce socket path length was introduced with 2.12.3 which
should allow to use longer socket path in tt.

Part of #124
  • Loading branch information
better0fdead authored and LeonidVas committed Nov 17, 2022
1 parent b23e2f2 commit 26c294a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Module ``tt daemon``, to manage the ``tt`` daemon.
- Built-in application templates support. Cartridge application template is added.

### Changed

- Modules ``tt start``, ``tt connect`` and ``tt catridge`` now use relative paths for unix sockets.
It allows to use socket paths longer than sun_path limit.(108/106 on linux/macOS)
e.g foo/bar.sock -> ./bar.sock

## [0.1.0] - 2022-10-12

### Added
Expand Down
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
+9 −4 go.mod
+24 −11 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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ require (
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/FZambia/tarantool v0.2.1 // indirect
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
Expand All @@ -44,20 +45,19 @@ require (
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-pointer v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-tty v0.0.3 // indirect
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
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
9 changes: 4 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3
github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
github.com/Microsoft/hcsshim v0.8.24/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
Expand Down Expand Up @@ -205,7 +204,6 @@ github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7
github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU=
github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
github.com/containerd/containerd v1.5.10/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ=
github.com/containerd/containerd v1.5.13 h1:XqvKw9i4P7/mFrC3TSM7yV5cwFZ9avXe6M3YANKnzEE=
github.com/containerd/containerd v1.5.13/go.mod h1:3AlCrzKROjIuP3JALsY14n8YtntaUDBu7vek+rPN5Vc=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
Expand Down Expand Up @@ -305,7 +303,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 @@ -629,8 +626,8 @@ github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2J
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c h1:RC8WMpjonrBfyAh6VN/POIPtYD5tRAq0qMqCRjQNK+g=
github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c/go.mod h1:9OcmHNQQUTbk4XCffrLgN1NEKc2mh5u++biHVrvHsSU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
Expand Down Expand Up @@ -744,6 +741,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
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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 26c294a

Please sign in to comment.