Display insecure in the version when building without TLS (#1378)

* adding insecure to version * correct order for tags in the non-prerelease case * only display insecure on insecure build tags * handling pre-releases correctly * adding tests
drand · Jul 16, 2024 · 1bbc15a · 1bbc15a
1 parent 8f4c7ca
commit 1bbc15a
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -149,7  149,7 @@ build:
 
 # create the "drand" binary in the current folder without TLS connections, useful for tests.
 build_insecure:
-	go build -tags conn_insecure -o drand -mod=readonly -ldflags "-X $(VER_PACKAGE).COMMIT=$(GIT_REVISION) -X $(VER_PACKAGE).BUILDDATE=$(BUILD_DATE) -X $(CLI_PACKAGE).buildDate=$(BUILD_DATE) -X $(CLI_PACKAGE).gitCommit=$(GIT_REVISION)" ./cmd/drand
 	go build -tags conn_insecure -o drand -mod=readonly -ldflags "-X $(VER_PACKAGE).COMMIT=$(GIT_REVISION) -X $(VER_PACKAGE).BUILDDATE=$(BUILD_DATE) -X $(VER_PACKAGE).BUILDTAGS=insecure -X $(CLI_PACKAGE).buildDate=$(BUILD_DATE) -X $(CLI_PACKAGE).gitCommit=$(GIT_REVISION)" ./cmd/drand
 
 build_all: drand
 

diff --git a/common/version.go b/common/version.go
@@ -3,6  3,7 @@ package common
 import (
 	"fmt"
 	"os"
 	"strings"
 
 	pbcommon "github.com/drand/drand/v2/protobuf/drand"
 )
@@ -13,7  14,7 @@ import (
 var version = Version{
 	Major:      2,
 	Minor:      0,
-	Patch:      1,
 	Patch:      2,
 	Prerelease: "",
 }
 
@@ -25,6  26,7 @@ var version = Version{
 var (
 	COMMIT    = ""
 	BUILDDATE = ""
 	BUILDTAGS = ""
 )
 
 func GetAppVersion() Version {
@@ -64,8  66,11 @@ func (v Version) ToProto() *pbcommon.NodeVersion {
 
 func (v Version) String() string {
 	pre := ""
 	if strings.Contains(BUILDTAGS, "insecure") {
 		pre  = "-insecure"
 	}
 	if v.Prerelease != "" {
-		pre = "-"
 		pre  = "-"
 	}
 	return fmt.Sprintf("%d.%d.%d%s%s", v.Major, v.Minor, v.Patch, pre, v.Prerelease)
 }
diff --git a/common/version_test.go b/common/version_test.go
@@ -182,3  182,64 @@ func TestVersionCompatible(tm *testing.T) {
 		})
 	}
 }
 
 func TestVersionBuildTags(t *testing.T) {
 	for _, tt := range []struct {
 		version    Version
 		expected   string
 		buildtags  string
 		shouldWork bool
 	}{
 		{
 			version123pre,
 			"1.2.3-pre",
 			"",
 			true,
 		},
 		{
 			version123pre,
 			"1.2.3-pre",
 			"conn_insecure",
 			false,
 		},
 		{
 			version123pre,
 			"1.2.3-insecure-pre",
 			"conn_insecure",
 			true,
 		},
 		{
 			version123,
 			"1.2.3-insecure",
 			"conn_insecure",
 			true,
 		},
 		{
 			version205,
 			"2.0.5",
 			"conn_insecure",
 			false,
 		},
 		{
 			version205,
 			"2.0.5-insecure",
 			"conn_insecure",
 			true,
 		},
 		{
 			version200pre,
 			"2.0.0-pre",
 			"verysecure",
 			true,
 		},
 	} {
 		BUILDTAGS = tt.buildtags
 		actual := tt.version.String()
 		if actual != tt.expected && tt.shouldWork {
 			t.Fatalf("Incorrect version string. Actual: %s, expected: %s", actual, tt.expected)
 		}
 		if actual == tt.expected && !tt.shouldWork {
 			t.Fatalf("Incorrect matching string. Actual: %s, expected: %s", actual, tt.expected)
 		}
 	}
 }