Merge branch 'master' into lk/7.0.1

Author: lfkellogg

fastlane-plugin-firebase_app_distribution.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency('google-api-client', '~> 0.38')
   spec.add_dependency('google-apis-firebaseappdistribution_v1', '~> 0.3.0')
 
   spec.add_development_dependency('pry')

lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb

@@ -28,24 +28,29 @@ def self.run(params)
         app_id = app_id_from_params(params)
         app_name = app_name_from_app_id(app_id)
         platform = lane_platform || platform_from_app_id(app_id)
+        timeout = get_upload_timeout(params)
 
         binary_path = get_binary_path(platform, params)
         UI.user_error!("Couldn't find binary") if binary_path.nil?
         UI.user_error!("Couldn't find binary at path #{binary_path}") unless File.exist?(binary_path)
         binary_type = binary_type_from_path(binary_path)
 
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        # TODO(lkellogg): This sets the send timeout for all POST requests made by the client, but
+        # ideally the timeout should only apply to the binary upload
+        client = init_client(params[:service_credentials_file],
+                             params[:firebase_cli_token],
+                             params[:debug],
+                             timeout)
 
-        # If binary is an AAB, get the AAB info for this app, which includes the integration state and certificate data
+        # If binary is an AAB, get the AAB info for this app, which includes the integration state
+        # and certificate data
         if binary_type == :AAB
           aab_info = get_aab_info(client, app_name)
           validate_aab_setup!(aab_info)
         end
 
         binary_type = binary_type_from_path(binary_path)
         UI.message("⌛ Uploading the #{binary_type}.")
-
-        timeout = get_upload_timeout(params)
         operation = upload_binary(app_name, binary_path, client, timeout)
         release = poll_upload_release_operation(client, operation, binary_type)
 
@@ -242,12 +247,13 @@ def self.poll_upload_release_operation(client, operation, binary_type)
 
       def self.upload_binary(app_name, binary_path, client, timeout)
         options = Google::Apis::RequestOptions.new
-        options.max_elapsed_time = timeout
+        options.max_elapsed_time = timeout # includes retries (default = no retries)
         options.header = {
           'Content-Type' => 'application/octet-stream',
           'X-Goog-Upload-File-Name' => File.basename(binary_path),
           'X-Goog-Upload-Protocol' => 'raw'
         }
+
         # For some reason calling the client.upload_medium returns nil when
         # it should return a long running operation object, so we make a
         # standard http call instead and convert it to a long running object

lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb

@@ -65,14 +65,18 @@ def group_name(project_number, group_alias)
         "#{project_name(project_number)}/groups/#{group_alias}"
       end
 
-      def init_client(service_credentials_file, firebase_cli_token, debug = false)
+      def init_client(service_credentials_file, firebase_cli_token, debug, timeout = nil)
         if debug
           UI.important("Warning: Debug logging enabled. Output may include sensitive information.")
           Google::Apis.logger.level = Logger::DEBUG
         end
 
         Google::Apis::ClientOptions.default.application_name = "fastlane"
         Google::Apis::ClientOptions.default.application_version = Fastlane::FirebaseAppDistribution::VERSION
+        unless timeout.nil?
+          Google::Apis::ClientOptions.default.send_timeout_sec = timeout
+        end
+
         client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
         client.authorization = get_authorization(service_credentials_file, firebase_cli_token)
         client