Skip to content

Commit d77570d

Browse files
edw-defangedw-defang
committed
Merge branch 'main' into edw-remove-pg-byod-warning
2 parents 95f135a + 129b421 commit d77570d

File tree

6 files changed

+50
-45
lines changed

6 files changed

+50
-45
lines changed

‎src/cmd/cli/command/commands.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ func SetupCommands(version string) {
149149
bootstrapCmd.AddCommand(bootstrapRefreshCmd)
150150
bootstrapTearDownCmd.Flags().Bool("force", false, "force the teardown of the CD stack")
151151
bootstrapCmd.AddCommand(bootstrapTearDownCmd)
152+
bootstrapListCmd.Flags().Bool("remote", false, "invoke the command on the remote cluster")
152153
bootstrapCmd.AddCommand(bootstrapListCmd)
153154
bootstrapCmd.AddCommand(bootstrapCancelCmd)
154155

@@ -1068,7 +1069,12 @@ var bootstrapListCmd = &cobra.Command{
10681069
Aliases: []string{"list"},
10691070
Short: "List all the projects and stacks in the CD cluster",
10701071
RunE: func(cmd *cobra.Command, args []string) error {
1071-
return cli.BootstrapList(cmd.Context(), client)
1072+
remote, _ := cmd.Flags().GetBool("remote")
1073+
1074+
if remote {
1075+
return cli.BootstrapCommand(cmd.Context(), client, "list")
1076+
}
1077+
return cli.BootstrapLocalList(cmd.Context(), client)
10721078
},
10731079
}
10741080

‎src/pkg/cli/bootstrap.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,22 @@ func BootstrapCommand(ctx context.Context, client client.Client, command string)
1919
if DoDryRun {
2020
return ErrDryRun
2121
}
22+
2223
since := time.Now()
2324
etag, err := client.BootstrapCommand(ctx, command)
2425
if err != nil || etag == "" {
2526
return err
2627
}
27-
params := TailOptions{
28-
Service: "",
29-
Etag: etag,
30-
Since: since,
31-
Raw: false,
32-
}
3328

34-
return Tail(ctx, client, params)
29+
return Tail(ctx, client, TailOptions{Etag: etag, Since: since})
3530
}
3631

