Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: filter schemas by name #1135

Merged
merged 4 commits into from
Mar 25, 2024
Merged

feat: filter schemas by name #1135

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dac5ca
filter schemas by name
matt2e Mar 25, 2024
735aff3
return missing modules as errors
matt2e Mar 25, 2024
eb6b46a
allow schema-get as schema cmd default
matt2e Mar 25, 2024
ff43603
protobuf format should also produce errors for missing modules
matt2e Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 40 additions & 7 deletions cmd/ftl/cmd_schema_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"fmt"
"os"
"slices"

"connectrpc.com/connect"
"golang.org/x/exp/maps"
"google.golang.org/protobuf/proto"

ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
Expand All @@ -15,7 +17,8 @@ import (
)

type getSchemaCmd struct {
Protobuf bool `help:"Output the schema as binary protobuf."`
Protobuf bool `help:"Output the schema as binary protobuf."`
Modules []string `help:"Modules to include" type:"string" optional:""`
}

func (g *getSchemaCmd) Run(ctx context.Context, client ftlv1connect.ControllerServiceClient) error {
Expand All @@ -26,25 +29,47 @@ func (g *getSchemaCmd) Run(ctx context.Context, client ftlv1connect.ControllerSe
if g.Protobuf {
return g.generateProto(resp)
}
remainingNames := make(map[string]bool)
for _, name := range g.Modules {
remainingNames[name] = true
}
for resp.Receive() {
msg := resp.Msg()
module, err := schema.ModuleFromProto(msg.Schema)
if err != nil {
return fmt.Errorf("%s: %w", "invalid module schema", err)
if len(g.Modules) == 0 || remainingNames[msg.Schema.Name] {
if err != nil {
return fmt.Errorf("%s: %w", "invalid module schema", err)
}
fmt.Println(module)
delete(remainingNames, msg.Schema.Name)
}
fmt.Println(module)
if !msg.More {
break
}
}
return resp.Err()
if err := resp.Err(); err != nil {
return resp.Err()
}
missingNames := maps.Keys(remainingNames)
slices.Sort(missingNames)
if len(missingNames) > 0 {
return fmt.Errorf("missing modules: %v", missingNames)
}
return nil
}

func (g *getSchemaCmd) generateProto(resp *connect.ServerStreamForClient[ftlv1.PullSchemaResponse]) error {
remainingNames := make(map[string]bool)
for _, name := range g.Modules {
remainingNames[name] = true
}
schema := &schemapb.Schema{}
for resp.Receive() {
msg := resp.Msg()
schema.Modules = append(schema.Modules, msg.Schema)
if len(g.Modules) == 0 || remainingNames[msg.Schema.Name] {
schema.Modules = append(schema.Modules, msg.Schema)
delete(remainingNames, msg.Schema.Name)
}
if !msg.More {
break
}
Expand All @@ -57,5 +82,13 @@ func (g *getSchemaCmd) generateProto(resp *connect.ServerStreamForClient[ftlv1.P
return err
}
_, err = os.Stdout.Write(pb)
return err
if err != nil {
return err
}
missingNames := maps.Keys(remainingNames)
slices.Sort(missingNames)
if len(missingNames) > 0 {
return fmt.Errorf("missing modules: %v", missingNames)
}
return nil
}