refactor: fix ENUM_ZERO_VALUE_SUFFIX (#3580)

block · Nov 29, 2024 · 1e39343 · 1e39343
1 parent 5dbc850
commit 1e39343
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 54 deletions.
diff --git a/backend/protos/buf.yaml b/backend/protos/buf.yaml
@@ -11,5 +11,4 @@ lint:
   except:
     - RPC_REQUEST_RESPONSE_UNIQUE
     # Remove these exceptions once they're fixed
-    - ENUM_ZERO_VALUE_SUFFIX
     - PACKAGE_VERSION_SUFFIX
diff --git a/backend/protos/xyz/block/ftl/v1/schema/schema.pb.go b/backend/protos/xyz/block/ftl/v1/schema/schema.pb.go
diff --git a/backend/protos/xyz/block/ftl/v1/schema/schema.proto b/backend/protos/xyz/block/ftl/v1/schema/schema.proto
@@ -16,7 +16,8 @@ message AWSIAMAuthDatabaseConnector {
 }
 
 enum AliasKind {
-  ALIAS_KIND_JSON = 0;
+  ALIAS_KIND_UNSPECIFIED = 0;
+  ALIAS_KIND_JSON = 1;
 }
 
 message Any {
@@ -121,8 +122,9 @@ message Float {
 }
 
 enum FromOffset {
-  FROM_OFFSET_BEGINNING = 0;
-  FROM_OFFSET_LATEST = 1;
+  FROM_OFFSET_UNSPECIFIED = 0;
+  FROM_OFFSET_BEGINNING = 1;
+  FROM_OFFSET_LATEST = 2;
 }
 
 message IngressPathComponent {

diff --git a/frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts b/frontend/console/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts
diff --git a/internal/schema/aliaskind_enumer.go b/internal/schema/aliaskind_enumer.go
diff --git a/internal/schema/metadataalias.go b/internal/schema/metadataalias.go
@@ -14,7 +14,8 @@ import (
 type AliasKind int
 
 const (
-	AliasKindJson AliasKind = iota //nolint
+	AliasKindUnspecified AliasKind = iota
+	AliasKindJson                  //nolint
 )
 
 //protobuf:5

diff --git a/internal/schema/metadatasubscriber.go b/internal/schema/metadatasubscriber.go
@@ -12,7 +12,8 @@ import (
 type FromOffset int
 
 const (
-	FromOffsetBeginning FromOffset = iota
+	FromOffsetUnspecified FromOffset = iota
+	FromOffsetBeginning
 	FromOffsetLatest
 )
 
@@ -35,7 +36,7 @@ func (o FromOffset) String() string {
 	case FromOffsetLatest:
 		return "latest"
 	default:
-		panic("unexpected value")
+		panic(fmt.Sprintf("unexpected value %d", o))
 	}
 }
 

diff --git a/internal/schema/schema_test.go b/internal/schema/schema_test.go
@@ -564,6 +564,7 @@ func TestParsing(t *testing.T) {
 										Module: "test",
 										Name:   "topicB",
 									},
+									FromOffset: FromOffsetBeginning,
 									DeadLetter: true,
 								},
 								&MetadataRetry{

diff --git a/python-runtime/ftl/src/ftl/protos/xyz/block/ftl/v1/schema/schema_pb2.py b/python-runtime/ftl/src/ftl/protos/xyz/block/ftl/v1/schema/schema_pb2.py
diff --git a/python-runtime/ftl/src/ftl/protos/xyz/block/ftl/v1/schema/schema_pb2.pyi b/python-runtime/ftl/src/ftl/protos/xyz/block/ftl/v1/schema/schema_pb2.pyi