fastlane-plugin-firebase_app_distribution 0.10.0 → 0.10.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b85c6c60b76c751c0f4f5ca2611bd6735b5540b1525e600dad266b354bcc2e7
-  data.tar.gz: dbee1fc079ed0d7c8f1b50aec4cc22339e7046cf97b100576564797afa440e48
+  metadata.gz: e3ac8eeeed71d57e777bcee0a974d0d23a1093a9d427b591150300c5cd8c36ff
+  data.tar.gz: 483d71f41ff6aee5b1da54a5308b89c3180d2bacdc1e0d58d24d6dd175340af6
 SHA512:
-  metadata.gz: 5fd6c96184db82f9d38dc5495b2c8adcd9b42326f45420afcf50b9db66064dd7c07228d694d349b0c1ee3e82782cc8fe76ec5e0889841574f3c12ecaeff89362
-  data.tar.gz: 3f5e0aafc6c0b09ae3722f7fd65522009470c70cad2bd115fd061f2c38a63522eec6b77aa036df9e21cc30b6704134fe593ec132dee5026e65a50d29366f4d91
+  metadata.gz: 2d8faa2d8fa9f3f9e6d776d4373644c47799fdca0497b2d07b73bef6b26ed6eaefa641e19ce9e0a8e4f50f881b4e972502d74c1c074e2d4272079693e6a42ef7
+  data.tar.gz: 6d38932bfc8842483e31706cdf116a11dfa1798c6ab0fb40dc769c8dda8ac73c4804f569c5ac1cd7c1a96676543d5288ba2de4453602ad94604b4dd466b14686

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

@@ -21,6 +21,7 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       DEFAULT_UPLOAD_TIMEOUT_SECONDS = 300
+      DEFAULT_UPLOAD_RETRIES = 3
       UPLOAD_MAX_POLLING_RETRIES = 60
       UPLOAD_POLLING_INTERVAL_SECONDS = 5
       TEST_MAX_POLLING_RETRIES = 40
@@ -33,6 +34,7 @@ module Fastlane
         app_name = app_name_from_app_id(app_id)
         platform = lane_platform || platform_from_app_id(app_id)
         timeout = get_upload_timeout(params)
+        retries = get_upload_retries(params)
 
         binary_path = get_binary_path(platform, params)
         UI.user_error!("Couldn't determine path for #{platform} binary.") if binary_path.nil?
@@ -57,7 +59,7 @@ module Fastlane
 
         binary_type = binary_type_from_path(binary_path)
         UI.message("📡 Uploading the #{binary_type}.")
-        operation = upload_binary(client, app_name, binary_path, binary_type, timeout)
+        operation = upload_binary(client, app_name, binary_path, binary_type, timeout, retries)
         UI.message("🕵️ Validating upload…")
         release = poll_upload_release_operation(client, operation, binary_type)
 
@@ -142,34 +144,6 @@ module Fastlane
         test_password && test_password.sub(/\r?\n$/, "")
       end
 
-      def self.app_id_from_params(params)
-        if params[:app]
-          app_id = params[:app]
-        elsif xcode_archive_path
-          plist_path = params[:googleservice_info_plist_path]
-          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
-        end
-        if app_id.nil?
-          UI.crash!(ErrorMessage::MISSING_APP_ID)
-        end
-        app_id
-      end
-
-      def self.xcode_archive_path
-        # prevents issues on cross-platform build environments where an XCode build happens within
-        # the same lane
-        return nil if lane_platform == :android
-
-        # rubocop:disable Require/MissingRequireStatement
-        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
-        # rubocop:enable Require/MissingRequireStatement
-      end
-
-      def self.lane_platform
-        # to_sym shouldn't be necessary, but possibly fixes #376
-        Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]&.to_sym
-      end
-
       def self.platform_from_app_id(app_id)
         if app_id.include?(':ios:')
           :ios
@@ -213,6 +187,14 @@ module Fastlane
         end
       end
 
+      def self.get_upload_retries(params)
+        if params[:upload_retries]
+          return params[:upload_retries]
+        else
+          return DEFAULT_UPLOAD_RETRIES
+        end
+      end
+
       def self.validate_aab_setup!(aab_info)
         if aab_info && aab_info.integration_state != 'INTEGRATED' && aab_info.integration_state != 'AAB_STATE_UNAVAILABLE'
           case aab_info.integration_state
@@ -280,27 +262,15 @@ module Fastlane
         extract_release(operation)
       end
 
