fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/actions/mailgun.rb

@@ -59,45 +59,39 @@ module Fastlane
                                        env_name: "MAILGUN_SUBJECT",
                                        description: "Subject of your mail",
                                        optional: true,
-                                       is_string: true,
                                        default_value: "fastlane build"),
           FastlaneCore::ConfigItem.new(key: :success,
-                                      env_name: "MAILGUN_SUCCESS",
-                                      description: "Was this build successful? (true/false)",
-                                      optional: true,
-                                      default_value: true,
-                                      is_string: false),
+                                       env_name: "MAILGUN_SUCCESS",
+                                       description: "Was this build successful? (true/false)",
+                                       optional: true,
+                                       default_value: true,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :app_link,
-                                      env_name: "MAILGUN_APP_LINK",
-                                      description: "App Release link",
-                                      optional: false,
-                                      is_string: true),
+                                       env_name: "MAILGUN_APP_LINK",
+                                       description: "App Release link",
+                                       optional: false),
           FastlaneCore::ConfigItem.new(key: :ci_build_link,
-                                      env_name: "MAILGUN_CI_BUILD_LINK",
-                                      description: "CI Build Link",
-                                      optional: true,
-                                      is_string: true),
+                                       env_name: "MAILGUN_CI_BUILD_LINK",
+                                       description: "CI Build Link",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :template_path,
-                                      env_name: "MAILGUN_TEMPLATE_PATH",
-                                      description: "Mail HTML template",
-                                      optional: true,
-                                      is_string: true),
+                                       env_name: "MAILGUN_TEMPLATE_PATH",
+                                       description: "Mail HTML template",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :reply_to,
-                                      env_name: "MAILGUN_REPLY_TO",
-                                      description: "Mail Reply to",
-                                      optional: true,
-                                      is_string: true),
+                                       env_name: "MAILGUN_REPLY_TO",
+                                       description: "Mail Reply to",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :attachment,
-                                      env_name: "MAILGUN_ATTACHMENT",
-                                      description: "Mail Attachment filenames, either an array or just one string",
-                                      optional: true,
-                                      is_string: false),
+                                       env_name: "MAILGUN_ATTACHMENT",
+                                       description: "Mail Attachment filenames, either an array or just one string",
+                                       optional: true,
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :custom_placeholders,
                                        short_option: "-p",
                                        env_name: "MAILGUN_CUSTOM_PLACEHOLDERS",
                                        description: "Placeholders for template given as a hash",
                                        default_value: {},
-                                       is_string: false,
                                        type: Hash)
         ]
       end

data/fastlane/lib/fastlane/actions/make_changelog_from_jenkins.rb

@@ -45,7 +45,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :include_commit_body,
                                        description: "Include the commit body along with the summary",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true)
         ]
       end

data/fastlane/lib/fastlane/actions/match_nuke.rb

@@ -0,0 +1,59 @@
+module Fastlane
+  module Actions
+    class MatchNukeAction < Action
+      def self.run(params)
+        require 'match'
+
+        params.load_configuration_file("Matchfile")
+        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+
+        cert_type = Match.cert_type_sym(params[:type])
+        UI.important("Going to revoke your '#{cert_type}' certificate type and provisioning profiles")
+
+        Match::Nuke.new.run(params, type: cert_type)
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Easily nuke your certificate and provisioning profiles (via _match_)"
+      end
+
+      def self.details
+        [
+          "Use the match_nuke action to revoke your certificates and provisioning profiles.",
+          "Don't worry, apps that are already available in the App Store / TestFlight will still work.",
+          "Builds distributed via Ad Hoc or Enterprise will be disabled after nuking your account, so you'll have to re-upload a new build.",
+          "After clearing your account you'll start from a clean state, and you can run match to generate your certificates and profiles again.",
+          "More information: https://docs.fastlane.tools/actions/match/"
+        ].join("\n")
+      end
+
+      def self.available_options
+        require 'match'
+        Match::Options.available_options
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+
+      def self.example_code
+        [
+          'match_nuke(type: "development")', # See all other options https://github.com/fastlane/fastlane/blob/master/match/lib/match/module.rb#L23
+          'match_nuke(type: "development", api_key: app_store_connect_api_key)'
+        ]
+      end
+
+      def self.authors
+        ["crazymanish"]
+      end
+
+      def self.category
+        :code_signing
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/modify_services.rb

