google-api-client 0.45.0 → 0.47.0

data/Gemfile

@@ -23,6 +23,7 @@ group :development do
   gem 'logging', '~> 2.2'
   gem 'opencensus', '~> 0.4'
   gem 'httparty'
+  gem 'gems', '~> 1.2'
 end
 
 platforms :jruby do

data/Rakefile

@@ -79,10 +79,28 @@ namespace :kokoro do
   end
 
   task :release do
-    # Until code generation process is updated and release-please is set up, just publish docs
-    require_relative "rakelib/devsite/devsite_builder.rb"
+    Rake::Task["kokoro:publish_gem"].invoke
+    Rake::Task["kokoro:publish_docs"].invoke
+  end
+
+  task :publish_gem do
+    require "gems"
+
+    load_env_vars if ENV["KOKORO_GFILE_DIR"]
+    api_token = ENV["RUBYGEMS_API_TOKEN"]
+    if api_token
+      ::Gems.configure do |config|
+        config.key = api_token
+      end
+    end
+
+    rm_rf "pkg"
+    Rake::Task["build"].invoke
+    built_gem_path = Dir.glob("pkg/google-api-client-*.gem").last
 
-    DevsiteBuilder.new.publish_if_missing ENV["DOCS_BUILD_TAG"]
+    response = ::Gems.push File.new built_gem_path
+    puts response
+    raise "Failed to release gem" unless response.include? "Successfully registered gem:"
   end
 
   desc "Publish docs for the latest git tag"
@@ -93,6 +111,16 @@ namespace :kokoro do
   end
 end
 
+def load_env_vars
+  service_account = "#{ENV['KOKORO_GFILE_DIR']}/service-account.json"
+  raise "#{service_account} is not a file" unless File.file? service_account
+  ENV["GOOGLE_APPLICATION_CREDENTIALS"] = service_account
+  filename = "#{ENV['KOKORO_GFILE_DIR']}/ruby_env_vars.json"
+  raise "#{filename} is not a file" unless File.file? filename
+  env_vars = JSON.parse File.read(filename)
+  env_vars.each { |k, v| ENV[k] ||= v }
+end
+
 def header str, token = "#"
   line_length = str.length + 8
   puts

data/api_list_config.yaml

@@ -1 +1,9 @@
+include:
+  - name: appsmarket
+    version: v2
+    discovery_rest_url: https://content.googleapis.com/discovery/v1/apis/appsmarket/v2/rest
+  - name: youtubePartner
+    version: v1
+    discovery_rest_url: https://content.googleapis.com/discovery/v1/apis/youtubePartner/v1/rest
 exclude: []
+pause: []

data/bin/generate-api

@@ -28,32 +28,34 @@ module Google
 
     desc 'gen OUTDIR', 'Generate ruby API from an API description'
     method_options url: :array, file: :array, from_discovery: :boolean, preferred_only: :boolean,
-                   verbose: :boolean, names: :string, names_out: :string
+                   verbose: :boolean, names: :string, names_out: :string, api: :string, clean: :boolean
     def gen(dir)
       ensure_active_support
       require 'google/apis/generator'
 
       self.destination_root = dir
       Google::Apis.logger.level = Logger::DEBUG if options[:verbose]
-      generate_from_url(options[:url]) if options[:url]
-      generate_from_file(options[:file]) if options[:file]
-      generate_from_discovery(preferred_only: options[:preferred_only]) if options[:from_discovery]
-      create_file(options[:names_out]) { |*| generator.dump_api_names } if options[:names_out]
+      count = 0
+      count += generate_from_url(options[:url]) if options[:url]
+      count += generate_from_file(options[:file]) if options[:file]
+      count += generate_specific_apis(options[:api]) if options[:api]
+      count += generate_from_discovery(preferred_only: options[:preferred_only]) if options[:from_discovery]
+      count += clean_from_discovery if options[:clean]
+      create_file(options[:names_out]) { |*| generator.dump_api_names } if count > 0 && options[:names_out]
     end
 
     desc 'list', 'List public APIs'
     method_options verbose: :boolean, preferred_only: :boolean
     def list
       Google::Apis.logger.level = Logger::DEBUG if options[:verbose]
-      discovery = Discovery::DiscoveryService.new
-      apis = discovery.list_apis
-      apis.items.each do |api|
+      discovery_api_list.each do |api|
         say sprintf('%s - %s', api.id, api.description).strip unless options[:preferred_only] && !api.preferred?
       end
     end
 
     no_commands do
