Skip to content
This repository was archived by the owner on Aug 17, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 31 additions & 4 deletions common/schema/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,37 +310,64 @@ func (s *Schema) FilterModules(modules []RefKey) (*Schema, []RefKey) {
func (s *Schema) External() *Schema {
filtered := &Schema{}
for _, realm := range s.Realms {
if !realm.External {
realmCopy := ftlreflect.DeepCopy(realm)
if !realmCopy.External {
filtered.Realms = append(
filtered.Realms,
realm.FilterByVisibility(VisibilityScopeRealm),
realmCopy.FilterByVisibility(VisibilityScopeRealm),
)
}
}
// strip any runtime
// strip any runtime, and unsupported decls
for _, realm := range filtered.Realms {
for _, module := range realm.Modules {
module.Runtime = nil
var filteredDecls []Decl
for _, decl := range module.Decls {
switch d := decl.(type) {
case *Verb:
d.Runtime = nil
d.Metadata = filterExternalMetadata(d.Metadata)
filteredDecls = append(filteredDecls, d)
case *Database:
d.Runtime = nil
d.Metadata = filterExternalMetadata(d.Metadata)
filteredDecls = append(filteredDecls, d)
case *Topic:
d.Runtime = nil
d.Metadata = filterExternalMetadata(d.Metadata)
filteredDecls = append(filteredDecls, d)
case *Data:
d.Metadata = filterExternalMetadata(d.Metadata)
filteredDecls = append(filteredDecls, d)
case *TypeAlias:
case *Config:
d.Metadata = filterExternalMetadata(d.Metadata)
filteredDecls = append(filteredDecls, d)
case *Enum:
filteredDecls = append(filteredDecls, d)
case *Config:
case *Secret:
}
module.Decls = filteredDecls
}
}
}
return filtered
}

func filterExternalMetadata(metadata []Metadata) []Metadata {
var filtered []Metadata
for _, m := range metadata {
switch m := m.(type) {
case *MetadataConfig:
case *MetadataSecrets:
default:
filtered = append(filtered, m)
}
}
return filtered
}

// SchemaState is the schema service state as persisted in Raft
//
//protobuf:export
Expand Down
39 changes: 39 additions & 0 deletions common/schema/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1352,3 +1352,42 @@ func TestWithBuiltins(t *testing.T) {
assert.Equal(t, schema.WithBuiltins(), schema.WithBuiltins().WithBuiltins())
})
}

func TestExternal(t *testing.T) {
t.Run("does not include referred configs", func(t *testing.T) {
schema := &Schema{
Realms: []*Realm{{
Name: "foo",
Modules: []*Module{{
Name: "bar",
Decls: []Decl{
&Config{Name: "config", Type: &String{}},
&Verb{
Name: "m",
Request: &Unit{Unit: true},
Response: &Unit{Unit: true},
Metadata: []Metadata{&MetadataConfig{Config: []*Ref{{Module: "bar", Name: "config"}}}},
Visibility: VisibilityScopeRealm,
},
},
}},
}},
}
assert.Equal(t, &Schema{
Realms: []*Realm{{
Name: "foo",
Modules: []*Module{{
Name: "bar",
Decls: []Decl{
&Verb{
Name: "m",
Request: &Unit{Unit: true},
Response: &Unit{Unit: true},
Visibility: VisibilityScopeRealm,
},
},
}},
}},
}, schema.External())
})
}
Loading