Skip to content

Commit

Permalink
chore: remove VerbRuntimeBase (#4289)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas authored Feb 4, 2025
1 parent 253967e commit c1c7550
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 292 deletions.
3 changes: 0 additions & 3 deletions backend/schemaservice/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ func handleVerbRuntimeEvent(t SchemaState, e *schema.VerbRuntimeEvent) error {
verb.Runtime = &schema.VerbRuntime{}
}

if base, ok := e.Base.Get(); ok {
verb.Runtime.Base = base
}
if subscription, ok := e.Subscription.Get(); ok {
verb.Runtime.Subscription = &subscription
}
Expand Down
186 changes: 46 additions & 140 deletions common/protos/xyz/block/ftl/schema/v1/schema.pb.go

Large diffs are not rendered by default.

11 changes: 2 additions & 9 deletions common/protos/xyz/block/ftl/schema/v1/schema.proto
Original file line number Diff line number Diff line change
Expand Up @@ -589,21 +589,14 @@ message Verb {
}

message VerbRuntime {
VerbRuntimeBase base = 1;
optional VerbRuntimeSubscription subscription = 2;
}

message VerbRuntimeBase {
optional google.protobuf.Timestamp create_time = 1;
optional google.protobuf.Timestamp start_time = 2;
optional VerbRuntimeSubscription subscription = 1;
}

message VerbRuntimeEvent {
string module = 1;
string changeset = 2;
string id = 3;
optional VerbRuntimeBase base = 4;
optional VerbRuntimeSubscription subscription = 5;
optional VerbRuntimeSubscription subscription = 4;
}

message VerbRuntimeSubscription {
Expand Down
3 changes: 1 addition & 2 deletions common/schema/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ type VerbRuntimeEvent struct {
Module string `protobuf:"1"`
Changeset key.Changeset `protobuf:"2"`
ID string `protobuf:"3"`
Base optional.Option[VerbRuntimeBase] `protobuf:"4"`
Subscription optional.Option[VerbRuntimeSubscription] `protobuf:"5"`
Subscription optional.Option[VerbRuntimeSubscription] `protobuf:"4"`
}

func (e *VerbRuntimeEvent) event() {}
Expand Down
33 changes: 0 additions & 33 deletions common/schema/go2proto.to.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 1 addition & 13 deletions common/schema/verbruntime.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
package schema

import (
"time"
)

type VerbRuntime struct {
Base VerbRuntimeBase `protobuf:"1"`
Subscription *VerbRuntimeSubscription `protobuf:"2,optional"`
}

type VerbRuntimeBase struct {
CreateTime time.Time `protobuf:"1,optional"`
StartTime time.Time `protobuf:"2,optional"`
Subscription *VerbRuntimeSubscription `protobuf:"1,optional"`
}

func (*VerbRuntimeBase) verbRuntime() {}

type VerbRuntimeSubscription struct {
KafkaBrokers []string `protobuf:"1"`
}
Expand Down
63 changes: 4 additions & 59 deletions frontend/console/src/protos/xyz/block/ftl/schema/v1/schema_pb.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c1c7550

Please sign in to comment.