gapic-generator 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b063888cabf4893087dcefa274cb8ab5a9469a762fc3dbb34af2e143cb1bcce4
-  data.tar.gz: 589dc9fdf67d63dc25fe62537783e6305e4441f51b5caa2c94a5b1a161e71ab7
+  metadata.gz: 78e591a0a5e9a24086ccfcf3227d7fe20dd2c0732f6ff7e4230b81ee48d0bcb6
+  data.tar.gz: 48b3b285796cd0bc3452ebf15797a8a1c54941aa79e4781588abc7f90b3aee8a
 SHA512:
-  metadata.gz: 07a03fd0adcc1640a37fa334883838aee76c124d2e5380a00d540751b3740e1b0f13d82a981ab35297c095df38620a0895bf4bb7bb5dbf1421c659e71cd92e85
-  data.tar.gz: 10269fc5c70542e1ae9ee1471eb6365c1669c741aa1ac03dbaf3b652cec2aee14801717589d1c45febc554b280cd8cd178ac19e02b1224b2692d1e98324142f6
+  metadata.gz: 2095d8bd87701b4b229a4f7c3c4ec2623a76b9c11c076068c5653d084881c68c44f23e96c9310f329bd2f64d3a91dd929a10656a1b19677e125d6555e70105cf
+  data.tar.gz: faeb9756320e9863dcede6634bd03c6024798871e3c8ebf083c65eb3bc917933806365d292303b436088b3371c43e86c5992e2cd1fdfed7465cd3f22e7562468

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History for gapic-generator
 
+### 0.6.2 / 2020-06-18
+
+* Support for the proto3_optional
+* Fixed an issue where tests for the oneof fields were not generating correctly
+* Removed ruby <2.5 pin for the protobuf dependency since new protobuf supports it again
+* Generated libraries now depend on gapic-common 0.3
+
 ### 0.6.1 / 2020-06-16
 
 * Add auto-generated disclaimer to generated tests.

data/gem_templates/dockerfile.erb