@@ -42,29 +42,65 @@ module Fastlane
 
       def self.services_mapping
         {
-            access_wifi: 'access_wifi',
-            app_group: 'app_group',
-            apple_pay: 'apple_pay',
-            associated_domains: 'associated_domains',
-            auto_fill_credential: 'auto_fill_credential',
-            data_protection: 'data_protection',
-            game_center: 'game_center',
-            health_kit: 'healthkit',
-            home_kit: 'homekit',
-            hotspot: 'hotspot',
-            icloud: 'icloud',
-            in_app_purchase: 'in_app_purchase',
-            inter_app_audio: 'inter_app_audio',
-            multipath: 'multipath',
-            network_extension: 'network_extension',
-            nfc_tag_reading: 'nfc_tag_reading',
-            personal_vpn: 'personal_vpn',
-            passbook: 'passbook',
-            push_notification: 'push_notification',
-            siri_kit: 'sirikit',
-            vpn_configuration: 'vpn_conf',
-            wallet: 'wallet',
-            wireless_accessory: 'wireless_conf'
+          access_wifi: 'access_wifi',
+          app_attest: 'app_attest',
+          app_group: 'app_group',
+          apple_pay: 'apple_pay',
+          associated_domains: 'associated_domains',
+          auto_fill_credential: 'auto_fill_credential',
+          class_kit: 'class_kit',
+          icloud: 'icloud',
+          custom_network_protocol: 'custom_network_protocol',
+          data_protection: 'data_protection',
+          extended_virtual_address_space: 'extended_virtual_address_space',
+          family_controls: 'family_controls',
+          file_provider_testing_mode: 'file_provider_testing_mode',
+          fonts: 'fonts',
+          game_center: 'game_center',
+          health_kit: 'health_kit',
+          hls_interstitial_preview: 'hls_interstitial_preview',
+          home_kit: 'home_kit',
+          hotspot: 'hotspot',
+          in_app_purchase: 'in_app_purchase',
+          inter_app_audio: 'inter_app_audio',
+          low_latency_hls: 'low_latency_hls',
+          managed_associated_domains: 'managed_associated_domains',
+          maps: 'maps',
+          multipath: 'multipath',
+          network_extension: 'network_extension',
+          nfc_tag_reading: 'nfc_tag_reading',
+          personal_vpn: 'personal_vpn',
+          passbook: 'passbook',
+          push_notification: 'push_notification',
+          sign_in_with_apple: 'sign_in_with_apple',
+          siri_kit: 'siri_kit',
+          system_extension: 'system_extension',
+          user_management: 'user_management',
+          vpn_configuration: 'vpn_configuration',
+          wallet: 'wallet',
+          wireless_accessory: 'wireless_accessory',
+          car_play_audio_app: 'car_play_audio_app',
+          car_play_messaging_app: 'car_play_messaging_app',
+          car_play_navigation_app: 'car_play_navigation_app',
+          car_play_voip_calling_app: 'car_play_voip_calling_app',
+          critical_alerts: 'critical_alerts',
+          hotspot_helper: 'hotspot_helper',
+          driver_kit: 'driver_kit',
+          driver_kit_endpoint_security: 'driver_kit_endpoint_security',
+          driver_kit_family_hid_device: 'driver_kit_family_hid_device',
+          driver_kit_family_networking: 'driver_kit_family_networking',
+          driver_kit_family_serial: 'driver_kit_family_serial',
+          driver_kit_hid_event_service: 'driver_kit_hid_event_service',
+          driver_kit_transport_hid: 'driver_kit_transport_hid',
+          multitasking_camera_access: 'multitasking_camera_access',
+          sf_universal_link_api: 'sf_universal_link_api',
+          vp9_decoder: 'vp9_decoder',
+          music_kit: 'music_kit',
+          shazam_kit: 'shazam_kit',
+          communication_notifications: 'communication_notifications',
+          group_activities: 'group_activities',
+          health_kit_estimate_recalibration: 'health_kit_estimate_recalibration',
+          time_sensitive_notifications: 'time_sensitive_notifications'
         }
       end
 
@@ -106,7 +142,6 @@ module Fastlane
                                        display_in_shell: false,
                                        env_name: "PRODUCE_ENABLE_SERVICES",
                                        description: "Array with Spaceship App Services (e.g. #{allowed_services_description})",
-                                       is_string: false,
                                        type: Hash,
                                        default_value: {},
                                        verify_block: proc do |value|

data/fastlane/lib/fastlane/actions/nexus_upload.rb

@@ -5,6 +5,7 @@ module Fastlane
         command = []
         command << "curl"
         command << verbose(params)
+        command << "--fail"
         command += ssl_options(params)
         command += proxy_options(params)
         command += upload_options(params)
@@ -142,7 +143,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :ssl_verify,
                                        env_name: "FL_NEXUS_SSL_VERIFY",
                                        description: "Verify SSL",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :nexus_version,
@@ -160,7 +161,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        env_name: "FL_NEXUS_VERBOSE",
                                        description: "Make detailed output",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :proxy_username,

