Skip to content

Commit

Permalink
Add cmd for listing cluster
Browse files Browse the repository at this point in the history
- Add cmd " tks cluster list (--long)"
- Set global variable: default contract_id, csp_id, service url
  • Loading branch information
Jaesang committed Mar 17, 2022
1 parent 8b9590b commit 3984483
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 60 deletions.
8 changes: 2 additions & 6 deletions cmd/cluster_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ import (
"google.golang.org/protobuf/encoding/protojson"
)

const (
address = "tks-cluster-lcm.taco-cat.xyz:9110"
)

// clusterCreateCmd represents the create command
var clusterCreateCmd = &cobra.Command{
Use: "create",
Expand All @@ -48,14 +44,14 @@ tks cluster create <CLUSTERNAME> --contract-id <CONTRACTID> --csp-id <CSPID>`,
os.Exit(1)
}
var conn *grpc.ClientConn
conn, err := grpc.Dial(address, grpc.WithInsecure())
conn, err := grpc.Dial(tksClusterLcmUrl, grpc.WithInsecure())
if err != nil {
log.Fatalf("did not connect: %s", err)
}
defer conn.Close()

client := pb.NewClusterLcmServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), 30 * time.Minute)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
defer cancel()
data := make([]pb.CreateClusterRequest, 1)
conf := &pb.ClusterConf{}
Expand Down
122 changes: 122 additions & 0 deletions cmd/cluster_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/*
Copyright © 2022 SK Telecom <https://github.com/openinfradev>
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 cmd

import (
"context"
"fmt"
"log"
"time"

"google.golang.org/grpc"

"github.com/jedib0t/go-pretty/table"
pb "github.com/openinfradev/tks-proto/tks_pb"
"github.com/spf13/cobra"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/timestamppb"
)

// clusterListCmd represents the list command
var clusterListCmd = &cobra.Command{
Use: "list",
Short: "Show list of clusters.",
Long: `Show list of clusters.
Example:
tks cluster list (--long)`,
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("list called")
var conn *grpc.ClientConn
conn, err := grpc.Dial(tksInfoUrl, grpc.WithInsecure())
if err != nil {
log.Fatalf("did not connect: %s", err)
}
defer conn.Close()

client := pb.NewClusterInfoServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
defer cancel()
data := pb.GetClustersRequest{}
data.ContractId = defaultContractId

m := protojson.MarshalOptions{
Indent: " ",
UseProtoNames: true,
}
jsonBytes, _ := m.Marshal(&data)
verbose, err := rootCmd.PersistentFlags().GetBool("verbose")
long, err := cmd.Flags().GetBool("long")
if verbose {
fmt.Println("Proto Json data...")
fmt.Println(string(jsonBytes))
}
r, err := client.GetClusters(ctx, &data)
if err != nil {
fmt.Println(err)
} else {
printClusters(r, long)
}
},
}

func init() {
clusterCmd.AddCommand(clusterListCmd)

// Here you will define your flags and configuration settings.

// Cobra supports Persistent Flags which will work for this command
// and all subcommands, e.g.:
// clusterListCmd.PersistentFlags().String("foo", "", "A help for foo")

// Cobra supports local flags which will only run when this command
// is called directly, e.g.:
clusterListCmd.Flags().BoolP("long", "l", false, "Print detail information")
}

func printClusters(r *pb.GetClustersResponse, long bool) {
fmt.Println(r.Clusters[0].Name)
t := table.NewWriter()
tTemp := table.Table{}
tTemp.Render()
t.Style().Options.DrawBorder = false
t.Style().Options.SeparateColumns = false
t.Style().Options.SeparateFooter = false
t.Style().Options.SeparateHeader = false
t.Style().Options.SeparateRows = false
if long {
t.AppendHeader(table.Row{"Name", "ID", "Status", "CREATED_AT", "UPDATED_AT", "CSP_ID", "CONTRACT_ID"})
for _, s := range r.Clusters {
tCreatedAt := parseTime(s.CreatedAt)
tUpdatedAt := parseTime(s.UpdatedAt)
t.AppendRow(table.Row{s.Name, s.Id, s.Status, tCreatedAt, tUpdatedAt, s.CspId, s.ContractId})
}
} else {
t.AppendHeader(table.Row{"Name", "ID", "Status", "CREATED_AT", "UPDATED_AT"})
for _, s := range r.Clusters {
tCreatedAt := parseTime(s.CreatedAt)
tUpdatedAt := parseTime(s.UpdatedAt)
t.AppendRow(table.Row{s.Name, s.Id, s.Status, tCreatedAt, tUpdatedAt})
}
}
fmt.Println(t.Render())

}

func parseTime(t *timestamppb.Timestamp) string {

return t.AsTime().Format("2006-01-02 15:04:05")
}
24 changes: 24 additions & 0 deletions cmd/common.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
Copyright © 2021 SK Telecom <https://github.com/openinfradev>
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 cmd

const (
defaultContractId string = "f84df193-f6c8-45ad-867c-c0bcc48f09e5"
defaultCspId string = "c947d800-ac43-4bab-a8e1-4ceaa0ffec98"
tksInfoUrl = "tks-info.taco-cat.xyz:9110"
tksClusterLcmUrl = "tks-cluster-lcm.taco-cat.xyz:9110"
tksContractUrl = "tks-contract.taco-cat.xyz:9110"
)
51 changes: 0 additions & 51 deletions cmd/list.go

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
var serviceCmd = &cobra.Command{
Use: "service",
Short: "Operation for TACO Service",
Long: `Operation for TACO Service`,
Long: `Operation for TACO Service`,
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("service called")
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/service_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ tks service create --cluster-id <CLUSTERID> --service-name <LMA,SERVICE_MESH>`,
}

var conn *grpc.ClientConn
conn, err := grpc.Dial(address, grpc.WithInsecure())
conn, err := grpc.Dial(tksClusterLcmUrl, grpc.WithInsecure())
if err != nil {
log.Fatalf("did not connect: %s", err)
}
defer conn.Close()

client := pb.NewClusterLcmServiceClient(conn)
ctx, cancel := context.WithTimeout(context.Background(), 30 * time.Minute)
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
defer cancel()

ClusterId, _ := cmd.Flags().GetString("cluster-id")
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ module github.com/openinfradev/tks-client
go 1.16

require (
github.com/go-openapi/strfmt v0.21.2 // indirect
github.com/golang/mock v1.6.0
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/kr/text v0.2.0 // indirect
github.com/matryer/is v1.4.0
github.com/openinfradev/tks-contract v0.1.1-0.20210928021110-fe2b666327cc
Expand Down
Loading

0 comments on commit 3984483

Please sign in to comment.