Test protobuf import stability

Author: jwils

elasticgraph-proto_ingestion/lib/elastic_graph/proto_ingestion/schema_definition/schema_elements/scalar_type_extension.rb

@@ -63,7 +63,11 @@ def protobuf(type:, import: nil, comment: nil)
           def initialize_proto_extension
             original_name = type_ref.with_reverted_override.name
             if (proto_options = BUILT_IN_SCALAR_PROTO_OPTIONS_BY_NAME[original_name])
-              protobuf(**proto_options)
+              protobuf(
+                type: proto_options.fetch(:type),
+                import: proto_options[:import],
+                comment: proto_options[:comment]
+              )
             end
 
             yield

elasticgraph-proto_ingestion/spec/unit/elastic_graph/proto_ingestion/schema_definition/api_extension_spec.rb

@@ -32,22 +32,22 @@ module SchemaDefinition
         end
 
         it "maps every built-in scalar to a proto field type" do
+          built_in_scalar_options = SchemaElements::ScalarTypeExtension::BUILT_IN_SCALAR_PROTO_OPTIONS_BY_NAME
           field_types = []
           proto = define_proto_schema do |s|
             s.object_type "Widget" do |t|
-              SchemaElements::ScalarTypeExtension::BUILT_IN_SCALAR_PROTO_OPTIONS_BY_NAME.each_key do |type_name|
+              built_in_scalar_options.each_key do |type_name|
                 t.field type_name.downcase, type_name
               end
               field_types = t.graphql_fields_by_name.values.map { |field| field.type.name }
               t.index "widgets"
             end
           end
 
-          proto_options_by_name = SchemaElements::ScalarTypeExtension::BUILT_IN_SCALAR_PROTO_OPTIONS_BY_NAME
-          expect(field_types).to match_array(proto_options_by_name.keys)
+          expect(field_types).to match_array(built_in_scalar_options.keys)
           expect(proto).to include('import "google/protobuf/timestamp.proto";')
-          proto_options_by_name.each.with_index(1) do |(type_name, proto_options), field_number|
-            expect(proto).to include("#{proto_options.fetch(:type)} #{type_name.downcase} = #{field_number};")
+          built_in_scalar_options.each.with_index(1) do |(type_name, options), field_number|
+            expect(proto).to include("#{options.fetch(:type)} #{type_name.downcase} = #{field_number};")
           end
         end
 

elasticgraph-proto_ingestion/spec/unit/elastic_graph/proto_ingestion/schema_definition/schema_spec.rb

@@ -267,6 +267,38 @@ module SchemaDefinition
           PROTO
         end
 
+        it "sorts and de-duplicates imports shared by distinct protobuf types" do
+          proto = define_proto_schema do |s|
+            s.scalar_type "FirstZType" do |t|
+              t.mapping type: "keyword"
+              t.protobuf type: "example.FirstZType", import: "z/types.proto"
+            end
+
+            s.scalar_type "SecondZType" do |t|
+              t.mapping type: "keyword"
+              t.protobuf type: "example.SecondZType", import: "z/types.proto"
+            end
+
+            s.scalar_type "AType" do |t|
+              t.mapping type: "keyword"
+              t.protobuf type: "example.AType", import: "a/types.proto"
+            end
+
+            s.object_type "Event" do |t|
+              t.field "id", "ID"
+              t.field "first_z", "FirstZType"
+              t.field "second_z", "SecondZType"
+              t.field "a", "AType"
+              t.index "events"
+            end
+          end
+
+          expect(proto.lines.grep(/\Aimport /).map(&:chomp)).to eq([
+            %(import "a/types.proto";),
+            %(import "z/types.proto";)
+          ])
+        end
+
         it "renders format comments on fields whose scalar type documents one" do
           proto = define_proto_schema do |s|
             s.object_type "Person" do |t|