Skip to content

Commit 8136318

Browse files
jmsktmjmsktm
committed
updates to use new swagger changes etc.
1 parent 038d459 commit 8136318

File tree

11 files changed

+74
-50
lines changed

11 files changed

+74
-50
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
/dist/
2+
.idea/
3+
signadot

‎go.mod‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ go 1.19
44

55
require (
66
github.com/docker/go-units v0.4.0
7-
github.com/go-openapi/runtime v0.24.2
7+
github.com/go-openapi/runtime v0.25.0
88
github.com/go-openapi/strfmt v0.21.3
9-
github.com/signadot/go-sdk v0.3.5
109
github.com/spf13/cobra v1.4.0
1110
github.com/spf13/viper v1.11.0
1211
github.com/theckman/yacspin v0.13.12
@@ -18,6 +17,8 @@ require (
1817
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
1918
github.com/fatih/color v1.13.0 // indirect
2019
github.com/fsnotify/fsnotify v1.5.1 // indirect
20+
github.com/go-logr/logr v1.2.3 // indirect
21+
github.com/go-logr/stdr v1.2.2 // indirect
2122
github.com/go-openapi/analysis v0.21.4 // indirect
2223
github.com/go-openapi/errors v0.20.3 // indirect
2324
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -40,13 +41,16 @@ require (
4041
github.com/pelletier/go-toml v1.9.4 // indirect
4142
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
4243
github.com/rivo/uniseg v0.2.0 // indirect
44+
github.com/signadot/go-sdk v0.3.6-0.20221222231127-f05294d52d06 // indirect
4345
github.com/spf13/afero v1.8.2 // indirect
4446
github.com/spf13/cast v1.4.1 // indirect
4547
github.com/spf13/jwalterweatherman v1.1.0 // indirect
4648
github.com/spf13/pflag v1.0.5 // indirect
4749
github.com/subosito/gotenv v1.2.0 // indirect
48-
go.mongodb.org/mongo-driver v1.11.0 // indirect
49-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
50+
go.mongodb.org/mongo-driver v1.11.1 // indirect
51+
go.opentelemetry.io/otel v1.11.2 // indirect
52+
go.opentelemetry.io/otel/trace v1.11.2 // indirect
53+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
5054
golang.org/x/text v0.3.7 // indirect
5155
gopkg.in/ini.v1 v1.66.4 // indirect
5256
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5
7171
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
7272
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
7373
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
74+
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
75+
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
76+
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
77+
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
78+
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
7479
github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
7580
github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
7681
github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
@@ -90,6 +95,8 @@ github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8en
9095
github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
9196
github.com/go-openapi/runtime v0.24.2 h1:yX9HMGQbz32M87ECaAhGpJjBmErO3QLcgdZj9BzGx7c=
9297
github.com/go-openapi/runtime v0.24.2/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk=
98+
github.com/go-openapi/runtime v0.25.0 h1:7yQTCdRbWhX8vnIjdzU8S00tBYf7Sg71EBeorlPHvhc=
99+
github.com/go-openapi/runtime v0.25.0/go.mod h1:Ux6fikcHXyyob6LNWxtE96hWwjBPYF0DXgVFuMTneOs=
93100
github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
94101
github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
95102
github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI=
@@ -265,6 +272,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
265272
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
266273
github.com/signadot/go-sdk v0.3.5 h1:s5+8zXfqHa0diK0AYVUaCKv2o2tVY9JCdDp2TTu7p6Y=
267274
github.com/signadot/go-sdk v0.3.5/go.mod h1:Oil8cvz7uZLsKPqW8sR+0I0ee6nGzJ3eh3UYTO9fcpo=
275+
github.com/signadot/go-sdk v0.3.6-0.20221221230649-caa25fa2b4a3 h1:X8F4NeUCMFzilLPLmlLSlc+MF8IEj3DdA6SiroU2/fI=
276+
github.com/signadot/go-sdk v0.3.6-0.20221221230649-caa25fa2b4a3/go.mod h1:A2P0qel78mkQdlPzENC0N9ihDeqIEOjHdFfHdLT14SQ=
277+
github.com/signadot/go-sdk v0.3.6-0.20221222231127-f05294d52d06 h1:deENzPwGQik07OzND38qAvOgZWhIQcP2Lbz4l6ExHkw=
278+
github.com/signadot/go-sdk v0.3.6-0.20221222231127-f05294d52d06/go.mod h1:A2P0qel78mkQdlPzENC0N9ihDeqIEOjHdFfHdLT14SQ=
268279
github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
269280
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
270281
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -316,12 +327,18 @@ go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCu
316327
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
317328
go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
318329
go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
330+
go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8=
331+
go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
319332
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
320333
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
321334
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
322335
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
323336
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
324337
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
338+
go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
339+
go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
340+
go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
341+
go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
325342
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
326343
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
327344
golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
@@ -470,6 +487,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
470487
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
471488
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
472489
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
490+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
491+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
473492
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
474493
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
475494
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎internal/command/command.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/signadot/cli/internal/buildinfo"
77
"github.com/signadot/cli/internal/command/bug"
88
"github.com/signadot/cli/internal/command/cluster"
9+
"github.com/signadot/cli/internal/command/routegroup"
910
"github.com/signadot/cli/internal/command/sandbox"
1011
"github.com/signadot/cli/internal/config"
1112
"github.com/spf13/cobra"
@@ -30,6 +31,7 @@ func New() *cobra.Command {
3031
cmd.AddCommand(
3132
cluster.New(cfg),
3233
sandbox.New(cfg),
34+
routegroup.New(cfg),
3335
bug.New(cfg),
3436
)
3537

‎internal/command/routegroup/apply.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ func apply(cfg *config.RouteGroupApply, out, log io.Writer, args []string) error
3636
return err
3737
}
3838
if cfg.Filename == "" {
39-
return errors.New("must specify sandbox request file with '-f' flag")
39+
return errors.New("must specify routegroup request file with '-f' flag")
4040
}
4141
req, err := loadRouteGroup(cfg.Filename, cfg.TemplateVals, false /*forDelete */)
4242
if err != nil {
4343
return err
4444
}
4545

46-
params := routegroups.NewApplyRouteGroupParams().
47-
WithOrgName(cfg.Org).WithRouteGroupName(req.Name).WithData(req)
48-
result, err := cfg.Client.RouteGroups.ApplyRouteGroup(params, nil)
46+
params := routegroups.NewApplyRoutegroupParams().
47+
WithOrgName(cfg.Org).WithRoutegroupName(req.Name).WithData(req)
48+
result, err := cfg.Client.RouteGroups.ApplyRoutegroup(params, nil)
4949
if err != nil {
5050
return err
5151
}
5252
resp := result.Payload
5353

5454
fmt.Fprintf(log, "Created routegroup %q (routing key: %s) in cluster %q.\n\n",
55-
req.Name, resp.RoutingKey, *req.Spec.Cluster)
55+
req.Name, resp.RoutingKey, req.Spec.Cluster)
5656

5757
if cfg.Wait {
58-
// Wait for the sandbox to be ready.
58+
// Wait for the routegroup to be ready.
5959
// store latest resp for output below
6060
resp, err = waitForReady(cfg, log, resp)
6161
if err != nil {
@@ -74,12 +74,12 @@ func apply(cfg *config.RouteGroupApply, out, log io.Writer, args []string) error
7474
func writeOutput(cfg *config.RouteGroupApply, out io.Writer, resp *models.RouteGroup) error {
7575
switch cfg.OutputFormat {
7676
case config.OutputFormatDefault:
77-
// Print info on how to access the sandbox.
78-
sbURL := cfg.RouteGroupDashboardURL(resp.RoutingKey)
77+
// Print info on how to access the routegroup.
78+
sbURL := cfg.RouteGroup.DashboardURL
7979
fmt.Fprintf(out, "\nDashboard page: %v\n\n", sbURL)
8080

81-
if len(resp.EndpointURLs) > 0 {
82-
if err := printEndpointTable(out, resp.EndpointURLs); err != nil {
81+
if len(resp.Endpoints) > 0 {
82+
if err := printEndpointTable(out, resp.Endpoints); err != nil {
8383
return err
8484
}
8585
}
@@ -93,16 +93,16 @@ func writeOutput(cfg *config.RouteGroupApply, out io.Writer, resp *models.RouteG
9393
}
9494
}
9595

96-
func waitForReady(cfg *config.SandboxApply, out io.Writer, rg *models.RouteGroup) (*models.RouteGroup, error) {
97-
fmt.Fprintf(out, "Waiting (up to --wait-timeout=%v) for sandbox to be ready...\n", cfg.WaitTimeout)
96+
func waitForReady(cfg *config.RouteGroupApply, out io.Writer, rg *models.RouteGroup) (*models.RouteGroup, error) {
97+
fmt.Fprintf(out, "Waiting (up to --wait-timeout=%v) for route group to be ready...\n", cfg.WaitTimeout)
9898

99-
params := routegroups.NewGetRouteGroupParams().WithOrgName(cfg.Org).WithRouteGroupName(rg.Name)
99+
params := routegroups.NewGetRoutegroupParams().WithOrgName(cfg.Org).WithRoutegroupName(rg.Name)
100100

101-
spin := spinner.Start(out, "Sandbox status")
101+
spin := spinner.Start(out, "Route group status")
102102
defer spin.Stop()
103103

104104
err := poll.Until(cfg.WaitTimeout, func() bool {
105-
result, err := cfg.Client.RouteGroups.GetRouteGroup(params, nil)
105+
result, err := cfg.Client.RouteGroups.GetRoutegroup(params, nil)
106106
if err != nil {
107107
// Keep retrying in case it's a transient error.
108108
spin.Messagef("error: %v", err)

‎internal/command/routegroup/delete.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,22 @@ func rgDelete(cfg *config.RouteGroupDelete, log io.Writer, args []string) error
4848
if len(args) != 0 {
4949
return errors.New("must not provide args when filename (-f) specified")
5050
}
51-
sb, err := loadRouteGroup(cfg.Filename, cfg.TemplateVals, true /* forDelete */)
51+
rg, err := loadRouteGroup(cfg.Filename, cfg.TemplateVals, true /* forDelete */)
5252
if err != nil {
5353
return err
5454
}
55-
name = sb.Name
55+
name = rg.Name
5656
}
5757

5858
if name == "" {
5959
return errors.New("routegroup name is required")
6060
}
6161

6262
// Delete the routegroup.
63-
params := routegroups.NewDeleteRouteGroupParams().
63+
params := routegroups.NewDeleteRoutegroupParams().
6464
WithOrgName(cfg.Org).
65-
WithRouteGroupName(name).
66-
WithForce(&cfg.Force)
67-
_, err := cfg.Client.RouteGroups.DeleteRouteGroup(params, nil)
65+
WithRoutegroupName(name)
66+
_, err := cfg.Client.RouteGroups.DeleteRoutegroup(params, nil)
6867
if err != nil {
6968
return err
7069
}
@@ -86,17 +85,17 @@ func rgDelete(cfg *config.RouteGroupDelete, log io.Writer, args []string) error
8685
func waitForDeleted(cfg *config.RouteGroupDelete, log io.Writer, routegroupName string) error {
8786
fmt.Fprintf(log, "Waiting (up to --wait-timeout=%v) for routegroup to finish terminating...\n", cfg.WaitTimeout)
8887

89-
params := routegroups.NewGetRouteGroupParams().WithOrgName(cfg.Org).WithRouteGroupName(routegroupName)
88+
params := routegroups.NewGetRoutegroupParams().WithOrgName(cfg.Org).WithRoutegroupName(routegroupName)
9089

9190
spin := spinner.Start(log, "RouteGroup status")
9291
defer spin.Stop()
9392

9493
err := poll.Until(cfg.WaitTimeout, func() bool {
95-
result, err := cfg.Client.RouteGroups.GetRouteGroup(params, nil)
94+
result, err := cfg.Client.RouteGroups.GetRoutegroup(params, nil)
9695
if err != nil {
9796
// If it's a "not found" error, that's what we wanted.
9897
// TODO: Pass through an error code so we don't have to rely on the error message.
99-
if strings.Contains(err.Error(), "can't get routegroup: not found") {
98+
if strings.Contains(err.Error(), "unable to fetch routegroup: not found") {
10099
spin.StopMessage("Terminated")
101100
return true
102101
}

‎internal/command/routegroup/get.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ func get(cfg *config.RouteGroupGet, out io.Writer, name string) error {
2929
if err := cfg.InitAPIConfig(); err != nil {
3030
return err
3131
}
32-
params := routegroups.NewGetRouteGroupParams().WithOrgName(cfg.Org).WithRouteGroupName(name)
33-
resp, err := cfg.Client.RouteGroups.GetRouteGroups(params, nil)
32+
params := routegroups.NewGetRoutegroupParams().WithOrgName(cfg.Org).WithRoutegroupName(name)
33+
resp, err := cfg.Client.RouteGroups.GetRoutegroup(params, nil)
3434
if err != nil {
3535
return err
3636
}
3737

3838
switch cfg.OutputFormat {
3939
case config.OutputFormatDefault:
40-
return printRouteGroupDetails(cfg.Sandbox, out, resp.Payload)
40+
return printRouteGroupDetails(cfg.RouteGroup, out, resp.Payload)
4141
case config.OutputFormatJSON:
4242
return print.RawJSON(out, resp.Payload)
4343
case config.OutputFormatYAML:

‎internal/command/routegroup/list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/signadot/cli/internal/config"
88
"github.com/signadot/cli/internal/print"
9-
routegroup "github.com/signadot/go-sdk/client/route_groups"
9+
routegroups "github.com/signadot/go-sdk/client/route_groups"
1010
"github.com/spf13/cobra"
1111
)
1212

@@ -29,7 +29,7 @@ func list(cfg *config.RouteGroupList, out io.Writer) error {
2929
if err := cfg.InitAPIConfig(); err != nil {
3030
return err
3131
}
32-
resp, err := cfg.Client.RouteGroups.ListRouteGroups(routegroups.NewListRouteGroupsParams().WithOrgName(cfg.Org), nil)
32+
resp, err := cfg.Client.RouteGroups.ListRoutegroups(routegroups.NewListRoutegroupsParams().WithOrgName(cfg.Org), nil)
3333
if err != nil {
3434
return err
3535
}

‎internal/command/routegroup/printers.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package routegroup
33
import (
44
"fmt"
55
"io"
6-
"strconv"
76
"text/tabwriter"
87
"time"
98

@@ -28,22 +27,22 @@ func printRouteGroupTable(out io.Writer, rgs []*models.RouteGroup) error {
2827
t.AddRow(routegroupRow{
2928
Name: rg.Name,
3029
RoutingKey: rg.RoutingKey,
31-
Cluster: *rg.Spec.Cluster,
30+
Cluster: rg.Spec.Cluster,
3231
Created: rg.CreatedAt,
3332
Status: readiness(rg.Status),
3433
})
3534
}
3635
return t.Flush()
3736
}
3837

39-
func printRouteGroupDetails(cfg *config.Sandbox, out io.Writer, rg *models.RouteGroup) error {
38+
func printRouteGroupDetails(cfg *config.RouteGroup, out io.Writer, rg *models.RouteGroup) error {
4039
tw := tabwriter.NewWriter(out, 0, 0, 3, ' ', 0)
4140

4241
fmt.Fprintf(tw, "Name:\t%s\n", rg.Name)
4342
fmt.Fprintf(tw, "Routing Key:\t%s\n", rg.RoutingKey)
44-
fmt.Fprintf(tw, "Cluster:\t%s\n", *rg.Spec.Cluster)
43+
fmt.Fprintf(tw, "Cluster:\t%s\n", rg.Spec.Cluster)
4544
fmt.Fprintf(tw, "Created:\t%s\n", formatTimestamp(rg.CreatedAt))
46-
fmt.Fprintf(tw, "Dashboard page:\t%s\n", cfg.RouteGroupDashboardURL(rg.Name))
45+
fmt.Fprintf(tw, "Dashboard page:\t%s\n", cfg.DashboardURL)
4746
fmt.Fprintf(tw, "Status:\t%s (%s: %s)\n", readiness(rg.Status), rg.Status.Reason, rg.Status.Message)
4847

4948
if err := tw.Flush(); err != nil {
@@ -60,7 +59,7 @@ func printRouteGroupDetails(cfg *config.Sandbox, out io.Writer, rg *models.Route
6059
return nil
6160
}
6261

63-
func readiness(status *models.SandboxReadiness) string {
62+
func readiness(status *models.RouteGroupStatus) string {
6463
if status.Ready {
6564
return "Ready"
6665
}
@@ -79,7 +78,7 @@ func formatTimestamp(in string) string {
7978
}
8079

8180
type endpointRow struct {
82-
Name string `sdtab:"SANDBOX ENDPOINT"`
81+
Name string `sdtab:"ROUTEGROUP ENDPOINT"`
8382
Target string `sdtab:"TARGET"`
8483
URL string `sdtab:"URL"`
8584
}
@@ -89,9 +88,9 @@ func printEndpointTable(out io.Writer, endpoints []*models.RouteGroupEndpoint) e
8988
t.AddHeader()
9089
for _, ep := range endpoints {
9190
t.AddRow(endpointRow{
92-
Name: ep.Name,
93-
Type: ep.Target,
94-
URL: ep.URL,
91+
Name: ep.Name,
92+
Target: ep.Target,
93+
URL: ep.URL,
9594
})
9695
}
9796
return t.Flush()

‎internal/command/routegroup/subst.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"fmt"
66
"sort"
7-
"strconv"
87
"strings"
98

109
"github.com/signadot/cli/internal/clio"

0 commit comments

Comments
 (0)