CLI: print treeID/branchID for eventsV2 branchToken in admin wf desc …

…command (uber#1354)

* Decode branchToken in adm desc

* bump cli version

* fix unit test

tools/cli/adminCommands.go

@@ -23,11 +23,13 @@ package cli
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/gocql/gocql"
 	"github.com/uber-common/bark"
 	"github.com/uber/cadence/.gen/go/admin"
 	"github.com/uber/cadence/.gen/go/shared"
 	"github.com/uber/cadence/common"
+	"github.com/uber/cadence/common/codec"
 	"github.com/uber/cadence/common/persistence"
 	cassp "github.com/uber/cadence/common/persistence/cassandra"
 	"github.com/uber/cadence/tools/cassandra"
@@ -130,6 +132,24 @@ func AdminDescribeWorkflow(c *cli.Context) {
 	}
 
 	prettyPrintJSONObject(resp)
+
+	if resp != nil {
+		msStr := resp.GetMutableStateInDatabase()
+		ms := persistence.WorkflowMutableState{}
+		err = json.Unmarshal([]byte(msStr), &ms)
+		if err != nil {
+			ErrorAndExit("json.Unmarshal err", err)
+		}
+		if ms.ExecutionInfo != nil && ms.ExecutionInfo.EventStoreVersion == persistence.EventStoreVersionV2 {
+			branchInfo := shared.HistoryBranch{}
+			thriftrwEncoder := codec.NewThriftRWEncoder()
+			err := thriftrwEncoder.Decode(ms.ExecutionInfo.BranchToken, &branchInfo)
+			if err != nil {
+				ErrorAndExit("thriftrwEncoder.Decode err", err)
+			}
+			prettyPrintJSONObject(branchInfo)
+		}
+	}
 }
 
 // AdminDeleteWorkflow describe a new workflow execution for admin

tools/cli/app.go

@@ -25,7 +25,7 @@ import "github.com/urfave/cli"
 const (
 	// Version is the controlled version string. It should be updated every time
 	// before we release a new version.
-	Version = "0.5.6"
+	Version = "0.5.7"
 )
 
 // NewCliApp instantiates a new instance of the CLI application.

tools/cli/app_test.go

@@ -21,6 +21,10 @@
 package cli
 
 import (
+	"strings"
+	"testing"
+	"time"
+
 	"github.com/golang/mock/gomock"
 	"github.com/olekukonko/tablewriter"
 	"github.com/pborman/uuid"
@@ -36,9 +40,6 @@ import (
 	clientFrontend "go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
 	clientFrontendTest "go.uber.org/cadence/.gen/go/cadence/workflowservicetest"
 	"go.uber.org/cadence/.gen/go/shared"
-	"strings"
-	"testing"
-	"time"
 )
 
 type cliAppSuite struct {
@@ -476,8 +477,9 @@ var describeTaskListResponse = &shared.DescribeTaskListResponse{
 
 func (s *cliAppSuite) TestAdminDescribeWorkflow() {
 	resp := &admin.DescribeWorkflowExecutionResponse{
-		ShardId:     common.StringPtr("test-shard-id"),
-		HistoryAddr: common.StringPtr("ip:port"),
+		ShardId:                common.StringPtr("test-shard-id"),
+		HistoryAddr:            common.StringPtr("ip:port"),
+		MutableStateInDatabase: common.StringPtr("{}"),
 	}
 
 	s.serverAdminClient.EXPECT().DescribeWorkflowExecution(gomock.Any(), gomock.Any()).Return(resp, nil)