Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: get & list proposal #30

Merged
merged 1 commit into from
May 29, 2023
Merged

feat: get & list proposal #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmd/bc-cli/get/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@ limitations under the License.
package get

import (
"github.com/bestchains/bc-cli/pkg/federation"
"os"

"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"

"github.com/bestchains/bc-cli/pkg/account"
"github.com/bestchains/bc-cli/pkg/common"
"github.com/bestchains/bc-cli/pkg/connProfile"
"github.com/bestchains/bc-cli/pkg/depository"
"github.com/bestchains/bc-cli/pkg/federation"
"github.com/bestchains/bc-cli/pkg/org"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"github.com/bestchains/bc-cli/pkg/proposal"
)

func NewGetCmd() *cobra.Command {
Expand All @@ -42,7 +44,7 @@ func NewGetCmd() *cobra.Command {
//cmd.AddCommand(chaincodebuild.NewCCBGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
//cmd.AddCommand(channel.NewChanGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
//cmd.AddCommand(vote.NewVoteGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
//cmd.AddCommand(proposal.NewProposalGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
cmd.AddCommand(proposal.NewProposalGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
//cmd.AddCommand(policy.NewPolicyGetCmd(common.Options{IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}}))
return cmd
}
16 changes: 16 additions & 0 deletions pkg/common/ibp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)

Expand All @@ -37,6 +39,8 @@ const (
UserResource = "users"
Channel = "channels"
Configmap = "configmaps"
Proposal = "proposals"
Vote = "votes"
)

func InKubeGetter() (*clientcmdapi.Config, error) {
Expand Down Expand Up @@ -85,6 +89,18 @@ func InKubeGetter() (*clientcmdapi.Config, error) {
}, nil
}

func GetDynamicClient() (dynamic.Interface, error) {
dayuy marked this conversation as resolved.
Show resolved Hide resolved
cfg, err := clientcmd.BuildConfigFromKubeconfigGetter("", InKubeGetter)
if err != nil {
return nil, err
}
cli, err := dynamic.NewForConfig(cfg)
if err != nil {
return nil, err
}
return cli, nil
}

func ListToObj(list corev1.List) (runtime.Object, error) {
var obj runtime.Object
listJSON, err := json.Marshal(list)
Expand Down
22 changes: 5 additions & 17 deletions pkg/connProfile/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,12 @@ import (
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/clientcmd"

"github.com/bestchains/bc-cli/pkg/common"
"github.com/bestchains/bc-cli/pkg/utils"
)

func getNestedString(obj map[string]interface{}, fields ...string) string {
val, _, _ := unstructured.NestedString(obj, fields...)
return val
}

func NewGetConnProfileCmd(option common.Options) *cobra.Command {
var (
channel string
Expand Down Expand Up @@ -71,12 +64,7 @@ func NewGetConnProfileCmd(option common.Options) *cobra.Command {
}
},
Run: func(cmd *cobra.Command, args []string) {
cfg, err := clientcmd.BuildConfigFromKubeconfigGetter("", common.InKubeGetter)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
cli, err := dynamic.NewForConfig(cfg)
cli, err := common.GetDynamicClient()
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
Expand All @@ -87,15 +75,15 @@ func NewGetConnProfileCmd(option common.Options) *cobra.Command {
fmt.Fprintln(option.ErrOut, err)
return
}
network = getNestedString(channelDetail.Object, "spec", "network")
id = getNestedString(channelDetail.Object, "spec", "id")
network = utils.GetNestedString(channelDetail.Object, "spec", "network")
id = utils.GetNestedString(channelDetail.Object, "spec", "id")
configmapName := fmt.Sprintf("chan-%s-connection-profile", channel)
configmapDetail, err := cli.Resource(schema.GroupVersionResource{Version: common.CoreVersion, Resource: common.Configmap}).Namespace(organization).Get(context.TODO(), configmapName, v1.GetOptions{})
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
profileJson := getNestedString(configmapDetail.Object, "binaryData", "profile.json")
profileJson := utils.GetNestedString(configmapDetail.Object, "binaryData", "profile.json")
rawProfileJson, err := base64.StdEncoding.DecodeString(profileJson)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
Expand Down
11 changes: 1 addition & 10 deletions pkg/federation/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubectl/pkg/cmd/get"

"github.com/bestchains/bc-cli/pkg/common"
Expand All @@ -41,14 +39,7 @@ func NewFedGetCmd(option common.Options) *cobra.Command {
cmd := &cobra.Command{
Use: "fed [FED-NAME]... [-o json/yaml] [--with-org ORG-NAME]",
RunE: func(cmd *cobra.Command, args []string) error {

// get config from getter
cfg, err := clientcmd.BuildConfigFromKubeconfigGetter("", common.InKubeGetter)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return err
}
cli, err := dynamic.NewForConfig(cfg)
cli, err := common.GetDynamicClient()
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return err
Expand Down
29 changes: 17 additions & 12 deletions pkg/org/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"

"github.com/bestchains/bc-cli/pkg/common"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -30,9 +29,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubectl/pkg/cmd/get"
cmdutil "k8s.io/kubectl/pkg/cmd/util"

"github.com/bestchains/bc-cli/pkg/common"
)

func NewOrgGetCmd(option common.Options) *cobra.Command {
Expand All @@ -45,12 +45,7 @@ func NewOrgGetCmd(option common.Options) *cobra.Command {
cmd := &cobra.Command{
Use: "org [NAME]",
RunE: func(cmd *cobra.Command, args []string) error {
cfg, err := clientcmd.BuildConfigFromKubeconfigGetter("", common.InKubeGetter)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return err
}
cli, err := dynamic.NewForConfig(cfg)
cli, err := common.GetDynamicClient()
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return err
Expand All @@ -65,10 +60,7 @@ func NewOrgGetCmd(option common.Options) *cobra.Command {
}
var obj runtime.Object
if len(args) == 0 {
orgs, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.OrganizationResource}).List(context.TODO(), v1.ListOptions{
LabelSelector: labelSelector,
FieldSelector: fieldSelector,
})
orgs, err := ListOrganizations(cli, labelSelector, fieldSelector)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return err
Expand Down Expand Up @@ -119,3 +111,16 @@ func NewOrgGetCmd(option common.Options) *cobra.Command {

return cmd
}

// ListOrganizations returns a list of organizations filtered by labelSelector and fieldSelector.
// Return error if any error occurs
func ListOrganizations(cli dynamic.Interface, labelSelector string, fieldSelector string) (*unstructured.UnstructuredList, error) {
organizations, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.OrganizationResource}).List(context.TODO(), v1.ListOptions{
LabelSelector: labelSelector,
FieldSelector: fieldSelector,
})
if err != nil {
return nil, err
}
return organizations, nil
}
99 changes: 95 additions & 4 deletions pkg/proposal/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,107 @@ limitations under the License.
package proposal

import (
"github.com/bestchains/bc-cli/pkg/common"
"context"
"encoding/json"
"fmt"

"github.com/spf13/cobra"
"github.com/spf13/viper"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/cmd/get"

"github.com/bestchains/bc-cli/pkg/common"
"github.com/bestchains/bc-cli/pkg/org"
"github.com/bestchains/bc-cli/pkg/utils"
)

func NewProposalGetCmd(option common.Options) *cobra.Command {
defaultPrintFlag := get.NewGetPrintFlags()
cmd := &cobra.Command{
Use: "",
RunE: func(cmd *cobra.Command, args []string) error {
return nil
Use: "proposal [NAME]",
Run: func(cmd *cobra.Command, args []string) {
cli, err := common.GetDynamicClient()
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}

list := corev1.List{
TypeMeta: v1.TypeMeta{
Kind: "List",
APIVersion: "v1",
},
ListMeta: v1.ListMeta{},
}
var obj runtime.Object
if len(args) == 0 {
username := viper.GetString("auth.username")
organizations, err := org.ListOrganizations(cli, fmt.Sprintf("bestchains.organization.admin=%s", username), "")
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
var proposalNames []string
for _, org := range organizations.Items {
namespace := org.GetName()
votes, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.Vote}).Namespace(namespace).List(context.TODO(), v1.ListOptions{})
if err != nil {
fmt.Fprintln(option.ErrOut, err)
continue
}
for _, vote := range votes.Items {
proposalName := utils.GetNestedString(vote.Object, "spec", "proposalName")
proposalNames = append(proposalNames, proposalName)
}
}
for _, proposalName := range utils.RemoveDuplicateForStringSlice(proposalNames) {
proposal, err := cli.Resource(schema.GroupVersionResource{Group: common.IBPGroup, Version: common.IBPVersion, Resource: common.Proposal}).Get(context.TODO(), proposalName, v1.GetOptions{})
if err != nil {
fmt.Fprintln(option.ErrOut, err)
continue
}
list.Items = append(list.Items, runtime.RawExtension{Object: proposal})
}
} else {
for _, arg := range 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)
continue
}
list.Items = append(list.Items, runtime.RawExtension{Object: proposal})
}
}

if len(list.Items) != 1 {
listData, err := json.Marshal(list)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
converted, err := runtime.Decode(unstructured.UnstructuredJSONScheme, listData)
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
obj = converted
} else {
obj = list.Items[0].Object
}

p, err := defaultPrintFlag.ToPrinter()
if err != nil {
fmt.Fprintln(option.ErrOut, err)
return
}
_ = p.PrintObj(obj, option.Out)
},
}
defaultPrintFlag.AddFlags(cmd)

return cmd
}
39 changes: 39 additions & 0 deletions pkg/utils/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
Copyright 2023 The Bestchains Authors.

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.
*/

package utils

import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

// GetNestedString returns the string value of a nested field.
// Returns "" if value is not found or not a string.
func GetNestedString(obj map[string]interface{}, fields ...string) string {
bjwswang marked this conversation as resolved.
Show resolved Hide resolved
val, _, _ := unstructured.NestedString(obj, fields...)
return val
}

// RemoveDuplicateForStringSlice returns a new slice with duplicate elements removed.
func RemoveDuplicateForStringSlice(elements []string) []string {
result := make([]string, 0, len(elements))
temp := map[string]struct{}{}
for _, element := range elements {
if _, ok := temp[element]; !ok && element != "" {
temp[element] = struct{}{}
result = append(result, element)
}
}
return result
}
Loading