Consistently use metadata package and variables

Initialize command specific version and commit variables to the ones
from common/metadata and simplify the build process to consistently set
the same variables for all binaries.

FAB-16621 #done

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Change-Id: I9dc9aa7bb7aaf762ec618641dd5a2f0480f83268

Author: sykesm

Makefile

@@ -69,7 +69,6 @@ MARCH=$(shell go env GOOS)-$(shell go env GOARCH)
 # defined in common/metadata/metadata.go
 METADATA_VAR = Version=$(BASE_VERSION)
 METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
-METADATA_VAR += BaseVersion=$(BASEIMAGE_RELEASE)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 METADATA_VAR += BaseDockerNamespace=$(BASE_DOCKER_NS)
@@ -199,9 +198,7 @@ native: $(RELEASE_EXES)
 .PHONY: $(RELEASE_EXES)
 $(RELEASE_EXES): %: $(BUILD_DIR)/bin/%
 
-$(BUILD_DIR)/bin/%: GO_LDFLAGS = -X $(pkgmap.$(@F))/metadata.CommitSHA=$(EXTRA_VERSION)
-$(BUILD_DIR)/bin/peer: GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
-$(BUILD_DIR)/bin/orderer: GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
+$(BUILD_DIR)/bin/%: GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
 $(BUILD_DIR)/bin/%:
 	@echo "Building $@"
 	@mkdir -p $(@D)
@@ -238,12 +235,9 @@ release: check-go-version $(MARCH:%=release/%)
 release-all: check-go-version $(RELEASE_PLATFORMS:%=release/%)
 
 .PHONY: $(RELEASE_PLATFORMS:%=release/%)
+$(RELEASE_PLATFORMS:%=release/%): GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
 $(RELEASE_PLATFORMS:%=release/%): release/%: $(foreach exe,$(RELEASE_EXES),release/%/bin/$(exe))
 
-release/%: GO_LDFLAGS = -X $(pkgmap.$(@F))/metadata.CommitSHA=$(EXTRA_VERSION)
-release/%/bin/orderer: GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
-release/%/bin/peer: GO_LDFLAGS = $(METADATA_VAR:%=-X $(PKGNAME)/common/metadata.%)
-
 # explicit targets for all platform executables
 $(foreach platform, $(RELEASE_PLATFORMS), $(RELEASE_EXES:%=release/$(platform)/bin/%)):
 	$(eval platform = $(patsubst release/%/bin,%,$(@D)))

common/tools/idemixgen/metadata/metadata.go

@@ -9,21 +9,18 @@ package metadata
 import (
 	"fmt"
 	"runtime"
-)
-
-// Package version
-const Version = "2.0.0"
 
-var CommitSHA string
+	"github.com/hyperledger/fabric/common/metadata"
+)
 
-// Program name
 const ProgramName = "idemixgen"
 
-func GetVersionInfo() string {
-	if CommitSHA == "" {
-		CommitSHA = "development build"
-	}
+var (
+	CommitSHA = metadata.CommitSHA
+	Version   = metadata.Version
+)
 
+func GetVersionInfo() string {
 	return fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s",
 		ProgramName, Version, CommitSHA, runtime.Version(),
 		fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))

internal/configtxgen/metadata/metadata.go

@@ -9,21 +9,18 @@ package metadata
 import (
 	"fmt"
 	"runtime"
-)
-
-// Package version
-const Version = "2.0.0"
 
-var CommitSHA string
+	"github.com/hyperledger/fabric/common/metadata"
+)
 
-// Program name
 const ProgramName = "configtxgen"
 
-func GetVersionInfo() string {
-	if CommitSHA == "" {
-		CommitSHA = "development build"
-	}
+var (
+	CommitSHA = metadata.CommitSHA
+	Version   = metadata.Version
+)
 
+func GetVersionInfo() string {
 	return fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s",
 		ProgramName, Version, CommitSHA, runtime.Version(),
 		fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))

internal/configtxgen/metadata/metadata_test.go

@@ -20,9 +20,6 @@ func TestGetVersionInfo(t *testing.T) {
 
 	for _, sha := range testSHAs {
 		metadata.CommitSHA = sha
-		if sha == "" {
-			sha = "development build"
-		}
 
 		expected := fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s",
 			metadata.ProgramName, metadata.Version, sha, runtime.Version(),

internal/configtxlator/metadata/metadata.go

@@ -9,25 +9,18 @@ package metadata
 import (
 	"fmt"
 	"runtime"
-)
-
-// package-scoped variables
-
-// Package version
-const Version = "2.0.0"
-
-var CommitSHA string
 
-// package-scoped constants
+	"github.com/hyperledger/fabric/internal/cryptogen/metadata"
+)
 
-// Program name
 const ProgramName = "configtxlator"
 
-func GetVersionInfo() string {
-	if CommitSHA == "" {
-		CommitSHA = "development build"
-	}
+var (
+	CommitSHA = metadata.CommitSHA
+	Version   = metadata.Version
+)
 
+func GetVersionInfo() string {
 	return fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s",
 		ProgramName, Version, CommitSHA, runtime.Version(),
 		fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))

internal/cryptogen/metadata/metadata.go

@@ -9,25 +9,18 @@ package metadata
 import (
 	"fmt"
 	"runtime"
-)
-
-// package-scoped variables
-
-// Package version
-const Version = "2.0.0"
-
-var CommitSHA string
 
-// package-scoped constants
+	"github.com/hyperledger/fabric/common/metadata"
+)
 
-// Program name
 const ProgramName = "cryptogen"
 
-func GetVersionInfo() string {
-	if CommitSHA == "" {
-		CommitSHA = "development build"
-	}
+var (
+	CommitSHA = metadata.CommitSHA
+	Version   = metadata.Version
+)
 
+func GetVersionInfo() string {
 	return fmt.Sprintf(
 		"%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s",
 		ProgramName,

orderer/common/metadata/metadata.go

@@ -10,25 +10,19 @@ import (
 	"fmt"
 	"runtime"
 
-	common "github.com/hyperledger/fabric/common/metadata"
+	"github.com/hyperledger/fabric/common/metadata"
 )
 
-// package-scoped variables
-
-// Package version
-var Version string = common.Version
-
-// package-scoped constants
-
-// Program name
 const ProgramName = "orderer"
 
+var Version = metadata.Version
+
 func GetVersionInfo() string {
 	return fmt.Sprintf(
 		"%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s\n",
 		ProgramName,
 		Version,
-		common.CommitSHA,
+		metadata.CommitSHA,
 		runtime.Version(),
 		fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
 	)