[FAB-4413] Enable peer to report version info

The peer currently support a verion command
and flag but does not actually print
version info when starting.

This change improves the version info and
makes it consistent with the info now provided
by other binaries.

Change-Id: Ie030653fc1212401cf63b77a8212167f3919e26c
Signed-off-by: Gari Singh <[email protected]>

Author: mastersingh24

peer/main.go

@@ -62,7 +62,7 @@ var mainCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if versionFlag {
-			version.Print()
+			fmt.Print(version.GetInfo())
 		} else {
 			cmd.HelpFunc()(cmd, args)
 		}

peer/node/start.go

@@ -32,6 +32,7 @@ import (
 	"github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/peer/common"
 	peergossip "github.com/hyperledger/fabric/peer/gossip"
+	"github.com/hyperledger/fabric/peer/version"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -78,6 +79,7 @@ func initSysCCs() {
 }
 
 func serve(args []string) error {
+	logger.Infof("Starting %s", version.GetInfo())
 	ledgermgmt.Initialize()
 	// Parameter overrides must be processed before any parameters are
 	// cached. Failures to cache cause the server to terminate immediately.

peer/version/version.go

@@ -1,28 +1,22 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-		 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package version
 
 import (
 	"fmt"
+	"runtime"
 
 	"github.com/hyperledger/fabric/common/metadata"
 	"github.com/spf13/cobra"
 )
 
+// Program name
+const ProgramName = "peer"
+
 // Cmd returns the Cobra Command for Version
 func Cmd() *cobra.Command {
 	return cobraCommand
@@ -33,11 +27,25 @@ var cobraCommand = &cobra.Command{
 	Short: "Print fabric peer version.",
 	Long:  `Print current version of the fabric peer server.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		Print()
+		fmt.Print(GetInfo())
 	},
 }
 
-// Print outputs the current executable version to stdout
-func Print() {
-	fmt.Printf("Fabric peer server version %s\n", metadata.Version)
+// GetInfo returns version information for the peer
+func GetInfo() string {
+	if metadata.Version == "" {
+		metadata.Version = "development build"
+	}
+
+	ccinfo := fmt.Sprintf(" Base Image Version: %s\n"+
+		"  Base Docker Namespace: %s\n"+
+		"  Base Docker Label: %s\n"+
+		"  Docker Namepace: %s\n",
+		metadata.BaseVersion, metadata.BaseDockerNamespace,
+		metadata.BaseDockerLabel, metadata.DockerNamespace)
+
+	return fmt.Sprintf("%s:\n Version: %s\n Go version: %s\n OS/Arch: %s\n"+
+		" Chaincode:\n %s\n",
+		ProgramName, metadata.Version, runtime.Version(),
+		fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), ccinfo)
 }