From 576176fbc2e545a20b34cbe53d2239edb7b6f789 Mon Sep 17 00:00:00 2001 From: flowerinthenight Date: Mon, 24 Jul 2023 19:51:34 +0900 Subject: [PATCH] chore: fix build --- cmds/awspayer.go | 4 +- cmds/awsxacct.go | 9 ---- cmds/cost/aws/calculations/calculations.go | 60 ++++++++++++++-------- go.mod | 2 +- go.sum | 4 +- pkg/ops/wait.go | 6 +-- 6 files changed, 46 insertions(+), 39 deletions(-) diff --git a/cmds/awspayer.go b/cmds/awspayer.go index 997367a..e98af82 100644 --- a/cmds/awspayer.go +++ b/cmds/awspayer.go @@ -11,8 +11,8 @@ import ( "syscall" "time" - "github.com/alphauslabs/blue-sdk-go/api" "github.com/alphauslabs/blue-sdk-go/cost/v1" + "github.com/alphauslabs/blue-sdk-go/protos" "github.com/alphauslabs/bluectl/params" "github.com/alphauslabs/bluectl/pkg/grpcconn" "github.com/alphauslabs/bluectl/pkg/logger" @@ -457,7 +457,7 @@ func ImportCursCmd() *cobra.Command { } defer client.Close() - var resp *api.Operation + var resp *protos.Operation switch { case rawInput != "": diff --git a/cmds/awsxacct.go b/cmds/awsxacct.go index 1456915..4d39839 100644 --- a/cmds/awsxacct.go +++ b/cmds/awsxacct.go @@ -11,14 +11,11 @@ import ( "syscall" "github.com/alphauslabs/blue-sdk-go/admin/v1" - "github.com/alphauslabs/blue-sdk-go/api" "github.com/alphauslabs/bluectl/params" "github.com/alphauslabs/bluectl/pkg/grpcconn" "github.com/alphauslabs/bluectl/pkg/logger" "github.com/alphauslabs/bluectl/pkg/ops" "github.com/spf13/cobra" - "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/types/known/anypb" ) func CreateDefaultCostAccessInfo() *cobra.Command { @@ -351,12 +348,6 @@ update to the CloudFormation template.`, if op != nil { if op.Done { - if v, ok := op.Result.(*api.Operation_Response); ok { - var r api.KeyValue - anypb.UnmarshalTo(v.Response, &r, proto.UnmarshalOptions{}) - logger.Infof("%v=%v", r.Key, r.Value) - } - done <- struct{}{} return } diff --git a/cmds/cost/aws/calculations/calculations.go b/cmds/cost/aws/calculations/calculations.go index 7ff4d1f..c4fc28d 100644 --- a/cmds/cost/aws/calculations/calculations.go +++ b/cmds/cost/aws/calculations/calculations.go @@ -15,6 +15,7 @@ import ( "github.com/alphauslabs/blue-sdk-go/api" "github.com/alphauslabs/blue-sdk-go/billing/v1" "github.com/alphauslabs/blue-sdk-go/cost/v1" + "github.com/alphauslabs/blue-sdk-go/protos" "github.com/alphauslabs/bluectl/cmds/cost/aws/calculations/schedule" "github.com/alphauslabs/bluectl/params" "github.com/alphauslabs/bluectl/pkg/grpcconn" @@ -25,6 +26,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" + "google.golang.org/protobuf/types/known/structpb" ) func RunCmd() *cobra.Command { @@ -64,7 +66,7 @@ func RunCmd() *cobra.Command { } defer client.Close() - var resp *api.Operation + var resp *protos.Operation switch { case rawInput != "": @@ -316,6 +318,16 @@ func ListHistoryCmd() *cobra.Command { rawInput string ) + // Same copy in backend + type CalculateCostsMeta struct { + OrgId string `json:"orgId"` + Month string `json:"month"` + Status string `json:"status"` + GroupIds []string `json:"groupIds"` + Created string `json:"created"` + Updated string `json:"updated"` + } + cmd := &cobra.Command{ Use: "list-history", Short: "Query AWS calculation history", @@ -418,29 +430,30 @@ func ListHistoryCmd() *cobra.Command { } for _, op := range resp.Aws.Operations { - var meta api.OperationAwsCalculateCostsMetadataV1 - anypb.UnmarshalTo(op.Metadata, &meta, proto.UnmarshalOptions{}) + var sm structpb.Struct + op.Metadata.UnmarshalTo(&sm) + meta := sm.AsMap() var result string switch op.Result.(type) { - case *api.Operation_Response: - var res api.KeyValue - tres := op.Result.(*api.Operation_Response) - anypb.UnmarshalTo(tres.Response, &res, proto.UnmarshalOptions{}) - result = fmt.Sprintf("%v", res.Value) - case *api.Operation_Error: - terr := op.Result.(*api.Operation_Error) + case *protos.Operation_Response: + result = "success" + case *protos.Operation_Error: + terr := op.Result.(*protos.Operation_Error) result = terr.Error.String() } switch { case params.OutFmt == "csv" && params.OutFile != "": + b, _ := json.Marshal(meta) + var cm CalculateCostsMeta + json.Unmarshal(b, &cm) wf.Write([]string{ op.Name, - meta.Month, - strings.Join(meta.GroupIds, ","), - meta.Updated, - meta.Created, - meta.Status, + cm.Month, + strings.Join(cm.GroupIds, ","), + cm.Updated, + cm.Created, + cm.Status, fmt.Sprintf("%v", op.Done), result, }) @@ -456,9 +469,9 @@ func ListHistoryCmd() *cobra.Command { // Make result more readable. switch op.Result.(type) { - case *api.Operation_Response: + case *protos.Operation_Response: var res api.KeyValue - tres := op.Result.(*api.Operation_Response) + tres := op.Result.(*protos.Operation_Response) anypb.UnmarshalTo(tres.Response, &res, proto.UnmarshalOptions{}) v := m["Result"] vv := v.(map[string]interface{}) @@ -470,13 +483,16 @@ func ListHistoryCmd() *cobra.Command { fmt.Println(string(b)) default: render = true + b, _ := json.Marshal(meta) + var cm CalculateCostsMeta + json.Unmarshal(b, &cm) table.Append([]string{ op.Name, - meta.Month, - strings.Join(meta.GroupIds, ","), - meta.Updated, - meta.Created, - meta.Status, + cm.Month, + strings.Join(cm.GroupIds, ","), + cm.Updated, + cm.Created, + cm.Status, fmt.Sprintf("%v", op.Done), result, }) diff --git a/go.mod b/go.mod index 6cd8e1f..4abe67c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/alphauslabs/bluectl go 1.17 require ( - github.com/alphauslabs/blue-sdk-go v0.67.0 + github.com/alphauslabs/blue-sdk-go v0.67.6 github.com/fatih/color v1.15.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect diff --git a/go.sum b/go.sum index 3b44e3b..9ad0820 100644 --- a/go.sum +++ b/go.sum @@ -170,8 +170,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alphauslabs/blue-sdk-go v0.67.0 h1:OjBwZ/WH1QVgNIusy0qIT1PL5VAqhxAQbHwhGj55VzA= -github.com/alphauslabs/blue-sdk-go v0.67.0/go.mod h1:2Bh9gaCcV+dGNKZF9LWwlMbkt46V3qxmTNqrd4c7mf4= +github.com/alphauslabs/blue-sdk-go v0.67.6 h1:6X7M9cNgFgLNR3e0Y0+stVG6BLeKS3FnuyMMZpGI/PU= +github.com/alphauslabs/blue-sdk-go v0.67.6/go.mod h1:2Bh9gaCcV+dGNKZF9LWwlMbkt46V3qxmTNqrd4c7mf4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/pkg/ops/wait.go b/pkg/ops/wait.go index a9723ee..092f765 100644 --- a/pkg/ops/wait.go +++ b/pkg/ops/wait.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/alphauslabs/blue-sdk-go/api" "github.com/alphauslabs/blue-sdk-go/operations/v1" + "github.com/alphauslabs/blue-sdk-go/protos" "github.com/alphauslabs/bluectl/pkg/grpcconn" "google.golang.org/protobuf/types/known/durationpb" ) @@ -16,7 +16,7 @@ type WaitForOperationInput struct { Client *operations.GrpcClient // optional } -func WaitForOperation(ctx context.Context, in WaitForOperationInput) (*api.Operation, error) { +func WaitForOperation(ctx context.Context, in WaitForOperationInput) (*protos.Operation, error) { if in.Name == "" { return nil, fmt.Errorf("in.Name cannot be empty") } @@ -43,7 +43,7 @@ func WaitForOperation(ctx context.Context, in WaitForOperationInput) (*api.Opera } type data struct { - op *api.Operation + op *protos.Operation err error }