From 4e02160f09af0ff60dc4a3d41b85e372da1d6fa5 Mon Sep 17 00:00:00 2001 From: tsmax2004 Date: Wed, 24 Jan 2024 17:49:49 +0300 Subject: [PATCH 1/2] YQ-2811: change version --- app/version/version.go | 22 +++++++++++++++++----- get_ldflags.sh | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) mode change 100644 => 100755 get_ldflags.sh diff --git a/app/version/version.go b/app/version/version.go index e059d5b0..427e1bd0 100644 --- a/app/version/version.go +++ b/app/version/version.go @@ -8,7 +8,7 @@ import ( ) var ( - HasInfo string + InfoSource string Tag string Author string CommitHash string @@ -27,15 +27,18 @@ var Cmd = &cobra.Command{ Use: "version", Short: "version of current build", Run: func(cmd *cobra.Command, args []string) { - if HasInfo == "true" { - fmt.Println(GetInfo()) - } else { + switch InfoSource { + case "git": + fmt.Println(GetGitInfo()) + case "arcadia": + fmt.Println(GetArcadiaInfo()) + default: fmt.Println("No information provided") } }, } -func GetInfo() string { +func GetGitInfo() string { sb := strings.Builder{} sb.WriteString("Git info:\n") @@ -58,3 +61,12 @@ func GetInfo() string { return sb.String() } + +func GetArcadiaInfo() string { + sb := strings.Builder{} + + sb.WriteString("Arcadia info:\n") + sb.WriteString(fmt.Sprintf("\tTag: %s\n", Tag)) + + return sb.String() +} diff --git a/get_ldflags.sh b/get_ldflags.sh old mode 100644 new mode 100755 index 45024f6c..4895fe53 --- a/get_ldflags.sh +++ b/get_ldflags.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "-X 'github.com/ydb-platform/fq-connector-go/app/version.HasInfo=true' \ +echo "-X 'github.com/ydb-platform/fq-connector-go/app/version.InfoSource=git' \ -X 'github.com/ydb-platform/fq-connector-go/app/version.Branch=$(git rev-parse --abbrev-ref HEAD)' \ -X 'github.com/ydb-platform/fq-connector-go/app/version.CommitHash=$(git rev-parse HEAD)' \ -X 'github.com/ydb-platform/fq-connector-go/app/version.Tag=$(git describe --tags)' \ From 1f1eb6cbfa52d20d785c8b7fad132ed8bd22fec3 Mon Sep 17 00:00:00 2001 From: tsmax2004 Date: Thu, 25 Jan 2024 11:10:05 +0300 Subject: [PATCH 2/2] add some info for arcadia way --- app/version/version.go | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/version/version.go b/app/version/version.go index 427e1bd0..d28463e1 100644 --- a/app/version/version.go +++ b/app/version/version.go @@ -48,12 +48,7 @@ func GetGitInfo() string { sb.WriteString(fmt.Sprintf("\tAuthor: %s\n", Author)) sb.WriteString(fmt.Sprintf("\tSummary: %s\n", CommitMessage)) sb.WriteString(fmt.Sprintf("\tCommit Date: %s\n\n", CommitDate)) - sb.WriteString("Other info:\n") - sb.WriteString(fmt.Sprintf("\tBuilt by: %s\n", Username)) - sb.WriteString(fmt.Sprintf("\tBuilding location: %s\n", BuildLocation)) - sb.WriteString(fmt.Sprintf("\tHostname: %s\n", Hostname)) - sb.WriteString("\tHost information:\n") - sb.WriteString(fmt.Sprintf("\t\t%s\n\n", HostInfo)) + sb.WriteString(GetCommonInfo()) sb.WriteString("Build info:\n") sb.WriteString(fmt.Sprintf("\tCompiler: %s\n", PathToGo)) sb.WriteString("\tCompiler version:\n") @@ -67,6 +62,20 @@ func GetArcadiaInfo() string { sb.WriteString("Arcadia info:\n") sb.WriteString(fmt.Sprintf("\tTag: %s\n", Tag)) + sb.WriteString(GetCommonInfo()) + + return sb.String() +} + +func GetCommonInfo() string { + sb := strings.Builder{} + + sb.WriteString("Other info:\n") + sb.WriteString(fmt.Sprintf("\tBuilt by: %s\n", Username)) + sb.WriteString(fmt.Sprintf("\tBuilding location: %s\n", BuildLocation)) + sb.WriteString(fmt.Sprintf("\tHostname: %s\n", Hostname)) + sb.WriteString("\tHost information:\n") + sb.WriteString(fmt.Sprintf("\t\t%s\n\n", HostInfo)) return sb.String() }