pack: added TCM file packaging #1092

AlexandrLitkevich · 2025-01-27T09:06:45Z

pack: added TCM file packaging

Closes #TNTP-1097

oleg-jukovec · 2025-01-27T12:10:40Z

cli/cmdcontext/cmdcontext.go

@@ -104,6 +110,8 @@ type CliCtx struct {
 	Verbose bool
 	// TarantoolCli is current tarantool cli.
 	TarantoolCli TarantoolCli
+	// Tcmcli is current tcm cli.
+	TcmCli


Suggested change

TcmCli

TcmCli TcmCli

test/integration/pack/test_pack.py

patapenka-alexey

Thank you for the patch! LGTM.

dmyger · 2025-01-29T09:34:03Z

cli/configure/configure.go

+			return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,
+				localTcm, err)


May be here need wrapping an error?

Suggested change

return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,

localTcm, err)

return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %w`,

localTcm, err)

dmyger · 2025-01-29T09:34:24Z

cli/configure/configure.go

+
+		cmdCtx.Cli.TcmCli.Executable = localTcm
+	} else if !os.IsNotExist(err) {
+		return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)


Wrapping?

Suggested change

return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)

return "", fmt.Errorf("failed to get access to Tcm binary file: %w", err)

Thanks for the comment.I took an example of the error above in the code

dmyger · 2025-01-29T09:34:50Z

cli/pack/common.go

+		} else {
+			if err := util.CopyFileDeep(cmdCtx.Cli.TcmCli.Executable,
+				util.JoinPaths(pkgBin, "tcm")); err != nil {
+				return fmt.Errorf("failed copying tarantool: %s", err)


Suggested change

return fmt.Errorf("failed copying tarantool: %s", err)

return fmt.Errorf("failed copying tarantool: %w", err)

Thanks for the comment.I took an example of the error above in the code

oleg-jukovec · 2025-02-02T16:03:56Z

cli/configure/configure.go

+
+	if _, err := os.Stat(localTcm); err == nil {
+		if _, err := exec.LookPath(localTcm); err != nil {
+			return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,


"%q" format do the quoting.

Suggested change

return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,

return "", fmt.Errorf(`found Tcm binary %q isn't executable: %s`,

oleg-jukovec · 2025-02-02T16:04:29Z

cli/configure/configure.go

+
+		cmdCtx.Cli.TcmCli.Executable = localTcm
+	} else if !os.IsNotExist(err) {
+		return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)


Suggested change

return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)

return "", fmt.Errorf("failed to get access to TCM binary file: %s", err)

Suggested change

return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)

return "", fmt.Errorf("failed to get access to tcm binary file: %s", err)

oleg-jukovec · 2025-02-02T16:04:53Z

cli/configure/configure.go

+		return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)
+	}
+
+	log.Debugf("tcm executable found: '%s'", cmdCtx.Cli.TcmCli.Executable)


Suggested change

log.Debugf("tcm executable found: '%s'", cmdCtx.Cli.TcmCli.Executable)

log.Debugf("tcm executable found: %q", cmdCtx.Cli.TcmCli.Executable)

oleg-jukovec · 2025-02-02T16:06:24Z

cli/pack/common.go