-      def self.upload_binary(client, app_name, binary_path, binary_type, timeout)
-        options = Google::Apis::RequestOptions.new
-        options.max_elapsed_time = timeout # includes retries (default = no retries)
+      def self.upload_binary(client, app_name, binary_path, binary_type, timeout, retries)
+        options = Google::Apis::RequestOptions.new(max_elapsed_time: timeout, retries: retries)
         options.header = {
           'Content-Type' => 'application/octet-stream',
-          'X-Goog-Upload-File-Name' => CGI.escape(File.basename(binary_path)),
-          'X-Goog-Upload-Protocol' => 'raw'
+          'X-Goog-Upload-File-Name' => CGI.escape(File.basename(binary_path))
         }
 
-        # 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
-        # https://github.com/googleapis/google-api-ruby-client/blob/main/generated/google-apis-firebaseappdistribution_v1/lib/google/apis/firebaseappdistribution_v1/service.rb#L79
-        # TODO(kbolay): Prefer client.upload_medium
-        response = begin
-          client.http(
-            :post,
-            "https://firebaseappdistribution.googleapis.com/upload/v1/#{app_name}/releases:upload",
-            body: File.open(binary_path, 'rb'),
-            options: options
-          )
+        begin
+          client.upload_medium(app_name, File.open(binary_path, 'rb'), upload_source: binary_path, options: options)
         rescue Google::Apis::Error => err
           case err.status_code.to_i
           when 403
@@ -309,8 +279,6 @@ module Fastlane
             UI.crash!("#{ErrorMessage.upload_binary_error(binary_type)} (#{err}, status_code: #{err.status_code})")
           end
         end
-
-        Google::Apis::FirebaseappdistributionV1::GoogleLongrunningOperation.from_json(response)
       end
 
       def self.extract_release(operation)
@@ -492,7 +460,7 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
                                        env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
-                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path (or directly, if no archived product path is found)",
                                        default_value: "GoogleService-Info.plist",
                                        optional: true,
                                        type: String),
@@ -533,10 +501,15 @@ module Fastlane
 
           # Release Distribution
           FastlaneCore::ConfigItem.new(key: :upload_timeout,
-                                       description: "Amount of seconds before the upload will  timeout, if not completed",
+                                       description: "Amount of seconds before the upload will timeout, if not completed",
                                        optional: true,
                                        default_value: DEFAULT_UPLOAD_TIMEOUT_SECONDS,
                                        type: Integer),