37-
func BootstrapList(ctx context.Context, client client.Client) error {
32+
func BootstrapLocalList(ctx context.Context, client client.Client) error {
3833
term.Debug(" - Running CD list")
3934
if DoDryRun {
4035
return ErrDryRun
4136
}
37+
4238
stacks, err := client.BootstrapList(ctx)
4339
if err != nil {
4440
return err

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,13 @@ func (b *ByocAws) setUp(ctx context.Context) error {
141141
if b.customDomain == "" {
142142
domain, err := b.GetDelegateSubdomainZone(ctx)
143143
if err != nil {
144+
term.Debug(" - Failed to get subdomain zone:", err)
144145
// return err; FIXME: ignore this error for now
145146
} else {
146147
b.customDomain = b.getProjectDomain(domain.Zone)
147-
b.shouldDelegateSubdomain = true
148+
if b.customDomain != "" {
149+
b.shouldDelegateSubdomain = true
150+
}
148151
}
149152
}
150153

@@ -326,12 +329,12 @@ func (b *ByocAws) WhoAmI(ctx context.Context) (*defangv1.WhoAmIResponse, error)
326329
}, nil
327330
}
328331

329-
func (ByocAws) GetVersions(context.Context) (*defangv1.Version, error) {
332+
func (*ByocAws) GetVersions(context.Context) (*defangv1.Version, error) {
330333
cdVersion := CdImage[strings.LastIndex(CdImage, ":")+1:]
331334
return &defangv1.Version{Fabric: cdVersion}, nil
332335
}
333336

334-
func (b *ByocAws) Get(ctx context.Context, s *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
337+
func (b *ByocAws) GetService(ctx context.Context, s *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
335338
all, err := b.GetServices(ctx)
336339
if err != nil {
337340
return nil, err
@@ -349,9 +352,6 @@ func (b *ByocAws) bucketName() string {
349352
}
350353

351354
func (b *ByocAws) environment() map[string]string {
352-
if b.pulumiProject == "" {
353-
panic("pulumiProject not set")
354-
}
355355
region := b.driver.Region // TODO: this should be the destination region, not the CD region; make customizable
356356
return map[string]string{
357357
// "AWS_REGION": region.String(), should be set by ECS (because of CD task role)
@@ -360,7 +360,7 @@ func (b *ByocAws) environment() map[string]string {
360360
"DEFANG_ORG": b.tenantID,
361361
"DOMAIN": b.customDomain,
362362
"PRIVATE_DOMAIN": b.privateDomain,
363-
"PROJECT": b.pulumiProject,
363+
"PROJECT": b.pulumiProject, // may be empty
364364
"PULUMI_BACKEND_URL": fmt.Sprintf(`s3://%s?region=%s&awssdk=v2`, b.bucketName(), region),
365365
"PULUMI_CONFIG_PASSPHRASE": pkg.Getenv("PULUMI_CONFIG_PASSPHRASE", "asdf"), // TODO: make customizable
366366
"STACK": b.pulumiStack,
@@ -398,11 +398,9 @@ func (b *ByocAws) Delete(ctx context.Context, req *defangv1.DeleteRequest) (*def
398398
return &defangv1.DeleteResponse{Etag: etag}, nil
399399
}
400400

401-
// stackDir returns a stack-qualified name, like the Pulumi TS function `stackDir`
401+
// stackDir returns a stack-qualified path, like the Pulumi TS function `stackDir`
402402
func (b *ByocAws) stackDir(name string) string {
403-
if b.pulumiProject == "" {
404-
panic("pulumiProject not set")
405-
}
403+
ensure(b.pulumiProject != "", "pulumiProject not set")
406404
return fmt.Sprintf("/%s/%s/%s/%s", DefangPrefix, b.pulumiProject, b.pulumiStack, name) // same as shared/common.ts
407405
}
408406

@@ -422,6 +420,7 @@ func (b *ByocAws) GetServices(ctx context.Context) (*defangv1.ListServicesRespon
422420

423421
s3Client := s3.NewFromConfig(cfg)
424422
// Path to the state file, Defined at: https://github.com/defang-io/defang-mvp/blob/main/pulumi/cd/byoc/aws/index.ts#L89
423+
ensure(b.pulumiProject != "", "pulumiProject not set")
425424
path := fmt.Sprintf("projects/%s/%s/project.pb", b.pulumiProject, b.pulumiStack)
426425

427426
term.Debug(" - Getting services from", bucketName, path)
@@ -445,10 +444,7 @@ func (b *ByocAws) GetServices(ctx context.Context) (*defangv1.ListServicesRespon
445444
}
446445

447446
func (b *ByocAws) getSecretID(name string) string {
448-
if b.pulumiProject == "" {
449-
panic("pulumiProject not set")
450-
}
451-
return fmt.Sprintf("/%s/%s/%s/%s", DefangPrefix, b.pulumiProject, b.pulumiStack, name) // same as defang_service.ts
447+
return b.stackDir(name) // same as defang_service.ts
452448
}
453449

454450
func (b *ByocAws) PutConfig(ctx context.Context, secret *defangv1.SecretValue) error {
@@ -556,6 +552,7 @@ func (b *ByocAws) update(ctx context.Context, service *defangv1.Service) (*defan
556552
return nil, fmt.Errorf("missing config %s", missing) // retryable CodeFailedPrecondition
557553
}
558554

555+
ensure(b.pulumiProject != "", "pulumiProject not set")
559556
si := &defangv1.ServiceInfo{
560557
Service: service,
561558
Project: b.pulumiProject, // was: tenant
@@ -671,6 +668,9 @@ func (b *ByocAws) getPrivateFqdn(fqn qualifiedName) string {
671668
}
672669

673670
func (b *ByocAws) getProjectDomain(zone string) string {
671+
if b.pulumiProject == "" {
672+
return "" // no project name => no custom domain
673+
}
674674
projectLabel := dnsSafeLabel(b.pulumiProject)
675675
if projectLabel == dnsSafeLabel(b.tenantID) {
676676
return dnsSafe(zone) // the zone will already have the tenant ID
@@ -791,3 +791,9 @@ func (b *ByocAws) LoadProjectName() (string, error) {
791791
}
792792
return p.Name, nil
793793
}
794+
795+
func ensure(cond bool, msg string) {
796+
if !cond {
797+
panic(msg)
798+
}
799+
}

‎src/pkg/cli/client/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ type Client interface {
3737
Deploy(context.Context, *defangv1.DeployRequest) (*defangv1.DeployResponse, error)
3838
Destroy(context.Context) (types.ETag, error)
3939
GenerateFiles(context.Context, *defangv1.GenerateFilesRequest) (*defangv1.GenerateFilesResponse, error)
40-
Get(context.Context, *defangv1.ServiceID) (*defangv1.ServiceInfo, error)
4140
GetDelegateSubdomainZone(context.Context) (*defangv1.DelegateSubdomainZoneResponse, error)
41+
GetService(context.Context, *defangv1.ServiceID) (*defangv1.ServiceInfo, error)
4242
GetServices(context.Context) (*defangv1.ListServicesResponse, error)
4343
GetVersions(context.Context) (*defangv1.Version, error)
4444
ListConfig(context.Context) (*defangv1.Secrets, error)

‎src/pkg/cli/client/grpc.go‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (g GrpcClient) GetVersions(ctx context.Context) (*defangv1.Version, error)
7373

7474
func (g GrpcClient) Token(ctx context.Context, req *defangv1.TokenRequest) (*defangv1.TokenResponse, error) {
7575
req.AnonId = g.anonID
76-
return getMsg(g.client.Token(ctx, &connect.Request[defangv1.TokenRequest]{Msg: req}))
76+
return getMsg(g.client.Token(ctx, connect.NewRequest(req)))
7777
}
7878

7979
func (g GrpcClient) RevokeToken(ctx context.Context) error {
@@ -82,23 +82,23 @@ func (g GrpcClient) RevokeToken(ctx context.Context) error {
8282
}
8383

8484
func (g GrpcClient) Update(ctx context.Context, req *defangv1.Service) (*defangv1.ServiceInfo, error) {
85-
return getMsg(g.client.Update(ctx, &connect.Request[defangv1.Service]{Msg: req}))
85+
return getMsg(g.client.Update(ctx, connect.NewRequest(req)))
8686
}
8787

8888
func (g GrpcClient) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*defangv1.DeployResponse, error) {
89-
return getMsg(g.client.Deploy(ctx, &connect.Request[defangv1.DeployRequest]{Msg: req}))
89+
return getMsg(g.client.Deploy(ctx, connect.NewRequest(req)))
9090
}
9191

92-
func (g GrpcClient) Get(ctx context.Context, req *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
93-
return getMsg(g.client.Get(ctx, &connect.Request[defangv1.ServiceID]{Msg: req}))
92+
func (g GrpcClient) GetService(ctx context.Context, req *defangv1.ServiceID) (*defangv1.ServiceInfo, error) {
93+
return getMsg(g.client.Get(ctx, connect.NewRequest(req)))
9494
}
9595

9696
func (g GrpcClient) Delete(ctx context.Context, req *defangv1.DeleteRequest) (*defangv1.DeleteResponse, error) {
97-
return getMsg(g.client.Delete(ctx, &connect.Request[defangv1.DeleteRequest]{Msg: req}))
97+
return getMsg(g.client.Delete(ctx, connect.NewRequest(req)))
9898
}
9999

100100
func (g GrpcClient) Publish(ctx context.Context, req *defangv1.PublishRequest) error {
101-
_, err := g.client.Publish(ctx, &connect.Request[defangv1.PublishRequest]{Msg: req})
101+
_, err := g.client.Publish(ctx, connect.NewRequest(req))
102102
return err
103103
}
104104

@@ -107,36 +107,33 @@ func (g GrpcClient) GetServices(ctx context.Context) (*defangv1.ListServicesResp
107107
}
108108

109109
func (g GrpcClient) GenerateFiles(ctx context.Context, req *defangv1.GenerateFilesRequest) (*defangv1.GenerateFilesResponse, error) {
110-
return getMsg(g.client.GenerateFiles(ctx, &connect.Request[defangv1.GenerateFilesRequest]{Msg: req}))
110+
return getMsg(g.client.GenerateFiles(ctx, connect.NewRequest(req)))
111111
}
112112

113113
func (g GrpcClient) PutConfig(ctx context.Context, req *defangv1.SecretValue) error {
114-
_, err := g.client.PutSecret(ctx, &connect.Request[defangv1.SecretValue]{Msg: req})
114+
_, err := g.client.PutSecret(ctx, connect.NewRequest(req))
115115
return err
116116
}
117117

118118
func (g GrpcClient) DeleteConfig(ctx context.Context, req *defangv1.Secrets) error {
119-
// _, err := g.client.DeleteSecrets(ctx, &connect.Request[v1.Secrets]{Msg: req}); TODO: implement this in the server
120-
var errs []error
121-
_, err := g.client.DeleteSecrets(ctx, &connect.Request[defangv1.Secrets]{Msg: &defangv1.Secrets{Names: req.Names}})
122-
errs = append(errs, err)
123-
return errors.Join(errs...)
119+
_, err := g.client.DeleteSecrets(ctx, connect.NewRequest(&defangv1.Secrets{Names: req.Names}))
120+
return err
124121
}
125122

126123
func (g GrpcClient) ListConfig(ctx context.Context) (*defangv1.Secrets, error) {
127124
return getMsg(g.client.ListSecrets(ctx, &connect.Request[emptypb.Empty]{}))
128125
}
129126

130127
func (g GrpcClient) CreateUploadURL(ctx context.Context, req *defangv1.UploadURLRequest) (*defangv1.UploadURLResponse, error) {
131-
return getMsg(g.client.CreateUploadURL(ctx, &connect.Request[defangv1.UploadURLRequest]{Msg: req}))
128+
return getMsg(g.client.CreateUploadURL(ctx, connect.NewRequest(req)))
132129
}
133130

134131
func (g GrpcClient) WhoAmI(ctx context.Context) (*defangv1.WhoAmIResponse, error) {
135132
return getMsg(g.client.WhoAmI(ctx, &connect.Request[emptypb.Empty]{}))
136133
}
137134

138135
func (g GrpcClient) DelegateSubdomainZone(ctx context.Context, req *defangv1.DelegateSubdomainZoneRequest) (*defangv1.DelegateSubdomainZoneResponse, error) {
139-
return getMsg(g.client.DelegateSubdomainZone(ctx, &connect.Request[defangv1.DelegateSubdomainZoneRequest]{Msg: req}))
136+
return getMsg(g.client.DelegateSubdomainZone(ctx, connect.NewRequest(req)))
140137
}
141138

142139
func (g GrpcClient) DeleteSubdomainZone(ctx context.Context) error {
@@ -149,7 +146,7 @@ func (g GrpcClient) GetDelegateSubdomainZone(ctx context.Context) (*defangv1.Del
149146
}
150147

151148
func (g *GrpcClient) Tail(ctx context.Context, req *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error) {
152-
return g.client.Tail(ctx, &connect.Request[defangv1.TailRequest]{Msg: req})
149+
return g.client.Tail(ctx, connect.NewRequest(req))
153150
}
154151

155152
func (g *GrpcClient) BootstrapCommand(ctx context.Context, command string) (types.ETag, error) {
@@ -219,7 +216,7 @@ func (g *GrpcClient) Restart(ctx context.Context, names ...string) (types.ETag,
219216
// For now, we'll just get the service info and pass it back to Deploy as-is.
220217
services := make([]*defangv1.Service, 0, len(names))
221218
for _, name := range names {
222-
serviceInfo, err := g.Get(ctx, &defangv1.ServiceID{Name: name})
219+
serviceInfo, err := g.GetService(ctx, &defangv1.ServiceID{Name: name})
223220
if err != nil {
224221
return "", err
225222
}

‎src/pkg/cli/tail.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func (cerr *CancelError) Unwrap() error {
9898
func Tail(ctx context.Context, client client.Client, params TailOptions) error {
9999
if params.Service != "" {
100100
params.Service = NormalizeServiceName(params.Service)
101-
// Show a warning if the service doesn't exist (yet);; TODO: could do fuzzy matching and suggest alternatives
102-
if _, err := client.Get(ctx, &defangv1.ServiceID{Name: params.Service}); err != nil {
101+
// Show a warning if the service doesn't exist (yet); TODO: could do fuzzy matching and suggest alternatives
102+
if _, err := client.GetService(ctx, &defangv1.ServiceID{Name: params.Service}); err != nil {
103103
switch connect.CodeOf(err) {
104104
case connect.CodeNotFound:
105105
term.Warn(" ! Service does not exist (yet):", params.Service)

0 commit comments

Comments
 (0)