From 9d8410c9154d6b73d87c0551f00797f355c1dd4f Mon Sep 17 00:00:00 2001 From: guriandoro Date: Tue, 3 Jul 2018 20:53:18 -0400 Subject: [PATCH 1/4] PT-1535 Changed tool name in --help output message --- src/go/pt-secure-collect/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/go/pt-secure-collect/main.go b/src/go/pt-secure-collect/main.go index 71f6a72a..e525325c 100644 --- a/src/go/pt-secure-collect/main.go +++ b/src/go/pt-secure-collect/main.go @@ -164,7 +164,7 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions, } msg += "\n " - app := kingpin.New("pt-secure-data", msg) + app := kingpin.New("pt-secure-collect", msg) if usageWriter != nil { app.UsageWriter(usageWriter) app.Terminate(nil) From d3644bd2e8e365401a5cf9b483eac69504cb5d8e Mon Sep 17 00:00:00 2001 From: guriandoro Date: Tue, 3 Jul 2018 21:19:23 -0400 Subject: [PATCH 2/4] Refactored pt-secure-data to pt-secure-collect --- src/go/pt-secure-collect/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/go/pt-secure-collect/Makefile b/src/go/pt-secure-collect/Makefile index 8862a7ce..864fd56d 100644 --- a/src/go/pt-secure-collect/Makefile +++ b/src/go/pt-secure-collect/Makefile @@ -10,7 +10,7 @@ GOPATH ?=${HOME}/go MAKE_TARS = '' CUR_DIR=$(shell pwd) BIN_DIR=${CUR_DIR}/build -SOURCES=collect encryptor pt-secure-data +SOURCES=collect encryptor pt-secure-collect LDFLAGS="-X main.Version=${VERSION} -X main.Build=${BUILD} -X main.Commit=${COMMIT} -X main.Branch=${BRANCH} -X main.GoVersion=${GOVERSION} -s -w" ifeq (${GOPATH},) @@ -22,7 +22,7 @@ $(error Invalid GOPATH. There is no src dir in the GOPATH) endif ifeq ($(findstring ${GOPATH},${CUR_DIR}), ) -$(error Wrong directorry for the project. It must be in $GOPATH/github/Percona-Lab/pt-secure-data) +$(error Wrong directorry for the project. It must be in $GOPATH/github/Percona-Lab/pt-secure-collect) endif $(info ) @@ -37,7 +37,7 @@ default: prepare @rm -f ${BIN_DIR}/collect_*.tar.gz @echo @$(info Building in ${BIN_DIR}) - @go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-data *.go + @go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-collect *.go prepare: @$(info Checking if ${BIN_DIR} exists) @@ -47,31 +47,31 @@ all: clean darwin-amd64-tar linux-amd64-tar windows-amd64-tar clean: prepare @$(info Cleaning binaries and tar.gz files in dir ${BIN_DIR}) - @rm -f ${BIN_DIR}/pt-secure-data - @rm -f ${BIN_DIR}/pt-secure-data.exe - @rm -f ${BIN_DIR}/pt-secure-data_*.tar.gz + @rm -f ${BIN_DIR}/pt-secure-collect + @rm -f ${BIN_DIR}/pt-secure-collect.exe + @rm -f ${BIN_DIR}/pt-secure-collect_*.tar.gz linux-amd64: prepare @echo "Building linux/amd64 binaries in ${BIN_DIR}" - @GOOS=linux GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-data *.go + @GOOS=linux GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-collect *.go linux-amd64-tar: linux-amd64 - @tar cvzf ${BIN_DIR}/pt-secure-data_linux_amd64.tar.gz -C ${BIN_DIR} pt-secure-data + @tar cvzf ${BIN_DIR}/pt-secure-collect_linux_amd64.tar.gz -C ${BIN_DIR} pt-secure-collect darwin-amd64: @echo "Building darwin/amd64 binaries in ${BIN_DIR}" @mkdir -p ${BIN_DIR} - @GOOS=darwin GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-data *.go + @GOOS=darwin GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-collect *.go darwin-amd64-tar: darwin-amd64 - @tar cvzf ${BIN_DIR}/pt-secure-data_darwin_amd64.tar.gz -C ${BIN_DIR} pt-secure-data + @tar cvzf ${BIN_DIR}/pt-secure-collect_darwin_amd64.tar.gz -C ${BIN_DIR} pt-secure-collect windows-amd64: prepare @echo "Building windows/amd64 binaries in ${BIN_DIR}" - @GOOS=windows GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-data.exe *.go + @GOOS=windows GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/pt-secure-collect.exe *.go windows-amd64-tar: windows-amd64 - @tar cvzf ${BIN_DIR}/pt-secure-data_windows_amd64.tar.gz -C ${BIN_DIR} pt-secure-data.exe + @tar cvzf ${BIN_DIR}/pt-secure-collect_windows_amd64.tar.gz -C ${BIN_DIR} pt-secure-collect.exe style: @echo ">> checking code style" From 57bb51f46760f50c2b9fd4fe27c005871922fffa Mon Sep 17 00:00:00 2001 From: guriandoro Date: Tue, 3 Jul 2018 22:42:02 -0400 Subject: [PATCH 3/4] Changed pt-secure-data in readme file --- src/go/pt-secure-collect/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/go/pt-secure-collect/README.md b/src/go/pt-secure-collect/README.md index eaa6ba64..784949ba 100644 --- a/src/go/pt-secure-collect/README.md +++ b/src/go/pt-secure-collect/README.md @@ -9,7 +9,7 @@ Internal variables placeholders will be replaced with the corresponding flag va Usage: ``` -pt-secure-data [] [ ...] +pt-secure-collect [] [ ...] ``` From 8e90b31b3bb4e42ed837aff7b6db551838d33fbc Mon Sep 17 00:00:00 2001 From: guriandoro Date: Wed, 4 Jul 2018 18:13:07 -0400 Subject: [PATCH 4/4] PT-1534 Adding support for --version argument --- src/go/pt-secure-collect/main.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/go/pt-secure-collect/main.go b/src/go/pt-secure-collect/main.go index e525325c..0cab45fe 100644 --- a/src/go/pt-secure-collect/main.go +++ b/src/go/pt-secure-collect/main.go @@ -67,6 +67,8 @@ type myDefaults struct { } const ( + TOOLNAME = "pt-secure-collect" + decryptCmd = "decrypt" encryptCmd = "encrypt" collectCmd = "collect" @@ -81,6 +83,10 @@ var ( "pt-summary", "pt-mysql-summary --host=$mysql-host --port=$mysql-port --user=$mysql-user --password=$mysql-pass", } + + Build string = "01-01-1980" + GoVersion string = "1.8" + Version string = "3.0.1" ) func main() { @@ -164,12 +170,15 @@ func processCliParams(baseTempPath string, usageWriter io.Writer) (*cliOptions, } msg += "\n " - app := kingpin.New("pt-secure-collect", msg) + app := kingpin.New(TOOLNAME, msg) if usageWriter != nil { app.UsageWriter(usageWriter) app.Terminate(nil) } + // Add support for --version flag + app.Version(TOOLNAME + "\nVersion " + Version + "\nBuild: " + Build + " using " + GoVersion) + opts := &cliOptions{ CollectCommand: app.Command(collectCmd, "Collect, sanitize, pack and encrypt data from pt-tools."), DecryptCommand: app.Command(decryptCmd, "Decrypt an encrypted file. The password will be requested from the terminal."),