+          FastlaneCore::ConfigItem.new(key: :upload_retries,
+                                       description: "Maximum number of times the upload will retry, if not completed",
+                                       optional: true,
+                                       default_value: DEFAULT_UPLOAD_RETRIES,
+                                       type: Integer),
           FastlaneCore::ConfigItem.new(key: :groups,
                                        env_name: "FIREBASEAPPDISTRO_GROUPS",
                                        description: "Group aliases used for distribution, separated by commas",

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_get_latest_release.rb

@@ -19,15 +19,15 @@ module Fastlane
         client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
         client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
-        UI.message("⏳ Fetching latest release for app #{params[:app]}...")
-
-        parent = app_name_from_app_id(params[:app])
+        app_id = app_id_from_params(params)
+        UI.message("⏳ Fetching latest release for app #{app_id}...")
+        parent = app_name_from_app_id(app_id)
 
         begin
           releases = client.list_project_app_releases(parent, page_size: 1).releases
         rescue Google::Apis::Error => err
           if err.status_code.to_i == 404
-            UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{params[:app]}")
+            UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
           else
             UI.crash!(err)
           end
@@ -35,7 +35,7 @@ module Fastlane
 
         if releases.nil? || releases.empty?
           latest_release = nil
-          UI.important("No releases for app #{params[:app]} found in App Distribution. Returning nil and setting Actions.lane_context[SharedValues::FIREBASE_APP_DISTRO_LATEST_RELEASE].")
+          UI.important("No releases for app #{app_id} found in App Distribution. Returning nil and setting Actions.lane_context[SharedValues::FIREBASE_APP_DISTRO_LATEST_RELEASE].")
         else
           # latest_release = append_json_style_fields(response.releases[0].to_h)
           latest_release = map_release_hash(releases[0])
@@ -80,10 +80,19 @@ module Fastlane
 
       def self.available_options
         [
+          # iOS Specific
+          FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
+                                       env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path (or directly, if no archived product path is found)",
+                                       default_value: "GoogleService-Info.plist",
+                                       optional: true,
+                                       type: String),
+
+          # General
           FastlaneCore::ConfigItem.new(key: :app,
                                        env_name: "FIREBASEAPPDISTRO_APP",
                                        description: "Your app's Firebase App ID. You can find the App ID in the Firebase console, on the General Settings page",
-                                       optional: false,
+                                       optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using Firebase CLI's login:ci command",

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_error_message.rb

@@ -11,7 +11,7 @@ module ErrorMessage
   GET_RELEASE_TIMEOUT = "App Distribution failed to fetch release information."
   REFRESH_TOKEN_ERROR = "App Distribution could not generate credentials from the refresh token specified."
   APP_NOT_ONBOARDED_ERROR = "App Distribution not onboarded."
-  INVALID_APP_ID = "App Distribution could not find your app. Make sure to onboard your app by pressing the \"Get started\" button on the App Distribution page in the Firebase console: https://console.firebase.google.com/project/_/appdistribution. App ID"
+  INVALID_APP_ID = "App Distribution could not find your app. Make sure to onboard your app by pressing the \"Get started\" button on the App Distribution page in the Firebase console: https://console.firebase.google.com/project/_/appdistribution."
   INVALID_PROJECT = "App Distribution could not find your Firebase project. Make sure to onboard an app in your project by pressing the \"Get started\" button on the App Distribution page in the Firebase console: https://console.firebase.google.com/project/_/appdistribution."
   INVALID_PATH = "Could not read content from"
   INVALID_TESTERS = "Could not enable access for testers. Check that the tester emails are formatted correctly, the groups exist and you are using group aliases (not group names) for specifying groups."

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

@@ -1,3 +1,4 @@
+require 'fastlane/action'
 require 'fastlane_core/ui/ui'
 require 'cfpropertylist'
 require 'google/apis/core'
@@ -36,15 +37,52 @@ module Fastlane
         string.strip.split(delimiter).map(&:strip)
       end
 
+      def app_id_from_params(params)
+        plist_path = params[:googleservice_info_plist_path]
+        if params[:app]
+          UI.message("Using app ID from 'app' parameter")
+          app_id = params[:app]
+        elsif xcode_archive_path
+          UI.message("Using app ID from the GoogleService-Info.plist file located using the 'googleservice_info_plist_path' parameter, relative to the archive path: #{xcode_archive_path}")
+          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
+        elsif plist_path
+          UI.message("Using app ID from the GoogleService-Info.plist file located using the 'googleservice_info_plist_path' parameter directly since no archive path was found")
+          app_id = get_ios_app_id_from_plist(plist_path)
+        end
+        if app_id.nil?
+          UI.crash!(ErrorMessage::MISSING_APP_ID)
+        end
+        app_id
+      end
+
+      def lane_platform
+        # to_sym shouldn't be necessary, but possibly fixes #376
+        Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]&.to_sym
+      end
+
+      def xcode_archive_path
+        # prevents issues on cross-platform build environments where an XCode build happens within
+        # the same lane
+        return nil if lane_platform == :android
+
+        # rubocop:disable Require/MissingRequireStatement
+        Actions.lane_context[Actions::SharedValues::XCODEBUILD_ARCHIVE]
+        # rubocop:enable Require/MissingRequireStatement
+      end
+
       def parse_plist(path)
         CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
       end
 
-      def get_ios_app_id_from_archive_plist(archive_path, plist_path)
+      def get_ios_app_id_from_archive_plist(archive_path, relative_plist_path)
         app_path = parse_plist("#{archive_path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
         UI.shell_error!("can't extract application path from Info.plist at #{archive_path}") if app_path.empty?
-        identifier = parse_plist("#{archive_path}/Products/#{app_path}/#{plist_path}")["GOOGLE_APP_ID"]
-        UI.shell_error!("can't extract GOOGLE_APP_ID") if identifier.empty?
+        return get_ios_app_id_from_plist("#{archive_path}/Products/#{app_path}/#{relative_plist_path}")
+      end
+
+      def get_ios_app_id_from_plist(plist_path)
+        identifier = parse_plist(plist_path)["GOOGLE_APP_ID"]
+        UI.shell_error!("can't extract GOOGLE_APP_ID from #{plist_path}") if identifier.empty?
         return identifier
       end
 

data/lib/fastlane/plugin/firebase_app_distribution/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.10.0"
+    VERSION = "0.10.2.pre.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2.pre.1
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 - Alonso Salas Infante
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-firebaseappdistribution_v1
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Release your beta builds to Firebase App Distribution. https://firebase.google.com/docs/app-distribution
 test_files: []