Discard unknown fields when parsing Feed configs

cedarbaum · Aug 22, 2023 · 196758d · 196758d
1 parent 9db9070
commit 196758d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/internal/admin/admin.go b/internal/admin/admin.go
@@ -12,6 +12,7 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/jamespfennell/transiter/internal/convert"
 	"github.com/jamespfennell/transiter/internal/db/constants"
 	"github.com/jamespfennell/transiter/internal/gen/api"
 	"github.com/jamespfennell/transiter/internal/gen/db"
@@ -62,7 +63,7 @@ func (s *Service) GetSystemConfig(ctx context.Context, req *api.GetSystemConfigR
 		for _, feed := range feeds {
 			feed := feed
 			var feedConfig api.FeedConfig
-			if err := protojson.Unmarshal([]byte(feed.Config), &feedConfig); err != nil {
+			if err := convert.UnmarshalJSONAndDiscardUnknown([]byte(feed.Config), &feedConfig); err != nil {
 				return err
 			}
 			reply.Feeds = append(reply.Feeds, &feedConfig)

diff --git a/internal/convert/json.go b/internal/convert/json.go
@@ -0,0 +1,12 @@
+package convert
+
+import (
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
+)
+
+func UnmarshalJSONAndDiscardUnknown(b []byte, m proto.Message) error {
+	return protojson.UnmarshalOptions{
+		DiscardUnknown: true,
+	}.Unmarshal(b, m)
+}
diff --git a/internal/update/common/common.go b/internal/update/common/common.go
@@ -9,6 +9,7 @@ import (
 	"github.com/jamespfennell/transiter/internal/gen/api"
 	"github.com/jamespfennell/transiter/internal/gen/db"
 	"golang.org/x/exp/slog"
+	"google.golang.org/protobuf/proto"
 )
 
 type UpdateContext struct {
@@ -46,3 +47,10 @@ func MapKeys[T comparable, V any](in map[T]V) []T {
 	}
 	return out
 }
+
+func UnmarshallAndDiscardUnknown(b []byte, m proto.Message) error {
+	unmarshalOptions := proto.UnmarshalOptions{
+		DiscardUnknown: true,
+	}
+	return unmarshalOptions.Unmarshal(b, m)
+}
diff --git a/internal/update/update.go b/internal/update/update.go
@@ -13,6 +13,7 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jamespfennell/gtfs"
+	"github.com/jamespfennell/transiter/internal/convert"
 	"github.com/jamespfennell/transiter/internal/gen/api"
 	"github.com/jamespfennell/transiter/internal/gen/db"
 	"github.com/jamespfennell/transiter/internal/monitoring"
@@ -22,7 +23,6 @@ import (
 	"github.com/jamespfennell/transiter/internal/update/realtime"
 	"github.com/jamespfennell/transiter/internal/update/static"
 	"golang.org/x/exp/slog"
-	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -119,7 +119,7 @@ func markSuccess(feedUpdate *api.FeedUpdate, status api.FeedUpdate_Status) (*api
 func run(ctx context.Context, pool *pgxpool.Pool, logger *slog.Logger, systemID string, feed db.Feed, force bool) (*api.FeedUpdate, error) {
 	feedUpdate := &api.FeedUpdate{}
 	var feedConfig api.FeedConfig
-	if err := protojson.Unmarshal([]byte(feed.Config), &feedConfig); err != nil {
+	if err := convert.UnmarshalJSONAndDiscardUnknown([]byte(feed.Config), &feedConfig); err != nil {
 		return markFailure(feedUpdate, api.FeedUpdate_FAILED_INVALID_FEED_CONFIG, fmt.Errorf("failed to parse feed config: %w", err))
 	}
 	NormalizeFeedConfig(&feedConfig)