gapic-generator 0.6.10 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd38043485e7ffbb2e8edf375019429972c5ac01b8be85803c5f6f9518b06c5
-  data.tar.gz: 23312fda7203a549f3e2f714df2ef73a0d71aea1aae369104de8ba079d4746c1
+  metadata.gz: 4b0b5fd921abe9618575956f3eaed4ea23ffbf578c29570934c29a76decdf6cd
+  data.tar.gz: cda02cc92c2249e60b7f1692c2b514ac672b49ff46fc52d543ba4d0e133f4308
 SHA512:
-  metadata.gz: cef8f93df7ca8b3207815a9c8239eeea6fb783265943d6ec22b246945582df439ddad1419a1783df8c0c1a3e432194a8ddb204c08856ac67dce5abb030ede394
-  data.tar.gz: 82df4fc573990154f629711aa9829d0c8aa6aacb2df34bcff9cff140dd5049de1f135325c5df089ca9b6b9188fae415e1bad351df8e6904bc1e071c0ae3ee63b
+  metadata.gz: 6c3c62bb7d3f29cff6ea57b9b959214ee81f79449d649ae87f95171aad06450f000fda15784d33231418d47729eecc4b4130a4bf16cad95b1d76bac48994fa89
+  data.tar.gz: c2500d8e7458361e6450cb661c5380075af7a24a3c5063cdc1e237bfeb7fc1c4083dcb5a6a7f7b8cef3b9242e5bc99089ba2d7a651ddd68cbf720ab91bb81478

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Release History for gapic-generator
 
+### 0.6.15 / 2021-02-22
+
+* Really fixed encoding arguments in executable entrypoints
+
+### 0.6.14 / 2021-02-22
+
+* Fixed encoding arguments in executable entrypoints
+
+### 0.6.13 / 2021-02-22
+
+* Remove InputOnly and OutputOnly proto tags from docs to avoid confusing YARD.
+* Generate drift manifest.
+* Executable entrypoints set the default external locale to utf-8.
+
+### 0.6.12 / 2021-02-01
+
+* No changes.
+
+### 0.6.11 / 2021-02-01
+
+* Generated clients determine whether to use self-signed JWT credentials.
+
 ### 0.6.10 / 2021-01-13
 
 * A set of human-readable command-line parameters can now be specified for the gapic-generator, e.g. `gem-name`. These parameters strictly duplicate the existing behaviour of old command-line parameters, e.g. `:gem.:name`.

data/bin/protoc-gen-ruby_gapic

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env -S ruby -EUTF-8
 # frozen_string_literal: true
 
 # Copyright 2018 Google LLC

data/lib/gapic/formatting_utils.rb

