Skip to content

Commit aad3bdb

Browse files
authored
Merge pull request #530 from DefangLabs/lio-follow
rename Tail to Follow in CLI
2 parents 8fe89b4 + 69d9c5e commit aad3bdb

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/pkg/cli/client/byoc/aws/byoc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ func (b *ByocAws) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLRe
445445
}, nil
446446
}
447447

448-
func (b *ByocAws) Tail(ctx context.Context, req *defangv1.TailRequest) (client.ServerStream[defangv1.TailResponse], error) {
448+
func (b *ByocAws) Follow(ctx context.Context, req *defangv1.TailRequest) (client.ServerStream[defangv1.TailResponse], error) {
449449
if err := b.setUp(ctx); err != nil {
450450
return nil, err
451451
}

src/pkg/cli/client/byoc/aws/byoc_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestTail(t *testing.T) {
4545
b.PulumiProject = "byoc_integration_test"
4646
b.ProjectDomain = "example.com" // avoid rpc call
4747

48-
ss, err := b.Tail(context.Background(), &defangv1.TailRequest{})
48+
ss, err := b.Follow(context.Background(), &defangv1.TailRequest{})
4949
if err != nil {
5050
// the only acceptable error is "unauthorized"
5151
if connect.CodeOf(err) != connect.CodeUnauthenticated {

src/pkg/cli/client/byoc/do/byoc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (b *ByocDo) Subscribe(ctx context.Context, req *defangv1.SubscribeRequest)
190190
return nil, client.ErrNotImplemented("not implemented for ByocDo")
191191
}
192192

193-
func (b *ByocDo) Tail(ctx context.Context, req *defangv1.TailRequest) (client.ServerStream[defangv1.TailResponse], error) {
193+
func (b *ByocDo) Follow(ctx context.Context, req *defangv1.TailRequest) (client.ServerStream[defangv1.TailResponse], error) {
194194
return nil, nil
195195
}
196196

src/pkg/cli/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type Client interface {
5252
Restart(context.Context, ...string) (types.ETag, error)
5353
ServiceDNS(name string) string
5454
Subscribe(context.Context, *defangv1.SubscribeRequest) (ServerStream[defangv1.SubscribeResponse], error)
55-
Tail(context.Context, *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error)
55+
Follow(context.Context, *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error)
5656
TearDown(context.Context) error
5757
WhoAmI(context.Context) (*defangv1.WhoAmIResponse, error)
5858

src/pkg/cli/client/mock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (m MockClient) LoadProjectName(ctx context.Context) (string, error) {
3636
return m.Project.Name, nil
3737
}
3838

39-
func (m MockClient) Tail(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
39+
func (m MockClient) Follow(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
4040
if m.ServerStream != nil {
4141
return m.ServerStream, nil
4242
}

src/pkg/cli/client/playground.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (g *PlaygroundClient) Subscribe(ctx context.Context, req *defangv1.Subscrib
5959
return g.client.Subscribe(ctx, connect.NewRequest(req))
6060
}
6161

62-
func (g *PlaygroundClient) Tail(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
62+
func (g *PlaygroundClient) Follow(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
6363
return g.client.Tail(ctx, connect.NewRequest(req))
6464
}
6565

src/pkg/cli/tail.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func tail(ctx context.Context, client client.Client, params TailOptions) error {
185185
} else {
186186
since = timestamppb.New(params.Since)
187187
}
188-
serverStream, err := client.Tail(ctx, &defangv1.TailRequest{Services: params.Services, Etag: params.Etag, Since: since})
188+
serverStream, err := client.Follow(ctx, &defangv1.TailRequest{Services: params.Services, Etag: params.Etag, Since: since})
189189
if err != nil {
190190
return err
191191
}
@@ -252,7 +252,7 @@ func tail(ctx context.Context, client client.Client, params TailOptions) error {
252252
spaces, _ = term.Warnf("Reconnecting...\r") // overwritten below
253253
}
254254
pkg.SleepWithContext(ctx, 1*time.Second)
255-
serverStream, err = client.Tail(ctx, &defangv1.TailRequest{Services: params.Services, Etag: params.Etag, Since: timestamppb.New(params.Since)})
255+
serverStream, err = client.Follow(ctx, &defangv1.TailRequest{Services: params.Services, Etag: params.Etag, Since: timestamppb.New(params.Since)})
256256
if err != nil {
257257
term.Debug("Reconnect failed:", err)
258258
return err

0 commit comments

Comments
 (0)