-      def generate_from_url(urls)
+      def generate_from_url(urls, first_only: false)
+        count = 0
         Array(urls).each do |url|
           begin
             json = discovery.http(:get, url)
@@ -62,7 +64,10 @@ module Google
             next
           end
           generate_api(json)
+          return 1 if first_only
+          count += 1
         end
+        count
       end
 
       def generate_from_file(files)
@@ -71,15 +76,38 @@ module Google
             generate_api(f.read)
           end
         end
+        Array(files).size
+      end
+
+      def generate_specific_apis(apis)
+        discovery_apis = discovery_api_list.each_with_object({}) do |api, hash|
+          hash["#{api.name}.#{api.version}"] = api
+        end
+        paused_apis = Array(api_list_config["pause"])
+        count = 0
+        Array(apis).each do |name_version|
+          api = discovery_apis[name_version]
+          if api.nil?
+            say "API #{api} is not in the discovery list."
+          elsif paused_apis.include? name_version
+            say "Ignoring paused API #{api.name} #{api.version}"
+          else
+            discovery_rest_url = "https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/#{api.name}.#{api.version}.json"
+            say sprintf('Loading %s, version %s from %s', api.name, api.version, discovery_rest_url)
+            generate_from_url([discovery_rest_url, api.discovery_rest_url], first_only: true)
+            count += 1
+          end
+        end
+        count
       end
 
       def generate_from_discovery(preferred_only: false)
         say 'Fetching API list'
-        apis = discovery.list_apis
-        exclude_apis = api_list_config["exclude"] || []
-        apis.items.each do |api|
-          if exclude_apis.include? "#{api.name}.#{api.version}"
-            say "Ignoring excluded API #{api.name} #{api.version}"
+        paused_apis = Array(api_list_config["pause"])
+        count = 0
+        discovery_api_list.each do |api|
+          if paused_apis.include? "#{api.name}.#{api.version}"
+            say "Ignoring paused API #{api.name} #{api.version}"
           elsif (preferred_only && !api.preferred?)
             say sprintf('Ignoring disoverable API %s', api.id)
           else
@@ -91,9 +119,27 @@ module Google
 	    # by the Discovery index.
             discovery_rest_url = "https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/#{api.name}.#{api.version}.json"
             say sprintf('Loading %s, version %s from %s', api.name, api.version, discovery_rest_url)
-            generate_from_url(discovery_rest_url)
+            generate_from_url([discovery_rest_url, api.discovery_rest_url], first_only: true)
+            count += 1
           end
         end
+        count
+      end
+
+      def clean_from_discovery
+        count = 0
+        apis = discovery_api_list.map { |api| "#{api.name.underscore}_#{api.version.tr '.', '_'}" }
+        Dir.chdir("#{destination_root}/google/apis") do
+          Dir.glob("*.rb").each do |filename|
+            filename = File.basename(filename, ".rb")
+            unless apis.include? filename
+              FileUtils.rm_r filename
+              FileUtils.rm "#{filename}.rb"
+              count += 1
+            end
+          end
+        end
+        count
       end
 
       def generate_api(json)
@@ -107,6 +153,20 @@ module Google
         @discovery ||= Discovery::DiscoveryService.new
       end
 
+      def discovery_api_list
+        @discovery_api_list ||= begin
+          items = discovery.list_apis.items
+          excluded = Array(api_list_config["exclude"])
+          items.delete_if { |item| excluded.include? "#{item.name}.#{item.version}" }
+          Array(api_list_config["include"]).each do |include_hash|
+            include_hash.symbolize_keys!
+            include_item = Discovery::DirectoryList::Item.new(**include_hash)
+            items << include_item unless items.any? { |item| item.name == include_item.name && item.version == include_item.version }
+          end
+          items
+        end
+      end
+
       def generator
         @generator ||= Google::Apis::Generator.new(api_names: options[:names], api_names_out: options[:names_out])
       end
@@ -117,7 +177,9 @@ module Google
 
       def ensure_active_support
         begin
+          require 'active_support'
           require 'active_support/inflector'
+          require 'active_support/core_ext'
         rescue LoadError => e
           error 'ActiveSupport is required, please run:'
           error 'gem install activesupport'

data/generated/google/apis/acceleratedmobilepageurl_v1.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/amp/cache/
     module AcceleratedmobilepageurlV1
       VERSION = 'V1'
-      REVISION = '20200215'
+      REVISION = '20200916'
     end
   end
 end

data/generated/google/apis/acceleratedmobilepageurl_v1/classes.rb

@@ -31,8 +31,8 @@ module Google
         # @return [String]
         attr_accessor :amp_url
       