+	// Copy tcm.
+	if packCtx.WithBinaries {


Please, add test cases into Test_prepareBundle in the common_test.go.

oleg-jukovec · 2025-02-02T16:08:18Z

test/integration/pack/test_pack.py

@@ -787,6 +787,7 @@ def test_pack_tgz_compat_with_binaries(tt_cmd, tmp_path):

    assert os.path.isfile(os.path.join(app_path, "tt"))
    assert os.path.isfile(os.path.join(app_path, "tarantool"))
+    assert os.path.isfile(os.path.join(app_path, "tcm"))


To be honest, I don't understand where this file came from? I don't see any "tcm" file is created.

I cleared it, this line is superfluous here.Verification added on line 1017

oleg-jukovec · 2025-02-02T16:08:59Z

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

 ### Added

+- `tt pack `: added TCM file packaging


Suggested change

- `tt pack `: added TCM file packaging

- `tt pack `: added TCM file packaging.

Closes #TNTP-1097

AlexandrLitkevich force-pushed the TNTP-1097v2 branch 3 times, most recently from b4b5da6 to 9f99d09 Compare January 27, 2025 09:24

AlexandrLitkevich changed the title ~~pack: Added TCM file packaging~~ pack: added TCM file packaging Jan 27, 2025

AlexandrLitkevich requested review from oleg-jukovec and patapenka-alexey January 27, 2025 10:27

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from 76aa1a8 to 1ab11af Compare January 27, 2025 10:29

oleg-jukovec requested review from dmyger and removed request for oleg-jukovec January 27, 2025 12:07

oleg-jukovec reviewed Jan 27, 2025

View reviewed changes

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from 3688b87 to c0e4502 Compare January 27, 2025 14:46

patapenka-alexey reviewed Jan 28, 2025

View reviewed changes

test/integration/pack/test_pack.py Outdated Show resolved Hide resolved

patapenka-alexey reviewed Jan 28, 2025

View reviewed changes

test/integration/pack/test_pack.py Show resolved Hide resolved

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from c0e4502 to 891c97e Compare January 28, 2025 07:01

patapenka-alexey approved these changes Jan 28, 2025

View reviewed changes

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from 891c97e to da217d8 Compare January 28, 2025 07:16

dmyger reviewed Jan 29, 2025

View reviewed changes

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from da217d8 to 7125c3e Compare February 2, 2025 03:58

oleg-jukovec reviewed Feb 2, 2025

View reviewed changes

oleg-jukovec added the full-ci Enables full ci tests label Feb 2, 2025

oleg-jukovec reviewed Feb 2, 2025

View reviewed changes

AlexandrLitkevich force-pushed the TNTP-1097v2 branch 2 times, most recently from ac8f675 to 10af852 Compare February 3, 2025 10:13

pack: added TCM file packaging

8b4e868

Closes #TNTP-1097

AlexandrLitkevich force-pushed the TNTP-1097v2 branch from 10af852 to 8b4e868 Compare February 3, 2025 10:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pack: added TCM file packaging #1092

pack: added TCM file packaging #1092

AlexandrLitkevich commented Jan 27, 2025 •

edited

Loading

oleg-jukovec Jan 27, 2025

AlexandrLitkevich Jan 27, 2025

patapenka-alexey left a comment

dmyger Jan 29, 2025

dmyger Jan 29, 2025

AlexandrLitkevich Feb 2, 2025

dmyger Jan 29, 2025

AlexandrLitkevich Feb 2, 2025

oleg-jukovec Feb 2, 2025

AlexandrLitkevich Feb 3, 2025

oleg-jukovec Feb 2, 2025

AlexandrLitkevich Feb 3, 2025

oleg-jukovec Feb 2, 2025

AlexandrLitkevich Feb 3, 2025

oleg-jukovec Feb 2, 2025

oleg-jukovec Feb 2, 2025

AlexandrLitkevich Feb 3, 2025

oleg-jukovec Feb 2, 2025

AlexandrLitkevich Feb 3, 2025

		return "", fmt.Errorf(`found Tcm binary '%s' isn't executable: %s`,
		localTcm, err)

	return "", fmt.Errorf("failed to get access to Tcm binary file: %s", err)
	return "", fmt.Errorf("failed to get access to Tcm binary file: %w", err)

	return fmt.Errorf("failed copying tarantool: %s", err)
	return fmt.Errorf("failed copying tarantool: %w", err)

	log.Debugf("tcm executable found: '%s'", cmdCtx.Cli.TcmCli.Executable)
	log.Debugf("tcm executable found: %q", cmdCtx.Cli.TcmCli.Executable)

		@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

		### Added

		- `tt pack `: added TCM file packaging

	- `tt pack `: added TCM file packaging
	- `tt pack `: added TCM file packaging.

pack: added TCM file packaging #1092

Are you sure you want to change the base?

pack: added TCM file packaging #1092

Conversation

AlexandrLitkevich commented Jan 27, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patapenka-alexey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlexandrLitkevich commented Jan 27, 2025 •

edited

Loading