format: fixing whitespace in files

Both 'trailing-whitespace' and 'end-of-file-fixer' hooks are applied.
They remove unnecessary trailing whitespace and ensure that
files end with a newline.

Part of #TNTP-2937

PreCommit-Verified: Passed

Author: dmyger

.github/pull_request_template.md

@@ -20,4 +20,4 @@ Closes #XXX
 [go-testing]: https://pkg.go.dev/testing
 [how-to-write-commit]: https://www.tarantool.io/en/doc/latest/contributing/developer_guidelines/#how-to-write-a-commit-message
 [keepachangelog]: https://keepachangelog.com/en/1.0.0/
-[tarantoolbot-example]: https://github.com/tarantool/tt/pull/1030/commits 
+[tarantoolbot-example]: https://github.com/tarantool/tt/pull/1030/commits

ci/Dockerfile

@@ -64,7 +64,7 @@ RUN wget -P /tmp/ https://github.com/openssl/openssl/releases/download/openssl-3
     && tar -xvf /tmp/openssl-3.0.8.tar.gz -C /tmp/ \
     && cd /tmp/openssl-3.0.8 \
     && ./Configure --prefix=/opt/openssl no-shared \
-    && make -j \ 
+    && make -j \
     && make install \
     && rm -rf /tmp/*
 
@@ -77,4 +77,4 @@ RUN ETCD_VER=v3.5.9 \
 
 RUN curl -L https://tarantool.io/iqJapRm/release/3/installer.sh | bash \
     && apt install -y tarantool tarantool-dev \
-    && apt clean    
+    && apt clean

cli/cartridge/extra/001_make_cmd_public.patch

@@ -5,7 +5,7 @@ index 5a37a75..77fdb4e 100644
 @@ -9,6 +9,8 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/admin"
  )
- 
+
 +var CartridgeCliAdmin *cobra.Command
 +
  func init() {
@@ -14,10 +14,10 @@ index 5a37a75..77fdb4e 100644
 @@ -27,6 +29,7 @@ Otherwise, first available socket from all <run-dir>/<app-name>.*.control is use
  		DisableFlagParsing: true,
  	}
- 
+
 +	CartridgeCliAdmin = adminCmd
  	rootCmd.AddCommand(adminCmd)
- 
+
  	// FLAGS are parsed in runAdminCommand
 diff --git a/cli/commands/bench.go b/cli/commands/bench.go
 index 8e408a6..06d85f0 100644
@@ -26,7 +26,7 @@ index 8e408a6..06d85f0 100644
 @@ -6,6 +6,8 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/bench"
  )
- 
+
 +var CartridgeCliBench *cobra.Command
 +
  func init() {
@@ -38,7 +38,7 @@ index 8e408a6..06d85f0 100644
  	}
 +	CartridgeCliBench = benchCmd
  	rootCmd.AddCommand(benchCmd)
- 
+
  	configureFlags(benchCmd)
 diff --git a/cli/commands/build.go b/cli/commands/build.go
 index 5d444d3..127ea43 100644
@@ -47,7 +47,7 @@ index 5d444d3..127ea43 100644
 @@ -7,6 +7,8 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/build"
  )
- 
+
 +var CartridgeCliBuild *cobra.Command
 +
  func init() {
@@ -56,10 +56,10 @@ index 5d444d3..127ea43 100644
 @@ -21,6 +23,7 @@ func init() {
  		},
  	}
- 
+
 +	CartridgeCliBuild = buildCmd
  	rootCmd.AddCommand(buildCmd)
- 
+
  	// FLAGS
 diff --git a/cli/commands/create.go b/cli/commands/create.go
 index 468f0ab..c3b5730 100644
@@ -68,7 +68,7 @@ index 468f0ab..c3b5730 100644
 @@ -13,6 +13,8 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/create/templates"
  )
- 
+
 +var CartridgeCliCreate *cobra.Command
 +
  func init() {
@@ -77,32 +77,32 @@ index 468f0ab..c3b5730 100644
 @@ -27,6 +29,7 @@ func init() {
  		},
  	}
- 
+
 +	CartridgeCliCreate = createCmd
  	rootCmd.AddCommand(createCmd)
- 
+
  	// FLAGS
 diff --git a/cli/commands/failover.go b/cli/commands/failover.go
 index 02c9c4d..ca58ad1 100644
 --- a/cli/commands/failover.go
 +++ b/cli/commands/failover.go
 @@ -9,7 +9,8 @@ import (
  )
- 
+
  var (
 -	failoverModes = []string{"stateful", "eventual", "disabled", "raft"}
 +	failoverModes        = []string{"stateful", "eventual", "disabled", "raft"}
 +	CartridgeCliFailover *cobra.Command
  )
- 
+
  func init() {
 @@ -18,6 +19,7 @@ func init() {
  		Short: "Manage application failover",
  	}
- 
+
 +	CartridgeCliFailover = failoverCmd
  	rootCmd.AddCommand(failoverCmd)
- 
+
  	var setupCmd = &cobra.Command{
 diff --git a/cli/commands/pack.go b/cli/commands/pack.go
 index 39ada3a..d6e389a 100644
@@ -111,7 +111,7 @@ index 39ada3a..d6e389a 100644
 @@ -200,6 +200,8 @@ The supported types are: rpm, tgz, docker, deb`,
  	},
  }
- 
+
 +var CartridgeCliPack = packCmd
 +
  func runPackCommand(cmd *cobra.Command, args []string) error {
@@ -124,18 +124,18 @@ index 174e489..3348257 100644
 @@ -9,12 +9,15 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/repair"
  )
- 
+
 +var CartridgeCliRepair *cobra.Command
 +
  func init() {
  	var repairCmd = &cobra.Command{
  		Use:   "repair",
  		Short: "Patch cluster configuration files",
  	}
- 
+
 +	CartridgeCliRepair = repairCmd
  	rootCmd.AddCommand(repairCmd)
- 
+
  	// repair sub-commands
 diff --git a/cli/commands/replicasets.go b/cli/commands/replicasets.go
 index 6e000b8..661c926 100644
@@ -144,16 +144,16 @@ index 6e000b8..661c926 100644
 @@ -8,12 +8,15 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/replicasets"
  )
- 
+
 +var CartridgeCliReplica *cobra.Command
 +
  func init() {
  	var replicasetsCmd = &cobra.Command{
  		Use:   "replicasets",
  		Short: "Manage application replica sets",
  	}
- 
+
 +	CartridgeCliReplica = replicasetsCmd
  	rootCmd.AddCommand(replicasetsCmd)
- 
+
  	// replicasets sub-commands

cli/cartridge/extra/002_fix_admin_param.patch

@@ -4,10 +4,9 @@ index 77fdb4e..9a9ed38 100644
 +++ b/cli/commands/admin.go
 @@ -46,7 +46,7 @@ func addAdminFlags(flagSet *pflag.FlagSet) {
  	flagSet.BoolVarP(&ctx.Admin.Help, "help", "h", false, "Help for admin function")
- 
+
  	flagSet.StringVar(&ctx.Admin.InstanceName, "instance", "", "Instance to connect to")
 -	flagSet.StringVarP(&ctx.Admin.ConnString, "conn", "c", "", "Address to connect to")
 +	flagSet.StringVar(&ctx.Admin.ConnString, "conn", "", "Address to connect to")
- 
+
  	flagSet.StringVar(&ctx.Running.RunDir, "run-dir", "", prodRunDirUsage)
- 

cli/cartridge/extra/003_fix_work_paths.patch

@@ -3,7 +3,7 @@ index dcea75c..9058c16 100644
 --- a/cli/admin/common.go
 +++ b/cli/admin/common.go
 @@ -2,7 +2,6 @@ package admin
- 
+
  import (
  	"fmt"
 -	"io/ioutil"
@@ -13,7 +13,7 @@ index dcea75c..9058c16 100644
 @@ -140,31 +139,30 @@ func getInstanceSocketPaths(ctx *context.Ctx) ([]string, error) {
  		return nil, fmt.Errorf("%s is not a directory", ctx.Running.RunDir)
  	}
- 
+
 -	runFiles, err := ioutil.ReadDir(ctx.Running.RunDir)
 -	if err != nil {
 -		return nil, fmt.Errorf("Failed to list the run directory: %s", err)
@@ -24,7 +24,7 @@ index dcea75c..9058c16 100644
 -	}
 -
  	instanceSocketPaths := []string{}
- 
+
 -	appInstanceSocketPrefix := fmt.Sprintf("%s.", ctx.Project.Name)
 -	controlSocketSuffix := ".control"
 -	for _, runFile := range runFiles {
@@ -62,7 +62,7 @@ index dcea75c..9058c16 100644
 +	if err != nil {
 +		return nil, err
  	}
- 
+
  	if len(instanceSocketPaths) == 0 {
 diff --git a/cli/commands/create.go b/cli/commands/create.go
 index c3b5730..1282c47 100644
@@ -74,10 +74,10 @@ index c3b5730..1282c47 100644
  	"github.com/tarantool/cartridge-cli/cli/create/templates"
 +	"github.com/tarantool/cartridge-cli/cli/project"
  )
- 
+
  var CartridgeCliCreate *cobra.Command
 @@ -50,7 +51,7 @@ func runCreateCommand(cmd *cobra.Command, args []string) error {
- 
+
  	// get project path
  	basePath := cmd.Flags().Arg(0)
 -	ctx.Project.Path, err = getNewProjectPath(basePath)
@@ -88,11 +88,11 @@ index c3b5730..1282c47 100644
 @@ -76,9 +77,14 @@ func runCreateCommand(cmd *cobra.Command, args []string) error {
  	return nil
  }
- 
+
 -func getNewProjectPath(basePath string) (string, error) {
 +func getNewProjectPath(basePath string, instPath string) (string, error) {
  	var err error
- 
+
 +	// Parameter `instances_available` from tt.yaml has a priority.
 +	if instPath != "" {
 +		basePath = instPath
@@ -107,12 +107,12 @@ index 4e1a12f..bd576d0 100644
 +++ b/cli/project/files.go
 @@ -52,7 +52,7 @@ type FlagOpts struct {
  }
- 
+
  func GetInstanceID(ctx *context.Ctx, instanceName string) string {
 -	return fmt.Sprintf("%s.%s", ctx.Project.Name, instanceName)
 +	return fmt.Sprintf("%s/%s", instanceName, instanceName)
  }
- 
+
  func GetInstanceWorkDir(ctx *context.Ctx, instanceName string) string {
 diff --git a/cli/project/project.go b/cli/project/project.go
 index d06ad10..551e56a 100644
@@ -121,12 +121,12 @@ index d06ad10..551e56a 100644
 @@ -11,6 +11,8 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/version"
  )
- 
+
 +const EnvInstAvailable = "TT_INST_AVAILABLE"
 +
  func FillCtx(ctx *context.Ctx) error {
  	var err error
- 
+
 @@ -23,8 +25,17 @@ func FillCtx(ctx *context.Ctx) error {
  		if err != nil {
  			return fmt.Errorf("Failed to get current directory: %s", err)
@@ -138,7 +138,7 @@ index d06ad10..551e56a 100644
 +	if instAvail != "" {
 +		ctx.Running.AppDir = filepath.Join(instAvail, ctx.Project.Name)
  	}
- 
+
 +	ctx.Replicasets.File = filepath.Join(ctx.Running.AppDir, "replicasets.yml")
 +	ctx.Running.ConfPath = filepath.Join(ctx.Running.AppDir, "instances.yml")
 +

cli/cartridge/extra/004_fix_warning.patch

@@ -5,7 +5,7 @@ index 9b56d17..e16dd14 100644
 @@ -136,10 +136,6 @@ func (process *Process) SetPidAndStatus() {
  		return
  	}
- 
+
 -	if name != "tarantool" {
 -		log.Warnf("Process %s does not seem to be tarantool", name)
 -	}

cli/cartridge/extra/005_rename_tt_env.patch

@@ -3,7 +3,7 @@ index 1282c47..0432ba6 100644
 --- a/cli/commands/create.go
 +++ b/cli/commands/create.go
 @@ -51,7 +51,7 @@ func runCreateCommand(cmd *cobra.Command, args []string) error {
- 
+
  	// get project path
  	basePath := cmd.Flags().Arg(0)
 -	ctx.Project.Path, err = getNewProjectPath(basePath, os.Getenv(project.EnvInstAvailable))
@@ -18,22 +18,22 @@ index 551e56a..0a5227d 100644
 @@ -11,7 +11,7 @@ import (
  	"github.com/tarantool/cartridge-cli/cli/version"
  )
- 
+
 -const EnvInstAvailable = "TT_INST_AVAILABLE"
 +const EnvInstEnabled = "TT_INST_ENABLED"
- 
+
  func FillCtx(ctx *context.Ctx) error {
  	var err error
 @@ -28,9 +28,9 @@ func FillCtx(ctx *context.Ctx) error {
  		ctx.Running.AppDir = filepath.Join(ctx.Running.AppDir, ctx.Project.Name)
  	}
- 
+
 -	instAvail := os.Getenv(EnvInstAvailable)
 -	if instAvail != "" {
 -		ctx.Running.AppDir = filepath.Join(instAvail, ctx.Project.Name)
 +	instEnabled := os.Getenv(EnvInstEnabled)
 +	if instEnabled != "" {
 +		ctx.Running.AppDir = filepath.Join(instEnabled, ctx.Project.Name)
  	}
- 
+
  	ctx.Replicasets.File = filepath.Join(ctx.Running.AppDir, "replicasets.yml")

cli/cartridge/extra/006_consider_tt_run_dir.patch

@@ -4,19 +4,19 @@ index 71b8f4f..e83efc0 100644
 +++ b/cli/commands/admin.go
 @@ -1,6 +1,7 @@
  package commands
- 
+
  import (
 +	"os"
  	"path/filepath"
  	"strings"
- 
+
 @@ -8,6 +9,7 @@ import (
  	"github.com/spf13/cobra"
  	"github.com/spf13/pflag"
  	"github.com/tarantool/cartridge-cli/cli/admin"
 +	"github.com/tarantool/cartridge-cli/cli/project"
  )
- 
+
  var CartridgeCliAdmin *cobra.Command
 @@ -74,6 +76,11 @@ func runAdminCommand(cmd *cobra.Command, args []string) error {
  			return err
@@ -28,22 +28,22 @@ index 71b8f4f..e83efc0 100644
 +			ctx.Running.RunDir = filepath.Join(runDir, ctx.Project.Name)
 +		}
  	}
- 
+
  	// log level is usually set in rootCmd.PersistentPreRun
 diff --git a/cli/project/project.go b/cli/project/project.go
 index 2eed9cb..3d3a995 100644
 --- a/cli/project/project.go
 +++ b/cli/project/project.go
 @@ -12,6 +12,7 @@ import (
  )
- 
+
  const EnvInstEnabled = "TT_INST_ENABLED"
 +const EnvRunDir = "TT_RUN_DIR"
- 
+
  func FillCtx(ctx *context.Ctx) error {
  	var err error
 @@ -30,7 +31,20 @@ func FillCtx(ctx *context.Ctx) error {
- 
+
  	instEnabled := os.Getenv(EnvInstEnabled)
  	if instEnabled != "" {
 -		ctx.Running.AppDir = filepath.Join(instEnabled, ctx.Project.Name)
@@ -62,5 +62,5 @@ index 2eed9cb..3d3a995 100644
 +		appName := filepath.Base(ctx.Running.AppDir)
 +		ctx.Running.RunDir = filepath.Join(runDir, appName)
  	}
- 
+
  	ctx.Replicasets.File = filepath.Join(ctx.Running.AppDir, "replicasets.yml")