@@ -30,7 +30,7 @@ COPY --from=gcr.io/gapic-images/api-common-protos:beta /protos/ /workspace/commo
 COPY --from=builder /workspace/*.gem /workspace/
 
 # Install the subgenerator and other needed tools.
-RUN gem install grpc-tools gapic-generator-<%= gem_name %>.gem \
+RUN gem install --pre grpc-tools gapic-generator-<%= gem_name %>.gem \
     && rm gapic-generator-<%= gem_name %>.gem \
     && mkdir -p --mode=777 /.cache
 

data/gem_templates/entrypoint.erb

@@ -16,6 +16,7 @@ done
 
 mkdir -p /workspace/out/lib
 exec grpc_tools_ruby_protoc \
+        --experimental_allow_proto3_optional=1 \
         --proto_path=/workspace/common-protos/ --proto_path=/workspace/in/ \
         --ruby_out=/workspace/out/lib \
         --grpc_out=/workspace/out/lib \

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/lib/gapic/presenters/field_presenter.rb

@@ -80,6 +80,10 @@ module Gapic
         @field.enum?
       end
 
+      def proto3_optional?
+        @field.proto3_optional?
+      end
+
       def repeated?
         @field.repeated?
       end
@@ -88,6 +92,14 @@ module Gapic
         @field.map?
       end
 
+      def oneof?
+        @field.oneof?
+      end
+
+      def oneof_name
+        @message.oneof_decl[@field.oneof_index].name
+      end
+
       protected
 
       def field_doc_types field, output

data/lib/gapic/presenters/gem_presenter.rb

@@ -174,7 +174,7 @@ module Gapic
       end
 
       def dependencies
-        deps = { "gapic-common" => "~> 0.2" }
+        deps = { "gapic-common" => "~> 0.3" }
         deps["grpc-google-iam-v1"] = [">= 0.6.10", "< 2.0"] if iam_dependency?
         extra_deps = gem_config :extra_dependencies
         deps.merge! extra_deps if extra_deps

data/lib/gapic/presenters/method_presenter.rb

@@ -92,6 +92,11 @@ module Gapic
         have_oneof = []
 
         @method.input.fields.each do |field|
+          unless field.oneof?
+            selected_fields << field
+            next
+          end
+
           idx = field.oneof_index
           selected_fields << field unless have_oneof.include? idx
           have_oneof << idx

data/lib/gapic/runner.rb

@@ -48,8 +48,10 @@ module Gapic
       output_files = generator.new(api).generate
 
       # Create and write the response
-      Google::Protobuf::Compiler::CodeGeneratorResponse.new \
+      response = Google::Protobuf::Compiler::CodeGeneratorResponse.new \
         file: output_files
+      response.supported_features = Google::Protobuf::Compiler::CodeGeneratorResponse::FEATURE_PROTO3_OPTIONAL
+      response
     end
 
     # Run protoc generation.

data/lib/gapic/schema/wrappers.rb

@@ -655,6 +655,15 @@ module Gapic
         field_behavior.include? Google::Api::FieldBehavior::OPTIONAL
       end
 
+      # Denotes a field as a part of oneof.
+      # oneof_index is an int field so it'll be 0 by default for every field
+      # and an index in the message's oneof table for the oneof fields
+      # but since the indexes in the message's oneof table start with 0 as well
+      # we need this to determine whether the field is a part of the oneof
+      def oneof?
+        @descriptor.field? :oneof_index
+      end
+
       # Denotes a field as required. This indicates that the field **must** be
       # provided as part of the request, and failure to do so will cause an
       # error (usually `INVALID_ARGUMENT`).
@@ -731,7 +740,8 @@ module Gapic
         :default_value,
         :oneof_index,
         :json_name,
-        :options
+        :options,
+        :proto3_optional?
       )
     end
 

data/lib/google/protobuf/compiler/plugin.pb.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 ##
-# This file is auto-generated. DO NOT EDIT!
+# This file was auto-generated initially but now is hand-edited to add support 
+# for response features and proto3_optional
 #
 require 'protobuf'
 
@@ -54,6 +55,8 @@ module Google
       end
 
       class CodeGeneratorResponse
+        FEATURE_PROTO3_OPTIONAL = 1
+
         class File
           optional :string, :name, 1
           optional :string, :insertion_point, 2
@@ -61,6 +64,7 @@ module Google
         end
 
         optional :string, :error, 1
+        optional :int32, :supported_features, 2
         repeated ::Google::Protobuf::Compiler::CodeGeneratorResponse::File, :file, 15
       end
 

data/lib/google/protobuf/descriptor.pb.rb

@@ -190,6 +190,7 @@ module Google
       optional :int32, :oneof_index, 9
       optional :string, :json_name, 10
       optional ::Google::Protobuf::FieldOptions, :options, 8
+      optional :bool, :proto3_optional, 17
     end
 
     class OneofDescriptorProto

data/templates/default/gem/gemfile.erb

@@ -2,6 +2,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-# google-protobuf 3.12.0 requires Ruby 2.5 or later, so pin to 3.11 on older Rubies
-gem "google-protobuf", (RUBY_VERSION < "2.5" ? "~> 3.11.4" : "~> 3.12")

data/templates/default/service/test/method/_bidi.erb

@@ -93,6 +93,12 @@ def test_<%= method.name %>
         <%- else -%>
         assert_equal <%= field.default_value %>, r.<%= field.name %>
         <%- end -%>
+        <%- if field.oneof? && !field.proto3_optional? -%>
+        assert_equal :<%= field.name %>, r.<%= field.oneof_name %>
+        <%- end -%>
+        <%- if field.proto3_optional? -%>
+        assert r.has_<%= field.name %>?
+        <%- end -%>
         <%- end -%>
       end
     end

data/templates/default/service/test/method/_client.erb

@@ -77,6 +77,12 @@ def test_<%= method.name %>
         <%- else -%>
         assert_equal <%= field.default_value %>, r.<%= field.name %>
         <%- end -%>
+        <%- if field.oneof? && !field.proto3_optional? -%>
+        assert_equal :<%= field.name %>, r.<%= field.oneof_name %>
+        <%- end -%>
+        <%- if field.proto3_optional? -%>
+        assert r.has_<%= field.name %>?
+        <%- end -%>
         <%- end -%>
       end
     end

data/templates/default/service/test/method/_normal.erb

@@ -26,6 +26,12 @@ def test_<%= method.name %>
     <%- else -%>
     assert_equal <%= field.default_value %>, request.<%= field.name %>
     <%- end -%>
+    <%- if field.oneof? && !field.proto3_optional? -%>
+    assert_equal :<%= field.name %>, request.<%= field.oneof_name %>
+    <%- end -%>
+    <%- if field.proto3_optional? -%>
+    assert request.has_<%= field.name %>?
+    <%- end -%>
     <%- end -%>
     refute_nil options
   end

data/templates/default/service/test/method/_server.erb

@@ -24,6 +24,12 @@ def test_<%= method.name %>
     <%- else -%>
     assert_equal <%= field.default_value %>, request.<%= field.name %>
     <%- end -%>
+    <%- if field.oneof? && !field.proto3_optional? -%>
+    assert_equal :<%= field.name %>, request.<%= field.oneof_name %>
+    <%- end -%>
+    <%- if field.proto3_optional? -%>
+    assert request.has_<%= field.name %>?
+    <%- end -%>
     <%- end -%>
     refute_nil options
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.30.0.pre1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement