fix-extracting-instabug-params-from-fastlane-params

Author: Yousif-Ahmed

lib/fastlane/plugin/instabug_stores_upload/actions/instabug_build_android_app_action.rb

@@ -8,14 +8,17 @@ def self.run(params)
         UI.message("Starting Instabug Android build...")
 
         # Extract Instabug-specific parameters
-        branch_name = params.delete(:branch_name)
-        instabug_api_key = params.delete(:instabug_api_key)
+        branch_name = params[:branch_name]
+        instabug_api_key = params[:instabug_api_key]
 
         # Validate required parameters
         if branch_name.nil? || branch_name.empty?
           UI.user_error!("branch_name is required for Instabug reporting")
         end
 
+        # Filter out Instabug-specific parameters before passing to gradle
+        filtered_params = Helper::InstabugStoresUploadHelper.filter_instabug_params(params, Actions::GradleAction)
+
         begin
           # Report build start to Instabug
           Helper::InstabugStoresUploadHelper.report_status(
@@ -29,7 +32,7 @@ def self.run(params)
           build_start_time = Time.now
 
           # Execute the actual Android build using gradle
-          result = Actions::GradleAction.run(params)
+          result = Actions::GradleAction.run(filtered_params)
 
           # Calculate build time in seconds
           build_time = (Time.now - build_start_time).round

lib/fastlane/plugin/instabug_stores_upload/actions/instabug_build_ios_app_action.rb

@@ -8,14 +8,17 @@ def self.run(params)
         UI.message("Starting Instabug iOS build...")
 
         # Extract Instabug-specific parameters
-        branch_name = params.delete(:branch_name)
-        instabug_api_key = params.delete(:instabug_api_key)
+        branch_name = params[:branch_name]
+        instabug_api_key = params[:instabug_api_key]
 
         # Validate required parameters
         if branch_name.nil? || branch_name.empty?
           UI.user_error!("branch_name is required for Instabug reporting")
         end
 
+        # Filter out Instabug-specific parameters before passing to build_ios_app
+        filtered_params = Helper::InstabugStoresUploadHelper.filter_instabug_params(params, Actions::BuildIosAppAction)
+
         begin
           # Report build start to Instabug
           Helper::InstabugStoresUploadHelper.report_status(
@@ -29,7 +32,7 @@ def self.run(params)
           build_start_time = Time.now
 
           # Execute the actual iOS build
-          result = Actions::BuildIosAppAction.run(params)
+          result = Actions::BuildIosAppAction.run(filtered_params)
 
           # Calculate build time in seconds
           build_time = (Time.now - build_start_time).round

lib/fastlane/plugin/instabug_stores_upload/actions/instabug_upload_to_app_store_action.rb

@@ -8,14 +8,17 @@ def self.run(params)
         UI.message("Starting Instabug App Store upload...")
 
         # Extract Instabug-specific parameters
-        branch_name = params.delete(:branch_name)
-        instabug_api_key = params.delete(:instabug_api_key)
+        branch_name = params[:branch_name]
+        instabug_api_key = params[:instabug_api_key]
 
         # Validate required parameters
         if branch_name.nil? || branch_name.empty?
           UI.user_error!("branch_name is required for Instabug reporting")
         end
 
+        # Filter out Instabug-specific parameters before passing to upload_to_app_store
+        filtered_params = Helper::InstabugStoresUploadHelper.filter_instabug_params(params, Actions::UploadToAppStoreAction)
+
         begin
           # Report upload start to Instabug
           Helper::InstabugStoresUploadHelper.report_status(
@@ -26,7 +29,7 @@ def self.run(params)
           )
 
           # Execute the actual upload to App Store
-          result = Actions::UploadToAppStoreAction.run(params)
+          result = Actions::UploadToAppStoreAction.run(filtered_params)
 
           # Report upload success to Instabug
           Helper::InstabugStoresUploadHelper.report_status(

lib/fastlane/plugin/instabug_stores_upload/actions/instabug_upload_to_play_store_action.rb

@@ -8,14 +8,17 @@ def self.run(params)
         UI.message("Starting Instabug Play Store upload...")
 
         # Extract Instabug-specific parameters
-        branch_name = params.delete(:branch_name)
-        instabug_api_key = params.delete(:instabug_api_key)
+        branch_name = params[:branch_name]
+        instabug_api_key = params[:instabug_api_key]
 
         # Validate required parameters
         if branch_name.nil? || branch_name.empty?
           UI.user_error!("branch_name is required for Instabug reporting")
         end
 
+        # Filter out Instabug-specific parameters before passing to upload_to_play_store
+        filtered_params = Helper::InstabugStoresUploadHelper.filter_instabug_params(params, Actions::UploadToPlayStoreAction)
+
         begin
           # Report upload start to Instabug
           Helper::InstabugStoresUploadHelper.report_status(
@@ -26,7 +29,7 @@ def self.run(params)
           )
 
           # Execute the actual upload to Play Store
-          result = Actions::UploadToPlayStoreAction.run(params)
+          result = Actions::UploadToPlayStoreAction.run(filtered_params)
 
           # Report upload success to Instabug
           Helper::InstabugStoresUploadHelper.report_status(

lib/fastlane/plugin/instabug_stores_upload/helper/instabug_stores_upload_helper.rb

@@ -10,11 +10,30 @@ module Helper
     class InstabugStoresUploadHelper
       # Default Base URL for Instabug API
       DEFAULT_INSTABUG_API_BASE_URL = "https://api.instabug.com".freeze
+      INSTABUG_KEYS = %i[branch_name instabug_api_key instabug_api_base_url].freeze
 
       def self.show_message
         UI.message("Hello from the instabug_stores_upload plugin helper!")
       end
 
+      # Filters out Instabug-specific parameters from the params configuration
+      # and returns a new FastlaneCore::Configuration object with only the target action's parameters
+      def self.filter_instabug_params(params, target_action_class)
+        filtered_config = {}
+        params.available_options.each do |option|
+          key = option.key
+          unless INSTABUG_KEYS.include?(key)
+            value = params[key]
+            filtered_config[key] = value if value
+          end
+        end
+
+        FastlaneCore::Configuration.create(
+          target_action_class.available_options,
+          filtered_config
+        )
+      end
+
       def self.report_status(branch_name:, api_key:, status:, step:, extras: {}, error_message: nil)
         return unless branch_name.start_with?('crash-fix/instabug-crash-')
 

spec/spec_helper.rb

@@ -13,6 +13,14 @@ module SpecHelper
 require 'fastlane/plugin/instabug_stores_upload' # import the actual plugin
 require 'webmock/rspec'
 
+# Override the helper method for tests to handle plain hashes
+class Fastlane::Helper::InstabugStoresUploadHelper
+  def self.filter_instabug_params(params, target_action_class)
+    # In test environment, params are plain hashes - just filter them
+    return params.reject { |key, _value| INSTABUG_KEYS.include?(key) }
+  end
+end
+
 Fastlane.load_actions # load other actions (in case your plugin calls other actions or shared values)
 
 WebMock.disable_net_connect!(allow_localhost: true)