@@ -24,6 +24,7 @@ module Gapic
     @brace_detector = /\A(?<pre>[^`]*(`[^`]*`[^`]*)*[^`\\])?\{(?<inside>[^\s][^}]*)\}(?<post>.*)\z/m
     @xref_detector = /\A(?<pre>[^`]*(`[^`]*`[^`]*)*)?\[(?<text>[\w\. `-]+)\]\[(?<addr>[\w\.]+)\](?<post>.*)\z/m
     @list_element_detector = /\A\s*(\*|\+|-|[0-9a-zA-Z]+\.)\s/
+    @omit_lines = ["@InputOnly\n", "@OutputOnly\n"]
 
     class << self
       ##
@@ -49,7 +50,7 @@ module Gapic
         # preformatted.
         in_block = nil
         base_indent = 0
-        lines.map do |line|
+        (lines - @omit_lines).map do |line|
           indent = line_indent line
           if indent.nil?
             in_block = nil

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.6.10"
+    VERSION = "0.6.15"
   end
 end

data/lib/gapic/generators/default_generator.rb

@@ -65,18 +65,19 @@ module Gapic
         end
 
         # Gem level files
-        files << g("gem/gitignore.erb",   ".gitignore",                   gem: gem)
-        files << g("gem/version.erb",     "lib/#{gem.version_file_path}", gem: gem)
-        files << g("gem/test_helper.erb", "test/helper.rb",               gem: gem)
-        files << g("gem/gemspec.erb",     "#{gem.name}.gemspec",          gem: gem)
-        files << g("gem/gemfile.erb",     "Gemfile",                      gem: gem)
-        files << g("gem/rakefile.erb",    "Rakefile",                     gem: gem)
-        files << g("gem/readme.erb",      "README.md",                    gem: gem)
-        files << g("gem/changelog.erb",   "CHANGELOG.md",                 gem: gem)
-        files << g("gem/rubocop.erb",     ".rubocop.yml",                 gem: gem)
-        files << g("gem/yardopts.erb",    ".yardopts",                    gem: gem)
-        files << g("gem/license.erb",     "LICENSE.md",                   gem: gem)
-        files << g("gem/entrypoint.erb",  "lib/#{gem.name}.rb",           gem: gem)
+        files << g("gem/gitignore.erb",             ".gitignore",                   gem: gem)
+        files << g("gem/version.erb",               "lib/#{gem.version_file_path}", gem: gem)
+        files << g("gem/test_helper.erb",           "test/helper.rb",               gem: gem)
+        files << g("gem/gemspec.erb",               "#{gem.name}.gemspec",          gem: gem)
+        files << g("gem/gemfile.erb",               "Gemfile",                      gem: gem)
+        files << g("gem/rakefile.erb",              "Rakefile",                     gem: gem)
+        files << g("gem/readme.erb",                "README.md",                    gem: gem)
+        files << g("gem/changelog.erb",             "CHANGELOG.md",                 gem: gem)
+        files << g("gem/rubocop.erb",               ".rubocop.yml",                 gem: gem)
+        files << g("gem/yardopts.erb",              ".yardopts",                    gem: gem)
+        files << g("gem/license.erb",               "LICENSE.md",                   gem: gem)
+        files << g("gem/entrypoint.erb",            "lib/#{gem.name}.rb",           gem: gem)
+        files << g("gem/gapic_metadata_json.erb",   "gapic_metadata.json",          gem: gem)
 
         gem.proto_files.each do |proto_file|
           files << g("proto_docs/proto_file.erb", "proto_docs/#{proto_file.docs_file_path}", file: proto_file)

data/lib/gapic/presenters/gem_presenter.rb

@@ -17,6 +17,8 @@
 require "gapic/helpers/filepath_helper"
 require "gapic/helpers/namespace_helper"
 
+require "json"
+
 module Gapic
   module Presenters
     ##
@@ -191,6 +193,27 @@ module Gapic
                     .sort_by { |name, _requirements| name }
       end
 
+      ##
+      # Returns a hash with a drift_manifest of
+      # a first package in this gem
+      # (while the behaviour in case of multiple packages is clarified).
+      # See https://github.com/googleapis/googleapis/blob/master/gapic/metadata/gapic_metadata.proto
+      #
+      # @return [Hash]
+      def first_package_drift_manifest
+        return {} unless packages?
+        packages[0].drift_manifest
+      end
+
+      ##
+      # Returns a drift manifest of the first package in
+      # a pretty JSON string form
+      #
+      # @return [String]
+      def first_package_drift_json
+        JSON.pretty_generate first_package_drift_manifest
+      end
+
       private
 
       def gem_config key

data/lib/gapic/presenters/package_presenter.rb

@@ -99,6 +99,24 @@ module Gapic
       def helpers_require
         package_require + "/_helpers"
       end
+
+      ##
+      # Returns a hash with a drift_manifest of this package
+      # describing correspondence between the proto description
+      # of the package with the generated code for the package.
+      # See https://github.com/googleapis/googleapis/blob/master/gapic/metadata/gapic_metadata.proto
+      #
+      # @return [Hash]
+      def drift_manifest
+        {
+          schema:         "1.0",
+          comment:        "This file maps proto services/RPCs to the corresponding library clients/methods",
+          language:       "ruby",
+          protoPackage:   name,
+          libraryPackage: namespace,
+          services:       services.map { |s| [s.grpc_service_name, s.drift_manifest] }.to_h
+        }
+      end
     end
   end
 end

data/lib/gapic/presenters/service_presenter.rb

@@ -333,10 +333,40 @@ module Gapic
         @api.grpc_service_config.service_level_configs[grpc_full_name]
       end
 
+      ##
+      # The short proto name for this service
+      #
+      # @return [String]
+      def grpc_service_name
+        @service.name
+      end
+
       def grpc_full_name
         @service.address.join "."
       end
 
+      ##
+      # Returns a hash with a drift_manifest of this service,
+      # describing correspondence between the proto description
+      # of the service with the generated code for the service.
+      # See https://github.com/googleapis/googleapis/blob/master/gapic/metadata/gapic_metadata.proto
+      #
+      # @return [Hash]
+      def drift_manifest
+        {
+          clients: {
+            grpc: {
+              libraryClient: client_name_full,
+              # The methods should grouped by grpc_method_name and then
+              # their names are returned together in an array.
+              # For Ruby currently we have 1:1 proto to code
+              # correspondence for methods, so our generation is easier
+              methods:       methods.map { |m| [m.grpc_method_name, [m.name]] }.to_h
+            }
+          }
+        }
+      end
+
       private
 
       def default_config key

data/templates/default/gem/gapic_metadata_json.erb

@@ -0,0 +1,2 @@
+<%- assert_locals gem -%>
+<%= gem.first_package_drift_json %>

data/templates/default/service/client/_client.erb

@@ -97,7 +97,13 @@ class <%= service.client_name %>
     # Create credentials
     credentials = @config.credentials
     <%- unless service.generic_endpoint? -%>
-    credentials ||= Credentials.default scope: @config.scope
+    # Use self-signed JWT if the scope and endpoint are unchanged from default,
+    # but only if the default endpoint does not have a region prefix.
+    enable_self_signed_jwt = @config.scope == <%= service.client_name %>.configure.scope &&
+                             @config.endpoint == <%= service.client_name %>.configure.endpoint &&
+                             !@config.endpoint.split(".").first.include?("-")
+    credentials ||= Credentials.default scope: @config.scope,
+                                        enable_self_signed_jwt: enable_self_signed_jwt
     if credentials.is_a?(String) || credentials.is_a?(Hash)
       credentials = Credentials.new credentials, scope: @config.scope
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.15
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -246,6 +246,7 @@ files:
 - templates/default/gem/_version.erb
 - templates/default/gem/changelog.erb
 - templates/default/gem/entrypoint.erb
+- templates/default/gem/gapic_metadata_json.erb
 - templates/default/gem/gemfile.erb
 - templates/default/gem/gemspec.erb
 - templates/default/gem/gitignore.erb
@@ -347,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: An API Client Generator for Ruby in Ruby!