-        # The [AMP Cache URL](/amp/cache/overview#amp-cache-url-format) pointing to
-        # the cached document in the Google AMP Cache.
+        # The [AMP Cache URL](/amp/cache/overview#amp-cache-url-format) pointing to the
+        # cached document in the Google AMP Cache.
         # Corresponds to the JSON property `cdnAmpUrl`
         # @return [String]
         attr_accessor :cdn_amp_url
@@ -94,9 +94,8 @@ module Google
         # @return [String]
         attr_accessor :lookup_strategy
       
-        # List of URLs to look up for the paired AMP URLs.
-        # The URLs are case-sensitive. Up to 50 URLs per lookup
-        # (see [Usage Limits](/amp/cache/reference/limits)).
+        # List of URLs to look up for the paired AMP URLs. The URLs are case-sensitive.
+        # Up to 50 URLs per lookup (see [Usage Limits](/amp/cache/reference/limits)).
         # Corresponds to the JSON property `urls`
         # @return [Array<String>]
         attr_accessor :urls
@@ -116,10 +115,9 @@ module Google
       class BatchGetAmpUrlsResponse
         include Google::Apis::Core::Hashable
       
-        # For each URL in BatchAmpUrlsRequest, the URL response. The response might
-        # not be in the same order as URLs in the batch request.
-        # If BatchAmpUrlsRequest contains duplicate URLs, AmpUrl is generated
-        # only once.
+        # For each URL in BatchAmpUrlsRequest, the URL response. The response might not
+        # be in the same order as URLs in the batch request. If BatchAmpUrlsRequest
+        # contains duplicate URLs, AmpUrl is generated only once.
         # Corresponds to the JSON property `ampUrls`
         # @return [Array<Google::Apis::AcceleratedmobilepageurlV1::AmpUrl>]
         attr_accessor :amp_urls

data/generated/google/apis/acceleratedmobilepageurl_v1/service.rb

@@ -48,8 +48,8 @@ module Google
           @batch_path = 'batch'
         end
         
-        # Returns AMP URL(s) and equivalent
-        # [AMP Cache URL(s)](/amp/cache/overview#amp-cache-url-format).
+        # Returns AMP URL(s) and equivalent [AMP Cache URL(s)](/amp/cache/overview#amp-
+        # cache-url-format).
         # @param [Google::Apis::AcceleratedmobilepageurlV1::BatchGetAmpUrlsRequest] batch_get_amp_urls_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.

data/generated/google/apis/accessapproval_v1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/access-approval/docs
     module AccessapprovalV1
       VERSION = 'V1'
-      REVISION = '20200903'
+      REVISION = '20201014'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/accessapproval_v1/classes.rb

@@ -49,9 +49,9 @@ module Google
         # @return [Array<Google::Apis::AccessapprovalV1::EnrolledService>]
         attr_accessor :enrolled_services
       
-        # The resource name of the settings. Format is one of: 1. "projects/`project_id`/
-        # accessApprovalSettings" 2. "folders/`folder_id`/accessApprovalSettings" 3. "
-        # organizations/`organization_id`/accessApprovalSettings"
+        # The resource name of the settings. Format is one of: * "projects/`project`/
+        # accessApprovalSettings" * "folders/`folder`/accessApprovalSettings" * "
+        # organizations/`organization`/accessApprovalSettings"
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -84,9 +84,9 @@ module Google
         # The "home office" location of the principal. A two-letter country code (ISO
         # 3166-1 alpha-2), such as "US", "DE" or "GB" or a region code. In some limited
         # situations Google systems may refer refer to a region code instead of a
-        # country code. Possible Region Codes: 1. ASI: Asia 2. EUR: Europe 3. OCE:
-        # Oceania 4. AFR: Africa 5. NAM: North America 6. SAM: South America 7. ANT:
-        # Antarctica 8. ANY: Any location
+        # country code. Possible Region Codes: * ASI: Asia * EUR: Europe * OCE: Oceania *
+        # AFR: Africa * NAM: North America * SAM: South America * ANT: Antarctica * ANY:
+        # Any location
         # Corresponds to the JSON property `principalOfficeCountry`
         # @return [String]
         attr_accessor :principal_office_country
@@ -94,9 +94,9 @@ module Google
         # Physical location of the principal at the time of the access. A two-letter
         # country code (ISO 3166-1 alpha-2), such as "US", "DE" or "GB" or a region code.
         # In some limited situations Google systems may refer refer to a region code