data/fastlane/lib/fastlane/actions/notarize.rb

@@ -1,12 +1,14 @@
 module Fastlane
   module Actions
     class NotarizeAction < Action
+      # rubocop:disable Metrics/PerceivedComplexity
       def self.run(params)
         package_path = params[:package]
         bundle_id = params[:bundle_id]
         try_early_stapling = params[:try_early_stapling]
         print_log = params[:print_log]
         verbose = params[:verbose]
+        api_key_path = params[:api_key_path]
 
         # Compress and read bundle identifier only for .app bundle.
         compressed_package_path = nil
@@ -28,68 +30,73 @@ module Fastlane
 
         UI.user_error!('Could not read bundle identifier, provide as a parameter') unless bundle_id
 
-        apple_id_account = CredentialsManager::AccountManager.new(user: params[:username])
-
-        # Add password as a temporary environment variable for altool.
-        # Use app specific password if specified.
-        ENV['FL_NOTARIZE_PASSWORD'] = ENV['FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD'] || apple_id_account.password
-
         UI.message('Uploading package to notarization service, might take a while')
 
-        notarization_upload_command = "xcrun altool --notarize-app -t osx -f \"#{compressed_package_path || package_path}\" --primary-bundle-id #{bundle_id} -u #{apple_id_account.user} -p @env:FL_NOTARIZE_PASSWORD --output-format xml"
-        notarization_upload_command << " --asc-provider \"#{params[:asc_provider]}\"" if params[:asc_provider]
+        notarization_upload_command = "xcrun altool --notarize-app -t osx -f \"#{compressed_package_path || package_path}\" --primary-bundle-id #{bundle_id} --output-format xml"
 
-        notarization_upload_response = Actions.sh(
-          notarization_upload_command,
-          log: verbose
-        )
+        notarization_info = {}
+        with_notarize_authenticator(params, api_key_path) do |notarize_authenticator|
+          notarization_upload_command << " --asc-provider \"#{params[:asc_provider]}\"" if params[:asc_provider] && api_key_path.nil?
 
-        FileUtils.rm_rf(compressed_package_path) if compressed_package_path
+          notarization_upload_response = Actions.sh(
+            notarize_authenticator.call(notarization_upload_command),
+            log: verbose
+          )
 
-        notarization_upload_plist = Plist.parse_xml(notarization_upload_response)
-        notarization_request_id = notarization_upload_plist['notarization-upload']['RequestUUID']
+          FileUtils.rm_rf(compressed_package_path) if compressed_package_path
 
-        UI.success("Successfully uploaded package to notarization service with request identifier #{notarization_request_id}")
+          notarization_upload_plist = Plist.parse_xml(notarization_upload_response)
 
-        notarization_info = {}
-        while notarization_info.empty? || (notarization_info['Status'] == 'in progress')
-          if notarization_info.empty?
-            UI.message('Waiting to query request status')
-          elsif try_early_stapling
-            UI.message('Request in progress, trying early staple')
-
-            begin
-              self.staple(package_path, verbose)
-              UI.message('Successfully notarized and early stapled package.')
-
-              return
-            rescue
-              UI.message('Early staple failed, waiting to query again')
-            end
+          if notarization_upload_plist.key?('product-errors') && notarization_upload_plist['product-errors'].any?
+            UI.important("🚫 Could not upload package to notarization service! Here are the reasons:")
+            notarization_upload_plist['product-errors'].each { |product_error| UI.error("#{product_error['message']} (#{product_error['code']})") }
+            UI.user_error!("Package upload to notarization service cancelled. Please check the error messages above.")
           end
 
-          sleep(30)
-
-          UI.message('Querying request status')
-
-          # As of July 2020, the request UUID might not be available for polling yet which returns an error code
-          # This is now handled with the error_callback (which prevents an error from being raised)
-          # Catching this error allows for polling to continue until the notarization is complete
-          error = false
-          notarization_info_response = Actions.sh(
-            "xcrun altool --notarization-info #{notarization_request_id} -u #{apple_id_account.user} -p @env:FL_NOTARIZE_PASSWORD --output-format xml",
-            log: verbose,
-            error_callback: lambda { |msg|
-              error = true
-              UI.error("Error polling for notarization info: #{msg}")
-            }
-          )
+          notarization_request_id = notarization_upload_plist['notarization-upload']['RequestUUID']
+
+          UI.success("Successfully uploaded package to notarization service with request identifier #{notarization_request_id}")
+
+          while notarization_info.empty? || (notarization_info['Status'] == 'in progress')
+            if notarization_info.empty?
+              UI.message('Waiting to query request status')
+            elsif try_early_stapling
+              UI.message('Request in progress, trying early staple')
+
+              begin
+                self.staple(package_path, verbose)
+                UI.message('Successfully notarized and early stapled package.')
+
+                return
+              rescue
+                UI.message('Early staple failed, waiting to query again')
+              end
+            end
 
