Skip to content

Commit 7d97160

Browse files
authored
Update proto for pulumi-defang aliases support (#867)
1 parent 57f352f commit 7d97160

File tree

8 files changed

+614
-669
lines changed

8 files changed

+614
-669
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ func (i AWSAccountInfo) Details() string {
454454
return i.arn
455455
}
456456

457-
func (b *ByocAws) GetService(ctx context.Context, s *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
457+
func (b *ByocAws) GetService(ctx context.Context, s *defangv1.GetRequest) (*defangv1.ServiceInfo, error) {
458458
all, err := b.GetServices(ctx, &defangv1.GetServicesRequest{Project: s.Project})
459459
if err != nil {
460460
return nil, err

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func (b *ByocDo) DeleteConfig(ctx context.Context, secrets *defangv1.Secrets) er
315315
return err
316316
}
317317

318-
func (b *ByocDo) GetService(ctx context.Context, s *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
318+
func (b *ByocDo) GetService(ctx context.Context, s *defangv1.GetRequest) (*defangv1.ServiceInfo, error) {
319319
//Dumps endpoint and tag. Reads the protobuff for that service. Combines with info from get app.
320320
//Only used in Tail
321321
app, err := b.getAppByName(ctx, s.Project)

src/pkg/cli/client/playground.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (g *PlaygroundProvider) Preview(ctx context.Context, req *defangv1.DeployRe
2424
return nil, errors.New("the preview command is not valid for the Defang playground; did you forget --provider?")
2525
}
2626

27-
func (g *PlaygroundProvider) GetService(ctx context.Context, req *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
27+
func (g *PlaygroundProvider) GetService(ctx context.Context, req *defangv1.GetRequest) (*defangv1.ServiceInfo, error) {
2828
return getMsg(g.client.Get(ctx, connect.NewRequest(req)))
2929
}
3030

src/pkg/cli/client/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ type Provider interface {
121121
Deploy(context.Context, *defangv1.DeployRequest) (*defangv1.DeployResponse, error)
122122
Destroy(context.Context, *defangv1.DestroyRequest) (types.ETag, error)
123123
Follow(context.Context, *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error)
124-
GetService(context.Context, *defangv1.ServiceID) (*defangv1.ServiceInfo, error)
124+
GetService(context.Context, *defangv1.GetRequest) (*defangv1.ServiceInfo, error)
125125
GetServices(context.Context, *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error)
126126
ListConfig(context.Context, *defangv1.ListConfigsRequest) (*defangv1.Secrets, error)
127127
Query(context.Context, *defangv1.DebugRequest) error

src/pkg/cli/tail.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func Tail(ctx context.Context, loader client.Loader, provider client.Provider, p
162162
for _, service := range params.Services {
163163
service = compose.NormalizeServiceName(service)
164164
// Show a warning if the service doesn't exist (yet); TODO: could do fuzzy matching and suggest alternatives
165-
if _, err := provider.GetService(ctx, &defangv1.ServiceID{Project: params.Project, Name: service}); err != nil {
165+
if _, err := provider.GetService(ctx, &defangv1.GetRequest{Project: params.Project, Name: service}); err != nil {
166166
switch connect.CodeOf(err) {
167167
case connect.CodeNotFound:
168168
term.Warn("Service does not exist (yet):", service)

src/protos/io/defang/v1/defangv1connect/fabric.connect.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)