-        # instead of a country code. Possible Region Codes: 1. ASI: Asia 2. EUR: Europe
-        # 3. OCE: Oceania 4. AFR: Africa 5. NAM: North America 6. SAM: South America 7.
-        # ANT: Antarctica 8. ANY: Any location
+        # instead of a country code. Possible Region Codes: * ASI: Asia * EUR: Europe *
+        # OCE: Oceania * AFR: Africa * NAM: North America * SAM: South America * ANT:
+        # Antarctica * ANY: Any location
         # Corresponds to the JSON property `principalPhysicalLocationCountry`
         # @return [String]
         attr_accessor :principal_physical_location_country
@@ -152,7 +152,7 @@ module Google
         attr_accessor :dismiss
       
         # The resource name of the request. Format is "`projects|folders|organizations`/`
-        # id`/approvalRequests/`approval_request_id`".
+        # id`/approvalRequests/`approval_request`".
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
@@ -317,12 +317,19 @@ module Google
         include Google::Apis::Core::Hashable
       
         # The product for which Access Approval will be enrolled. Allowed values are
-        # listed below (case-sensitive): 1. all 2. ga-only 3. appengine.googleapis.com 4.
-        # bigquery.googleapis.com 5. bigtable.googleapis.com 6. cloudkms.googleapis.com
-        # 7. compute.googleapis.com 8. dataflow.googleapis.com 9. iam.googleapis.com 10.
-        # pubsub.googleapis.com 11. storage.googleapis.com Note: 'all' will enroll the
-        # resource in all products supported at both 'GA' and 'Preview' levels. 'ga-only'
-        # will only enroll the resource in products supported at 'GA' level.
+        # listed below (case-sensitive): * all * App Engine * BigQuery * Cloud Bigtable *
+        # Cloud Key Management Service * Compute Engine * Cloud Dataflow * Cloud
+        # Identity and Access Management * Cloud Pub/Sub * Cloud Storage * Persistent
+        # Disk Note: These values are supported as input for legacy purposes, but will
+        # not be returned from the API. * all * appengine.googleapis.com * bigquery.
+        # googleapis.com * bigtable.googleapis.com * cloudkms.googleapis.com * compute.
+        # googleapis.com * dataflow.googleapis.com * iam.googleapis.com * pubsub.
+        # googleapis.com * storage.googleapis.com Calls to UpdateAccessApprovalSettings
+        # using 'all' or any of the XXX.googleapis.com will be translated to the
+        # associated product name ('all', 'App Engine', etc.). Note: 'all' will enroll
+        # the resource in all products supported at both 'GA' and 'Preview' levels. More
+        # information about levels of support is available at https://cloud.google.com/
+        # access-approval/docs/supported-services
         # Corresponds to the JSON property `cloudProduct`
         # @return [String]
         attr_accessor :cloud_product

data/generated/google/apis/accessapproval_v1/service.rb

@@ -114,9 +114,9 @@ module Google
         # Updates the settings associated with a project, folder, or organization.
         # Settings to update are determined by the value of field_mask.
         # @param [String] name
-        #   The resource name of the settings. Format is one of: 1. "projects/`project_id`/
-        #   accessApprovalSettings" 2. "folders/`folder_id`/accessApprovalSettings" 3. "
-        #   organizations/`organization_id`/accessApprovalSettings"
+        #   The resource name of the settings. Format is one of: * "projects/`project`/
+        #   accessApprovalSettings" * "folders/`folder`/accessApprovalSettings" * "
+        #   organizations/`organization`/accessApprovalSettings"
         # @param [Google::Apis::AccessapprovalV1::AccessApprovalSettings] access_approval_settings_object
         # @param [String] update_mask
         #   The update mask applies to the settings. Only the top level fields of
@@ -262,14 +262,14 @@ module Google
         # Approval requests can be filtered by state (pending, active, dismissed). The
         # order is reverse chronological.
         # @param [String] parent
-        #   The parent resource. This may be "projects/`project_id`", "folders/`folder_id`"
-        #   , or "organizations/`organization_id`".
+        #   The parent resource. This may be "projects/`project`", "folders/`folder`", or "
+        #   organizations/`organization`".
         # @param [String] filter
         #   A filter on the type of approval requests to retrieve. Must be one of the
-        #   following values: 1. [not set]: Requests that are pending or have active
-        #   approvals. 2. ALL: All requests. 3. PENDING: Only pending requests. 4. ACTIVE:
-        #   Only active (i.e. currently approved) requests. 5. DISMISSED: Only dismissed (
-        #   including expired) requests. 6. HISTORY: Active and dismissed (including
+        #   following values: * [not set]: Requests that are pending or have active
+        #   approvals. * ALL: All requests. * PENDING: Only pending requests. * ACTIVE:
+        #   Only active (i.e. currently approved) requests. * DISMISSED: Only dismissed (
+        #   including expired) requests. * HISTORY: Active and dismissed (including
         #   expired) requests.
         # @param [Fixnum] page_size
         #   Requested page size.