-          unless error
-            notarization_info_plist = Plist.parse_xml(notarization_info_response)
-            notarization_info = notarization_info_plist['notarization-info']
+            sleep(30)
+
+            UI.message('Querying request status')
+
+            # As of July 2020, the request UUID might not be available for polling yet which returns an error code
+            # This is now handled with the error_callback (which prevents an error from being raised)
+            # Catching this error allows for polling to continue until the notarization is complete
+            error = false
+            notarization_info_response = Actions.sh(
+              notarize_authenticator.call("xcrun altool --notarization-info #{notarization_request_id} --output-format xml"),
+              log: verbose,
+              error_callback: lambda { |msg|
+                error = true
+                UI.error("Error polling for notarization info: #{msg}")
+              }
+            )
+
+            unless error
+              notarization_info_plist = Plist.parse_xml(notarization_info_response)
+              notarization_info = notarization_info_plist['notarization-info']
+            end
           end
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         log_url = notarization_info['LogFileURL']
         ENV['FL_NOTARIZE_LOG_FILE_URL'] = log_url
@@ -123,6 +130,35 @@ module Fastlane
         )
       end
 
+      def self.with_notarize_authenticator(params, api_key_path)
+        if api_key_path
+          # From xcrun altool for --apiKey:
+          # This option will search the following directories in sequence for a private key file with the name of 'AuthKey_<api_key>.p8':  './private_keys', '~/private_keys', '~/.private_keys', and '~/.appstoreconnect/private_keys'.
+          api_key = Spaceship::ConnectAPI::Token.from_json_file(api_key_path)
+          api_key_folder_path = File.expand_path('~/.appstoreconnect/private_keys')
+          api_key_file_path = File.join(api_key_folder_path, "AuthKey_#{api_key.key_id}.p8")
+          directory_exists = File.directory?(api_key_folder_path)
+          file_exists = File.exist?(api_key_file_path)
+          begin
+            FileUtils.mkdir_p(api_key_folder_path) unless directory_exists
+            api_key.write_key_to_file(api_key_file_path) unless file_exists
+
+            yield(proc { |command| "#{command} --apiKey #{api_key.key_id} --apiIssuer #{api_key.issuer_id}" })
+          ensure
+            FileUtils.rm(api_key_file_path) unless file_exists
+            FileUtils.rm_r(api_key_folder_path) unless directory_exists
+          end
+        else
+          apple_id_account = CredentialsManager::AccountManager.new(user: params[:username])
+
+          # Add password as a temporary environment variable for altool.
+          # Use app specific password if specified.
+          ENV['FL_NOTARIZE_PASSWORD'] = ENV['FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD'] || apple_id_account.password
+
+          yield(proc { |command| "#{command} -u #{apple_id_account.user} -p @env:FL_NOTARIZE_PASSWORD" })
+        end
+      end
+
       def self.description
         'Notarizes a macOS app'
       end
@@ -141,7 +177,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :package,
                                        env_name: 'FL_NOTARIZE_PACKAGE',
                                        description: 'Path to package to notarize, e.g. .app bundle or disk image',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find package at '#{value}'") unless File.exist?(value)
                                        end),
@@ -154,12 +189,13 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :bundle_id,
                                        env_name: 'FL_NOTARIZE_BUNDLE_ID',
                                        description: 'Bundle identifier to uniquely identify the package',
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: 'FL_NOTARIZE_USERNAME',
                                        description: 'Apple ID username',
                                        default_value: username,
+                                       optional: true,
+                                       conflicting_options: [:api_key_path],
                                        default_value_dynamic: true),
           FastlaneCore::ConfigItem.new(key: :asc_provider,
                                        env_name: 'FL_NOTARIZE_ASC_PROVIDER',
@@ -177,7 +213,15 @@ module Fastlane
                                        description: 'Whether to log requests',
                                        optional: true,
                                        default_value: false,
-                                       type: Boolean)
+                                       type: Boolean),
+          FastlaneCore::ConfigItem.new(key: :api_key_path,
+                                       env_name: 'FL_NOTARIZE_API_KEY_PATH',
+                                       description: 'Path to AppStore Connect API key',
+                                       optional: true,
+                                       conflicting_options: [:username],
+                                       verify_block: proc do |value|
+                                         UI.user_error!("API Key not found at '#{value}'") unless File.exist?(value)
+                                       end)
         ]
       end