Peer CLI queryinstalled JSON output with flag

FAB-14932

Change-Id: Id2bedd4063c60744601087717c9d55180470d708
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: wlahti

integration/nwo/commands/peer.go

@@ -386,6 +386,7 @@ func (c ChaincodeQueryInstalled) SessionName() string {
 func (c ChaincodeQueryInstalled) Args() []string {
 	return []string{
 		"lifecycle", "chaincode", "queryinstalled",
+		"--output", "json",
 	}
 }
 

integration/nwo/deploy.go

@@ -18,6 +18,7 @@ import (
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/integration/nwo/commands"
 	"github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/peer/lifecycle"
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
@@ -166,10 +167,7 @@ func InstallChaincode(n *Network, chaincode Chaincode, peers ...*Peer) {
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
 
-		sess, err = n.PeerAdminSession(p, commands.ChaincodeQueryInstalled{})
-		Expect(err).NotTo(HaveOccurred())
-		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
-		Expect(sess).To(gbytes.Say(fmt.Sprintf("Package ID: %s, Label: %s", chaincode.PackageID, chaincode.Label)))
+		EnsureInstalled(n, chaincode.Label, chaincode.PackageID, p)
 	}
 }
 
@@ -375,6 +373,32 @@ func UpgradeChaincodeLegacy(n *Network, channel string, orderer *Orderer, chainc
 	EnsureInstantiatedLegacy(n, channel, chaincode.Name, chaincode.Version, peers...)
 }
 
+func EnsureInstalled(n *Network, label, packageID string, peers ...*Peer) {
+	for _, p := range peers {
+		Eventually(queryInstalled(n, p), n.EventuallyTimeout).Should(
+			ContainElement(&lifecycle.QueryInstalledChaincodesResult_InstalledChaincode{
+				Label:     label,
+				PackageId: packageID,
+			}))
+	}
+}
+
+type queryInstalledOutput struct {
+	InstalledChaincodes []*lifecycle.QueryInstalledChaincodesResult_InstalledChaincode `json:"installed_chaincodes"`
+}
+
+func queryInstalled(n *Network, peer *Peer) func() []*lifecycle.QueryInstalledChaincodesResult_InstalledChaincode {
+	return func() []*lifecycle.QueryInstalledChaincodesResult_InstalledChaincode {
+		sess, err := n.PeerAdminSession(peer, commands.ChaincodeQueryInstalled{})
+		Expect(err).NotTo(HaveOccurred())
+		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+		output := &queryInstalledOutput{}
+		err = json.Unmarshal(sess.Out.Contents(), output)
+		Expect(err).NotTo(HaveOccurred())
+		return output.InstalledChaincodes
+	}
+}
+
 type simulateCommitOutput struct {
 	Approved map[string]bool
 }

internal/peer/lifecycle/chaincode/querycommitted_test.go

@@ -85,6 +85,7 @@ var _ = Describe("QueryCommitted", func() {
 			BeforeEach(func() {
 				committedQuerier.Input.OutputFormat = "json"
 			})
+
 			It("queries committed chaincodes and writes the output as JSON", func() {
 				err := committedQuerier.Query()
 				Expect(err).NotTo(HaveOccurred())

internal/peer/lifecycle/chaincode/queryinstalled.go

@@ -9,6 +9,9 @@ package chaincode
 import (
 	"context"
 	"fmt"
+	"io"
+	"os"
+	"strings"
 
 	"github.com/golang/protobuf/proto"
 	cb "github.com/hyperledger/fabric/protos/common"
@@ -24,8 +27,14 @@ import (
 // the installed chaincodes
 type InstalledQuerier struct {
 	Command        *cobra.Command
+	Input          *InstalledQueryInput
 	EndorserClient EndorserClient
 	Signer         Signer
+	Writer         io.Writer
+}
+
+type InstalledQueryInput struct {
+	OutputFormat string
 }
 
 // QueryInstalledCmd returns the cobra command for listing
@@ -52,13 +61,19 @@ func QueryInstalledCmd(i *InstalledQuerier) *cobra.Command {
 					return err
 				}
 
+				iqInput := &InstalledQueryInput{
+					OutputFormat: output,
+				}
+
 				// queryinstalled only supports one peer connection,
 				// which is why we only wire in the first endorser
 				// client
 				i = &InstalledQuerier{
 					Command:        cmd,
 					EndorserClient: cc.EndorserClients[0],
+					Input:          iqInput,
 					Signer:         cc.Signer,
+					Writer:         os.Stdout,
 				}
 			}
 			return i.Query()
@@ -69,6 +84,7 @@ func QueryInstalledCmd(i *InstalledQuerier) *cobra.Command {
 		"peerAddresses",
 		"tlsRootCertFiles",
 		"connectionProfile",
+		"output",
 	}
 	attachFlags(chaincodeQueryInstalledCmd, flagList)
 
@@ -109,6 +125,9 @@ func (i *InstalledQuerier) Query() error {
 		return errors.Errorf("query failed with status: %d - %s", proposalResponse.Response.Status, proposalResponse.Response.Message)
 	}
 
+	if strings.ToLower(i.Input.OutputFormat) == "json" {
+		return printResponseAsJSON(proposalResponse, &lb.QueryInstalledChaincodesResult{}, i.Writer)
+	}
 	return i.printResponse(proposalResponse)
 }
 
@@ -120,12 +139,11 @@ func (i *InstalledQuerier) printResponse(proposalResponse *pb.ProposalResponse)
 	if err != nil {
 		return errors.Wrap(err, "failed to unmarshal proposal response's response payload")
 	}
-	fmt.Println("Installed chaincodes on peer:")
+	fmt.Fprintln(i.Writer, "Installed chaincodes on peer:")
 	for _, chaincode := range qicr.InstalledChaincodes {
-		fmt.Printf("Package ID: %s, Label: %s\n", chaincode.PackageId, chaincode.Label)
+		fmt.Fprintf(i.Writer, "Package ID: %s, Label: %s\n", chaincode.PackageId, chaincode.Label)
 	}
 	return nil
-
 }
 
 func (i *InstalledQuerier) createProposal() (*pb.Proposal, error) {

internal/peer/lifecycle/chaincode/queryinstalled_test.go

@@ -7,6 +7,9 @@ SPDX-License-Identifier: Apache-2.0
 package chaincode_test
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/internal/peer/lifecycle/chaincode"
 	"github.com/hyperledger/fabric/internal/peer/lifecycle/chaincode/mock"
@@ -17,6 +20,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gbytes"
 )
 
 var _ = Describe("QueryInstalled", func() {
@@ -25,6 +29,7 @@ var _ = Describe("QueryInstalled", func() {
 			mockProposalResponse *pb.ProposalResponse
 			mockEndorserClient   *mock.EndorserClient
 			mockSigner           *mock.Signer
+			input                *chaincode.InstalledQueryInput
 			installedQuerier     *chaincode.InstalledQuerier
 		)
 
@@ -49,16 +54,43 @@ var _ = Describe("QueryInstalled", func() {
 			mockEndorserClient.ProcessProposalReturns(mockProposalResponse, nil)
 
 			mockSigner = &mock.Signer{}
+			buffer := gbytes.NewBuffer()
+			input = &chaincode.InstalledQueryInput{}
 
 			installedQuerier = &chaincode.InstalledQuerier{
+				Input:          input,
 				EndorserClient: mockEndorserClient,
 				Signer:         mockSigner,
+				Writer:         buffer,
 			}
 		})
 
-		It("queries installed chaincodes", func() {
+		It("queries installed chaincodes and writes the output as human readable plain-text", func() {
 			err := installedQuerier.Query()
 			Expect(err).NotTo(HaveOccurred())
+			Eventually(installedQuerier.Writer).Should(gbytes.Say("Installed chaincodes on peer:"))
+			Eventually(installedQuerier.Writer).Should(gbytes.Say("Package ID: packageid1, Label: label1"))
+		})
+
+		Context("when JSON-formatted output is requested", func() {
+			BeforeEach(func() {
+				installedQuerier.Input.OutputFormat = "json"
+			})
+
+			It("queries installed chaincodes and writes the output as JSON", func() {
+				err := installedQuerier.Query()
+				Expect(err).NotTo(HaveOccurred())
+				expectedOutput := &lb.QueryInstalledChaincodesResult{
+					InstalledChaincodes: []*lb.QueryInstalledChaincodesResult_InstalledChaincode{
+						{
+							PackageId: "packageid1",
+							Label:     "label1",
+						},
+					},
+				}
+				json, err := json.MarshalIndent(expectedOutput, "", "\t")
+				Eventually(installedQuerier.Writer).Should(gbytes.Say(fmt.Sprintf(`\Q%s\E`, string(json))))
+			})
 		})
 
 		Context("when the signer cannot be serialized", func() {