pack: Added TCM file packaging Closes #TNTP-1097

tarantool · Jan 27, 2025 · 0548d48 · 0548d48
1 parent 455053d
commit 0548d48
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 83 deletions.
diff --git a/cli/cmd/pack.go b/cli/cmd/pack.go
@@ -118,8 +118,6 @@ func internalPackModule(cmdCtx *cmdcontext.CmdCtx, args []string) error {
 		return pack.PackInDocker(cmdCtx, packCtx, *cliOpts, os.Args)
 	}
 
-	fmt.Println("cliOpts", cliOpts.Env)
-
 	packer := pack.CreatePacker(packCtx)
 	if packer == nil {
 		return fmt.Errorf("incorrect type of package. Available types: rpm, deb, tgz")

diff --git a/cli/cmdcontext/cmdcontext.go b/cli/cmdcontext/cmdcontext.go
@@ -34,8 +34,6 @@ type TarantoolCli struct {
 type TcmCli struct {
 	// Executable is a path to tcm executable.
 	Executable string
-	// // Tcm version.
-	// version version.Version
 }
 
 // GetVersion returns and caches the tarantool version.

diff --git a/cli/configure/configure.go b/cli/configure/configure.go
@@ -517,6 +517,7 @@ func detectLocalTarantool(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) er
 	if err != nil {
 		return err
 	}
+
 	if _, err := os.Stat(localTarantool); err == nil {
 		if _, err := exec.LookPath(localTarantool); err != nil {
 			return fmt.Errorf(`found Tarantool binary '%s' isn't executable: %s`,
@@ -525,7 +526,6 @@ func detectLocalTarantool(cmdCtx *cmdcontext.CmdCtx, cliOpts *config.CliOpts) er
 
 		cmdCtx.Cli.TarantoolCli.Executable = localTarantool
 		cmdCtx.Cli.IsTarantoolBinFromRepo = true
-
 	} else if !os.IsNotExist(err) {
 		return fmt.Errorf("failed to get access to Tarantool binary file: %s", err)
 	}

diff --git a/cli/pack/common.go b/cli/pack/common.go
@@ -245,7 +245,6 @@ func copyBinaries(bundleEnvPath string, packCtx *PackCtx, cmdCtx *cmdcontext.Cmd
 	if err := os.MkdirAll(pkgBin, dirPermissions); err != nil {
 		return fmt.Errorf("failed to create binaries directory in bundle: %s", err)
 	}
-	fmt.Println("cmdCtx.Cli.TarantoolCli.Executable", cmdCtx.Cli.TarantoolCli.Executable)
 
 	// Copy tarantool.
 	if !packCtx.TarantoolIsSystem || packCtx.WithBinaries {

diff --git a/demo/aap1/config.yml b/demo/aap1/config.yml
diff --git a/demo/aap1/init.lua b/demo/aap1/init.lua
diff --git a/demo/aap1/instances.yml b/demo/aap1/instances.yml
diff --git a/demo/app1-0.1.0.0.arm64.tar.gz b/demo/app1-0.1.0.0.arm64.tar.gz
diff --git a/demo/instances.enabled/aap1 b/demo/instances.enabled/aap1
diff --git a/demo/tt.yaml b/demo/tt.yaml
diff --git a/test/integration/pack/test_pack.py b/test/integration/pack/test_pack.py
@@ -801,8 +801,8 @@ def test_pack_tgz_compat_with_binaries(tt_cmd, tmp_path):
             [tt_cmd, "run"],
             cwd=app_path, env=dict(os.environ, PWD=app_path))
 
-    # assert rc == 0
-    # assert output == "Hello World"
+    assert rc == 0
+    assert output == "Hello World"
 
 
 def test_pack_tgz_multiple_apps_compat(tt_cmd, tmp_path):
@@ -993,13 +993,10 @@ def test_pack_tgz_links_to_binaries(tt_cmd, tmp_path):
                     dirs_exist_ok=True)
 
     base_dir = tmp_path
-    path = os.environ.get('PATH')
-    print(f"PATH1 ==={path}")
 
     rc, output = run_command_and_get_output(
         [tt_cmd, "pack", "tgz"],
         cwd=base_dir, env=dict(os.environ, PWD=base_dir))
-    print(f"PATH2 ==={path}")
 
     assert rc == 0