@@ -372,9 +372,9 @@ module Google
         # Updates the settings associated with a project, folder, or organization.
         # Settings to update are determined by the value of field_mask.
         # @param [String] name
-        #   The resource name of the settings. Format is one of: 1. "projects/`project_id`/
-        #   accessApprovalSettings" 2. "folders/`folder_id`/accessApprovalSettings" 3. "
-        #   organizations/`organization_id`/accessApprovalSettings"
+        #   The resource name of the settings. Format is one of: * "projects/`project`/
+        #   accessApprovalSettings" * "folders/`folder`/accessApprovalSettings" * "
+        #   organizations/`organization`/accessApprovalSettings"
         # @param [Google::Apis::AccessapprovalV1::AccessApprovalSettings] access_approval_settings_object
         # @param [String] update_mask
         #   The update mask applies to the settings. Only the top level fields of
@@ -520,14 +520,14 @@ module Google
         # Approval requests can be filtered by state (pending, active, dismissed). The
         # order is reverse chronological.
         # @param [String] parent
-        #   The parent resource. This may be "projects/`project_id`", "folders/`folder_id`"
-        #   , or "organizations/`organization_id`".
+        #   The parent resource. This may be "projects/`project`", "folders/`folder`", or "
+        #   organizations/`organization`".
         # @param [String] filter
         #   A filter on the type of approval requests to retrieve. Must be one of the
-        #   following values: 1. [not set]: Requests that are pending or have active
-        #   approvals. 2. ALL: All requests. 3. PENDING: Only pending requests. 4. ACTIVE:
-        #   Only active (i.e. currently approved) requests. 5. DISMISSED: Only dismissed (
-        #   including expired) requests. 6. HISTORY: Active and dismissed (including
+        #   following values: * [not set]: Requests that are pending or have active
+        #   approvals. * ALL: All requests. * PENDING: Only pending requests. * ACTIVE:
+        #   Only active (i.e. currently approved) requests. * DISMISSED: Only dismissed (
+        #   including expired) requests. * HISTORY: Active and dismissed (including
         #   expired) requests.
         # @param [Fixnum] page_size
         #   Requested page size.
@@ -630,9 +630,9 @@ module Google
         # Updates the settings associated with a project, folder, or organization.
         # Settings to update are determined by the value of field_mask.
         # @param [String] name
-        #   The resource name of the settings. Format is one of: 1. "projects/`project_id`/
-        #   accessApprovalSettings" 2. "folders/`folder_id`/accessApprovalSettings" 3. "
-        #   organizations/`organization_id`/accessApprovalSettings"
+        #   The resource name of the settings. Format is one of: * "projects/`project`/
+        #   accessApprovalSettings" * "folders/`folder`/accessApprovalSettings" * "
+        #   organizations/`organization`/accessApprovalSettings"
         # @param [Google::Apis::AccessapprovalV1::AccessApprovalSettings] access_approval_settings_object
         # @param [String] update_mask
         #   The update mask applies to the settings. Only the top level fields of
@@ -778,14 +778,14 @@ module Google
         # Approval requests can be filtered by state (pending, active, dismissed). The
         # order is reverse chronological.
         # @param [String] parent
-        #   The parent resource. This may be "projects/`project_id`", "folders/`folder_id`"
-        #   , or "organizations/`organization_id`".
+        #   The parent resource. This may be "projects/`project`", "folders/`folder`", or "
+        #   organizations/`organization`".
         # @param [String] filter
         #   A filter on the type of approval requests to retrieve. Must be one of the
-        #   following values: 1. [not set]: Requests that are pending or have active
-        #   approvals. 2. ALL: All requests. 3. PENDING: Only pending requests. 4. ACTIVE:
-        #   Only active (i.e. currently approved) requests. 5. DISMISSED: Only dismissed (
-        #   including expired) requests. 6. HISTORY: Active and dismissed (including
+        #   following values: * [not set]: Requests that are pending or have active
+        #   approvals. * ALL: All requests. * PENDING: Only pending requests. * ACTIVE:
+        #   Only active (i.e. currently approved) requests. * DISMISSED: Only dismissed (
+        #   including expired) requests. * HISTORY: Active and dismissed (including
         #   expired) requests.
         # @param [Fixnum] page_size
         #   Requested page size.