chore(cli): add version info & commit id for debug

cdk-team · Mar 6, 2022 · dbd9257 · dbd9257
1 parent 98ec2d1
commit dbd9257
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -36,8 +36,12 @@ jobs:
           sudo apt-get install -y upx
 
           export CGO_ENABLED=0
-          gox -parallel 5 -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-s -w " -output="bin/{{.Dir}}_{{.OS}}_{{.Arch}}" ./cmd/cdk/
-          gox -parallel 5 -osarch="linux/386 linux/amd64 linux/arm64" -ldflags="-s -w " -tags="thin" -output="bin/{{.Dir}}_{{.OS}}_{{.Arch}}_thin" ./cmd/cdk/
+
+          export GIT_COMMIT=$(git rev-list -1 HEAD)
+          
+          export ldflags="-X github.com/cdk-team/CDK/pkg/cli.GitCommit=$GIT_COMMIT"
+          gox -parallel 5 -osarch="darwin/amd64 linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-s -w $ldflags " -output="bin/{{.Dir}}_{{.OS}}_{{.Arch}}" ./cmd/cdk/
+          gox -parallel 5 -osarch="linux/386 linux/amd64 linux/arm64" -ldflags="-s -w $ldflags " -tags="thin" -output="bin/{{.Dir}}_{{.OS}}_{{.Arch}}_thin" ./cmd/cdk/
 
           # cdk_linux_386 cdk_linux_amd64 cdk_linux_arm cdk_linux_arm64
           cp bin/cdk_linux_amd64 bin/cdk_linux_amd64_upx

diff --git a/pkg/cli/banner.go b/pkg/cli/banner.go
@@ -1,18 +1,23 @@
 package cli
 
 import (
+	"fmt"
 	"log"
 	"os"
 
 	"github.com/docopt/docopt-go"
 )
 
-var BannerVersion = "cdk v0.1.10"
+var Args docopt.Opts
+var GitCommit string
+
+var BannerVersion = fmt.Sprintf("%s %s", "CDK Version(GitCommit):", GitCommit)
 
-var BannerHeader = `Container DucK
-Zero-dependency k8s/docker/serverless penetration toolkit by <i@cdxy.me>
+var BannerHeader = fmt.Sprintf(`Container DucK
+%s
+Zero-dependency k8s/docker/serverless penetration toolkit by cdxy & neargle
 Find tutorial, configuration and use-case in https://github.com/cdk-team/CDK/wiki
-`
+`, BannerVersion)
 
 var BannerContainer = BannerHeader + `
 Usage:
@@ -64,8 +69,6 @@ Example:
 2. inside serverless function service execute "./cdk-serverless /code 1.2.3.4 999"
 `
 
-var Args docopt.Opts
-
 func parseDocopt() {
 	args, err := docopt.ParseArgs(BannerContainer, os.Args[1:], BannerVersion)
 	if err != nil {

diff --git a/pkg/util/version.go b/pkg/util/version.go
@@ -0,0 +1 @@
+package util