Merge pull request #54 from dayuy/fix-2

chaincode and chaincodebuild args de-duplication
bestchains · Jul 3, 2023 · cc906dc · cc906dc
2 parents 14b9a0f + f606cd7
commit cc906dc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pkg/chaincode/get.go b/pkg/chaincode/get.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/kubectl/pkg/cmd/get"
 
 	"github.com/bestchains/bc-cli/pkg/common"
+	"github.com/bestchains/bc-cli/pkg/utils"
 )
 
 func NewCCGetCmd(option common.Options) *cobra.Command {
@@ -88,7 +89,7 @@ func NewCCGetCmd(option common.Options) *cobra.Command {
 					list.Items = append(list.Items, runtime.RawExtension{Object: &chaincodes.Items[i]})
 				}
 			} else {
-				for _, arg := range args {
+				for _, arg := range utils.RemoveDuplicateForStringSlice(args) {
 					chaincode, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.Chaincode}).Get(context.TODO(), arg, v1.GetOptions{})
 					if err != nil {
 						fmt.Fprintln(option.ErrOut, err)

diff --git a/pkg/chaincodebuild/get.go b/pkg/chaincodebuild/get.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/kubectl/pkg/cmd/get"
 
 	"github.com/bestchains/bc-cli/pkg/common"
+	"github.com/bestchains/bc-cli/pkg/utils"
 )
 
 func NewCCBGetCmd(option common.Options) *cobra.Command {
@@ -90,7 +91,7 @@ func NewCCBGetCmd(option common.Options) *cobra.Command {
 					list.Items = append(list.Items, runtime.RawExtension{Object: &chaincodeBuilds.Items[i]})
 				}
 			} else {
-				for _, arg := range args {
+				for _, arg := range utils.RemoveDuplicateForStringSlice(args) {
 					chaincodeBuild, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.ChaincodeBuild}).Get(context.TODO(), arg, v1.GetOptions{})
 					if err != nil {
 						fmt.Fprintln(option.ErrOut, err)

diff --git a/pkg/network/get.go b/pkg/network/get.go
@@ -65,7 +65,7 @@ func NewNetworkGetCmd(option common.Options) *cobra.Command {
 					list.Items = append(list.Items, runtime.RawExtension{Object: &networks.Items[i]})
 				}
 			} else {
-				for _, arg := range args {
+				for _, arg := range utils.RemoveDuplicateForStringSlice(args) {
 					network, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.Network}).Get(context.TODO(), arg, v1.GetOptions{})
 					if err != nil {
 						fmt.Fprintln(option.ErrOut, err)

diff --git a/pkg/proposal/get.go b/pkg/proposal/get.go
@@ -84,7 +84,7 @@ func NewProposalGetCmd(option common.Options) *cobra.Command {
 					list.Items = append(list.Items, runtime.RawExtension{Object: proposal})
 				}
 			} else {
-				for _, arg := range args {
+				for _, arg := range utils.RemoveDuplicateForStringSlice(args) {
 					proposal, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.Proposal}).Get(context.TODO(), arg, v1.GetOptions{})
 					if err != nil {
 						fmt.Fprintln(option.ErrOut, err)