move options up from under sf.substreams.v1, cleanup

streamingfast · Sep 21, 2023 · deb3a28 · deb3a28
1 parent d079e63
commit deb3a28
Show file tree

Hide file tree

Showing 9 changed files with 230 additions and 234 deletions.
diff --git a/docs/release-notes/change-log.md b/docs/release-notes/change-log.md
@@ -16,9 +16,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
   Example: 
   ```
   import "sf/substreams/v1/options.proto";
-  optional bytes schema = 1 [ (sf.substreams.v1.options).load_from_file = true ];`
-  optional bytes extra_config_files = 2 [ (sf.substreams.v1.options).zip_from_folder = true ];`
+
+  message HostedPostgresDatabase {
+    bytes schema = 1 [ (sf.substreams.v1.options).load_from_file = true ];
+    bytes extra_config_files = 2 [ (sf.substreams.v1.options).zip_from_folder = true ];
+  }
   ```
+
 * `substreams info` command now properly displays the sink configs, optionally writing the bytes fields to disk with `--dump-sinkconfig-bytes-to-disk` flag
 
 ### Removed

diff --git a/manifest/sink.go b/manifest/sink.go
@@ -19,7 +19,6 @@ import (
 	"github.com/jhump/protoreflect/desc"
 	"github.com/jhump/protoreflect/dynamic"
 	"go.uber.org/zap"
-	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/descriptorpb"
 	"google.golang.org/protobuf/types/known/anypb"
 
@@ -91,15 +90,9 @@ func SinkConfigAsString(pkg *pbsubstreams.Package, dumpBytesToDisk bool) (string
 			key: fd.GetJSONName(),
 		}
 		if opts := fd.GetFieldOptions(); opts != nil {
-			opts.ProtoReflect().Range(func(desc protoreflect.FieldDescriptor, val protoreflect.Value) bool {
-				if desc.TextName() != "[sf.substreams.v1.options]" {
-					return true
-				}
-				opts := val.Message().Interface().(*pbsubstreams.FieldOptions)
-				field.opts = opts
-
-				return true
-			})
+			if val := opts.ProtoReflect().Get(pbsubstreams.E_Options.TypeDescriptor()); val.IsValid() {
+				field.opts = val.Message().Interface().(*pbsubstreams.FieldOptions)
+			}
 		}
 		val, err := dynMsg.TryGetField(fd)
 		if err != nil {
@@ -139,7 +132,7 @@ func (f *fieldAndValue) String(dumpBytesToDisk bool) string {
 			if _, err := file.Write(val); err != nil {
 				zlog.Error("writing data to file", zap.Error(err))
 			}
-            suffix += " -> written to " + file.Name()
+			suffix += " -> written to " + file.Name()
 		}
 
 		return fmt.Sprintf("  - %v: (%d bytes) MD5SUM: %v %v", f.key, len(val), sum, suffix)
@@ -168,13 +161,9 @@ func fieldResolver(msgDesc *desc.MessageDescriptor) func(string) (opts *pbsubstr
 			if fd.GetFullyQualifiedJSONName() == fqdn {
 				isBytes := fd.GetType() == descriptorpb.FieldDescriptorProto_TYPE_BYTES
 				if opts := fd.GetFieldOptions(); opts != nil {
-					opts.ProtoReflect().Range(func(desc protoreflect.FieldDescriptor, val protoreflect.Value) bool {
-						if desc.TextName() != "[sf.substreams.v1.options]" {
-							return true
-						}
+					if val := opts.ProtoReflect().Get(pbsubstreams.E_Options.TypeDescriptor()); val.IsValid() {
 						options = val.Message().Interface().(*pbsubstreams.FieldOptions)
-						return false
-					})
+					}
 				}
 				return options, isBytes
 			}
@@ -300,7 +289,10 @@ func addFiles(w *zip.Writer, basePath string) error {
 		if err != nil {
 			return err
 		}
-		path = strings.Replace(strings.TrimPrefix(strings.TrimPrefix(path, basePath), string(filepath.Separator)), "\\", "/", -1)
+
+		path = strings.TrimPrefix(path, basePath)                   // relative path
+		path = strings.TrimPrefix(path, string(filepath.Separator)) // ensure we don't start with a slash
+		path = strings.Replace(path, "\\", "/", -1)                 // w.Create does not support windows-style separators
 
 		if info.IsDir() {
 			path += fmt.Sprintf("%s%c", path, os.PathSeparator)

diff --git a/pb/generate.sh b/pb/generate.sh
@@ -48,9 +48,9 @@ function generate_system() {
   fi
 
   protoc -I$PROTO \
+    "$PROTO/sf/substreams/options.proto" \
     "$PROTO/sf/substreams/v1/modules.proto" \
     "$PROTO/sf/substreams/v1/package.proto" \
-    "$PROTO/sf/substreams/v1/options.proto" \
     "$PROTO/sf/substreams/v1/clock.proto" \
     "$PROTO/sf/substreams/rpc/v2/service.proto" \
     "$PROTO/google/protobuf/any.proto" \

diff --git a/pb/last_generate.txt b/pb/last_generate.txt
@@ -1,2 +1,2 @@
-generate.sh - Mon 18 Sep 2023 15:04:30 EDT - stepd
-streamingfast/proto revision: 2899868ddee59b2d3d398dffa99561c7a84c8c37
+generate.sh - Thu 21 Sep 2023 14:20:48 EDT - stepd
+streamingfast/proto revision: d079e6342b6e1a9297b594476dedf98b0d82e0a8
diff --git a/pb/sf/substreams/options.pb.go b/pb/sf/substreams/options.pb.go