fastlane 2.217.0 → 2.218.0

data/match/lib/match/spaceship_ensure.rb

@@ -1,5 +1,6 @@
 require 'spaceship'
 require_relative 'module'
+require_relative 'portal_fetcher'
 
 module Match
   # Ensures the certificate and profiles are also available on App Store Connect
@@ -41,8 +42,9 @@ module Match
       return @team_id
     end
 
-    def bundle_identifier_exists(username: nil, app_identifier: nil, platform: nil)
-      found = Spaceship::ConnectAPI::BundleId.find(app_identifier)
+    def bundle_identifier_exists(username: nil, app_identifier: nil, cached_bundle_ids: nil)
+      search_bundle_ids = cached_bundle_ids || Match::Portal::Fetcher.bundle_ids(bundle_id_identifiers: [app_identifier])
+      found = search_bundle_ids.any? { |bundle_id| bundle_id.identifier == app_identifier }
       return if found
 
       require 'sigh/runner'
@@ -52,14 +54,17 @@ module Match
       })
       UI.error("An app with that bundle ID needs to exist in order to create a provisioning profile for it")
       UI.error("================================================================")
-      available_apps = Spaceship::ConnectAPI::BundleId.all.collect { |a| "#{a.identifier} (#{a.name})" }
+      all_bundle_ids = Match::Portal::Fetcher.bundle_ids
+      available_apps = all_bundle_ids.collect { |a| "#{a.identifier} (#{a.name})" }
       UI.message("Available apps:\n- #{available_apps.join("\n- ")}")
       UI.error("Make sure to run `fastlane match` with the same user and team every time.")
       UI.user_error!("Couldn't find bundle identifier '#{app_identifier}' for the user '#{username}'")
     end
 
-    def certificates_exists(username: nil, certificate_ids: [])
-      Spaceship::ConnectAPI::Certificate.all.each do |cert|
+    def certificates_exists(username: nil, certificate_ids: [], platform:, profile_type:, cached_certificates:)
+      certificates = cached_certificates
+      certificates ||= Match::Portal::Fetcher.certificates(platform: platform, profile_type: profile_type)
+      certificates.each do |cert|
         certificate_ids.delete(cert.id)
       end
       return if certificate_ids.empty?
@@ -74,12 +79,11 @@ module Match
       UI.user_error!("To reset the certificates of your Apple account, you can use the `fastlane match nuke` feature, more information on https://docs.fastlane.tools/actions/match/")
     end
 
-    def profile_exists(type: nil, username: nil, uuid: nil, platform: nil)
-      # App Store Connect API does not allow filter of profile by platform or uuid (as of 2020-07-30)
-      # Need to fetch all profiles and search for uuid on client side
-      # But we can filter provisioning profiles based on their type (this, in general way faster than getting all profiles)
-      filter = { profileType: Match.profile_types(type).join(",") } if type
-      found = Spaceship::ConnectAPI::Profile.all(filter: filter).find do |profile|
+    def profile_exists(profile_type: nil, name: nil, username: nil, uuid: nil, cached_profiles: nil)
+      profiles = cached_profiles
+      profiles ||= Match::Portal::Fetcher.profiles(profile_type: profile_type, name: name)
+
+      found = profiles.find do |profile|
         profile.uuid == uuid
       end
 

data/match/lib/match/storage/git_storage.rb

@@ -85,16 +85,21 @@ module Match
         self.working_directory = Dir.mktmpdir
 
         command = "git clone #{self.git_url.shellescape} #{self.working_directory.shellescape}"
-        # HTTP headers are supposed to be be case insensitive but
+        # HTTP headers are supposed to be case-insensitive but
         # Bitbucket requires `Authorization: Basic` and `Authorization Bearer` to work
         # https://github.com/fastlane/fastlane/pull/15928
         command << " -c http.extraheader='Authorization: Basic #{self.git_basic_authorization}'" unless self.git_basic_authorization.nil?
         command << " -c http.extraheader='Authorization: Bearer #{self.git_bearer_authorization}'" unless self.git_bearer_authorization.nil?
 
         if self.shallow_clone
-          command << " --depth 1 --no-single-branch"
-        elsif self.clone_branch_directly
+          command << " --depth 1"
+        end
+
+        if self.clone_branch_directly
           command += " -b #{self.branch.shellescape} --single-branch"
+        elsif self.shallow_clone
+          # shallow clone all branches if not cloning branch directly
+          command += " --no-single-branch"
         end
 
         command = command_from_private_key(command) unless self.git_private_key.nil?

data/match/lib/match/storage/gitlab/client.rb

@@ -40,7 +40,7 @@ module Match
         def files
           @files ||= begin
             url = URI.parse(base_url)
-            # 100 is maximum number of Secure files available on Gitlab https://docs.gitlab.com/ee/api/secure_files.html
+            # 100 is maximum number of Secure files available on GitLab https://docs.gitlab.com/ee/api/secure_files.html
             url.query = [url.query, "per_page=100"].compact.join('&')
 
             request = Net::HTTP::Get.new(url.request_uri)

data/match/lib/match/storage/gitlab_secure_files.rb

@@ -132,7 +132,7 @@ module Match
         return api_token
       end
 
-      # Returns a short string describing + identifing the current
+      # Returns a short string describing + identifying the current
       # storage backend. This will be printed when nuking a storage
       def human_readable_description
         "GitLab Secure Files Storage [#{self.project_id}]"

data/match/lib/match/storage/interface.rb

@@ -36,7 +36,7 @@ module Match
         not_implemented(__method__)
       end
 
-      # Returns a short string describing + identifing the current
+      # Returns a short string describing + identifying the current
       # storage backend. This will be printed when nuking a storage
       def human_readable_description
         not_implemented(__method__)

data/match/lib/match/storage/s3_storage.rb

@@ -121,7 +121,7 @@ module Match
         UI.verbose("Successfully downloaded files from S3 to #{self.working_directory}")
       end
 
-      # Returns a short string describing + identifing the current
+      # Returns a short string describing + identifying the current
       # storage backend. This will be printed when nuking a storage
       def human_readable_description
         return "S3 Bucket [#{s3_bucket}] on region #{s3_region}"

data/match/lib/match.rb

@@ -12,3 +12,6 @@ require_relative 'match/importer'
 require_relative 'match/storage'
 require_relative 'match/encryption'
 require_relative 'match/module'
+require_relative 'match/portal_cache'
+require_relative 'match/portal_fetcher'
+require_relative 'match/profile_includes'

data/produce/lib/produce/itunes_connect.rb

@@ -71,7 +71,7 @@ module Produce
         # Add users to app
         unless user_ids.empty?
           application.add_users(user_ids: user_ids)
-          UI.message("Successfuly added #{user_ids.size} #{user_ids.count == 1 ? 'user' : 'users'} to app")
+          UI.message("Successfully added #{user_ids.size} #{user_ids.count == 1 ? 'user' : 'users'} to app")
         end
 
         UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.id}")

data/scan/lib/scan/detect_values.rb

@@ -1,10 +1,19 @@
 require 'fastlane_core/device_manager'
 require 'fastlane_core/project'
+require 'pathname'
+require 'set'
 require_relative 'module'
 
 module Scan
   # This class detects all kinds of default values
   class DetectValues
+    PLATFORMS = {
+      'iOS' => { simulator: 'iphonesimulator', name: 'com.apple.platform.iphoneos' },
+      'tvOS' => { simulator: 'appletvsimulator', name: 'com.apple.platform.appletvos' },
+      'watchOS' => { simulator: 'watchsimulator', name: 'com.apple.platform.watchos' },
+      'visionOS' => { simulator: 'xrsimulator', name: 'com.apple.platform.xros' }
+    }.freeze
+
     # This is needed as these are more complex default values
     # Returns the finished config object
     def self.set_additional_default_values
@@ -100,6 +109,66 @@ module Scan
       end
     end
 
+    def self.default_os_version(os_type)
+      @os_versions ||= {}
+      @os_versions[os_type] ||= begin
+        UI.crash!("Unknown platform: #{os_type}") unless PLATFORMS.key?(os_type)
+        platform = PLATFORMS[os_type]
+
+        _, error, = Open3.capture3('xcrun simctl runtime -h')
+        unless error.include?('Usage: simctl runtime <operation> <arguments>')
+          UI.error("xcrun simctl runtime broken, run 'xcrun simctl runtime' and make sure it works")
+          UI.user_error!("xcrun simctl runtime not working.")
+        end
+
+        # `match list` subcommand added in Xcode 15
+        if error.include?('match list')
+
+          # list SDK version for currently running Xcode
+          sdks_output, status = Open3.capture2('xcodebuild -showsdks -json')
+          sdk_version = begin
+            raise status unless status.success?
+            JSON.parse(sdks_output).find { |e| e['platform'] == platform[:simulator] }['sdkVersion']
+          rescue StandardError => e
+            UI.error(e)
+            UI.error("xcodebuild CLI broken, please run `xcodebuild` and make sure it works")
+            UI.user_error!("xcodebuild not working")
+          end
+
+          # Get runtime build from SDK version
+          runtime_output, status = Open3.capture2('xcrun simctl runtime match list -j')
+          runtime_build = begin
+            raise status unless status.success?
+            JSON.parse(runtime_output).values.find { |elem| elem['platform'] == platform[:name] && elem['sdkVersion'] == sdk_version }['chosenRuntimeBuild']
+          rescue StandardError => e
+            UI.error(e)
+            UI.error("xcrun simctl runtime broken, please verify that `xcrun simctl runtime match list` and `xcrun simctl runtime list` work")
+            UI.user_error!("xcrun simctl runtime not working")
+          end
+
+          # Get OS version corresponding to build
+          Gem::Version.new(FastlaneCore::DeviceManager.runtime_build_os_versions[runtime_build])
+        end
+      end
+    end
+
+    def self.clear_cache
+      @os_versions = nil
+    end
+
+    def self.compatibility_constraint(sim, device_name)
+      latest_os = default_os_version(sim.os_type)
+      sim.name == device_name && (latest_os.nil? || Gem::Version.new(sim.os_version) <= latest_os)
+    end
+
+    def self.highest_compatible_simulator(simulators, device_name)
+      simulators
+        .select { |sim| compatibility_constraint(sim, device_name) }
+        .reverse
+        .sort_by! { |sim| Gem::Version.new(sim.os_version) }
+        .last
+    end
+
     def self.regular_expression_for_split_on_whitespace_followed_by_parenthesized_version
       # %r{
       #   \s # a whitespace character
@@ -114,10 +183,9 @@ module Scan
     end
 
     def self.detect_simulator(devices, requested_os_type, deployment_target_key, default_device_name, simulator_type_descriptor)
-      require 'set'
+      clear_cache
 
       deployment_target_version = get_deployment_target_version(deployment_target_key)
-
       simulators = filter_simulators(
         FastlaneCore::DeviceManager.simulators(requested_os_type).tap do |array|
           if array.empty?
@@ -137,26 +205,23 @@ module Scan
       # We create 2 lambdas, which we iterate over later on
       # If the first lambda `matches` found a simulator to use
       # we'll never call the second one
-
       matches = lambda do
         set_of_simulators = devices.inject(
           Set.new # of simulators
         ) do |set, device_string|
           pieces = device_string.split(regular_expression_for_split_on_whitespace_followed_by_parenthesized_version)
 
-          selector = ->(sim) { pieces.count > 0 && sim.name == pieces.first }
+          display_device = "'#{device_string}'"
 
           set + (
             if pieces.count == 0
               [] # empty array
             elsif pieces.count == 1
-              simulators
-                .select(&selector)
-                .reverse # more efficient, because `simctl` prints higher versions first
-                .sort_by! { |sim| Gem::Version.new(sim.os_version) }
-                .pop(1)
+              [ highest_compatible_simulator(simulators, pieces.first) ]
             else # pieces.count == 2 -- mathematically, because of the 'end of line' part of our regular expression
               version = pieces[1].tr('()', '')
+              display_device = "'#{pieces[0]}' with version #{version}"
+
               potential_emptiness_error = lambda do |sims|
                 if sims.empty?
                   UI.error("No simulators found that are equal to the version " \
@@ -164,12 +229,12 @@ module Scan
                   "of deployment target (#{deployment_target_version})")
                 end
               end
-              filter_simulators(simulators, :equal, version).tap(&potential_emptiness_error).select(&selector)
+              filter_simulators(simulators, :equal, version).tap(&potential_emptiness_error).select { |sim| sim.name == pieces.first }
             end
           ).tap do |array|
             if array.empty?
-              UI.test_failure!("No device found with name '#{device_string}'") if Scan.config[:ensure_devices_found]
-              UI.error("Ignoring '#{device_string}', couldn’t find matching simulator")
+              UI.test_failure!("No device found with name #{display_device}") if Scan.config[:ensure_devices_found]
+              UI.error("Ignoring '#{device_string}', couldn't find matching simulator")
             end
           end
         end
@@ -181,13 +246,7 @@ module Scan
         default = lambda do
           UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator") if (devices || []).count > 0
 
-          result = Array(
-            simulators
-              .select { |sim| sim.name == default_device_name }
-              .reverse # more efficient, because `simctl` prints higher versions first
-              .sort_by! { |sim| Gem::Version.new(sim.os_version) }
-              .last || simulators.first
-          )
+          result = [ highest_compatible_simulator(simulators, default_device_name) || simulators.first ]
 
           UI.message("Found simulator \"#{result.first.name} (#{result.first.os_version})\"") if result.first
 
@@ -244,7 +303,6 @@ module Scan
       version = Scan.config[:deployment_target_version]
       version ||= Scan.project.build_settings(key: deployment_target_key) if Scan.project
       version ||= 0
-
       return version
     end
   end

data/scan/lib/scan/options.rb

@@ -269,7 +269,7 @@ module Scan
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :output_remove_retry_attempts,
-                                     env_name: "SCAN_OUTPUT_REMOVE_RETRY_ATTEMPS",
+                                     env_names: ["SCAN_OUTPUT_REMOVE_RETRY_ATTEMPS", "SCAN_OUTPUT_REMOVE_RETRY_ATTEMPTS"], # The version with typo must be deprecated
                                      description: "Remove retry attempts from test results table and the JUnit report (if not using xcpretty)",
                                      type: Boolean,
                                      default_value: false),

data/scan/lib/scan/runner.rb

@@ -397,7 +397,7 @@ module Scan
 
       # Return early unless the user wants to prelaunch simulators. Or if the user wants simulator logs
       # then we must prelaunch simulators because Xcode's headless
-      # mode launches and shutsdown the simulators before we can collect the logs.
+      # mode launches and shuts down the simulators before we can collect the logs.
       return unless Scan.config[:prelaunch_simulator] || Scan.config[:include_simulator_logs]
 
       devices_to_shutdown = []

data/screengrab/lib/screengrab/runner.rb

@@ -37,7 +37,7 @@ module Screengrab
       test_packages_to_use = @config[:use_tests_in_packages]
 
       if test_classes_to_use && test_classes_to_use.any? && test_packages_to_use && test_packages_to_use.any?
-        UI.error("'use_tests_in_classes' and 'use_tests_in_packages' can not be combined. Please use one or the other.")
+        UI.error("'use_tests_in_classes' and 'use_tests_in_packages' cannot be combined. Please use one or the other.")
         return
       end
 

data/sigh/lib/assets/resign.sh

@@ -37,7 +37,7 @@
 # ./floatsign source "iPhone Distribution: Name" -p "path/to/profile" [-d "display name"]  [-e entitlements] [-k keychain] [-b "BundleIdentifier"] outputIpa
 #
 #
-# Modifed 26th January 2012
+# Modified 26th January 2012
 #
 # new features January 2012:
 # 1. change the app display name
@@ -82,12 +82,12 @@
 # 1. fix the way app entitlements are extracted
 #
 # new features October 2021
-# 1. change codesign signatue to use --generate-entitlement-der to include DER encoded entitlements
+# 1. change codesign signature to use --generate-entitlement-der to include DER encoded entitlements
 
 # Logging functions
 
 log() {
-    # Make sure it returns 0 code even when verose mode is off (test 1)
+    # Make sure it returns 0 code even when verbose mode is off (test 1)
     # To use like [[ condition ]] && log "x" && something
     if [[ -n "$VERBOSE" ]]; then echo -e "$@"; else test 1; fi
 }
@@ -149,7 +149,7 @@ usage() {
     echo -e "\t\t\t\t\t\t\tCan't use together with '-n, --version-number' option." >&2
     echo -e "\t-b, --bundle-id bundleId\t\tSpecify new bundle identifier (CFBundleIdentifier)." >&2
     echo -e "\t\t\t\t\t\t\tWarning: will NOT apply for nested apps and extensions." >&2
-    echo -e "\t    --use-app-entitlements\t\tExtract app bundle codesigning entitlements and combine with entitlements from new provisionin profile." >&2
+    echo -e "\t    --use-app-entitlements\t\tExtract app bundle codesigning entitlements and combine with entitlements from new provisioning profile." >&2
     echo -e "\t\t\t\t\t\t\tCan't use together with '-e, --entitlements' option." >&2
     echo -e "\t--keychain-path path\t\t\tSpecify the path to a keychain that /usr/bin/codesign should use." >&2
     echo -e "\t-v, --verbose\t\t\t\tVerbose output." >&2
@@ -561,7 +561,7 @@ function resign {
     FRAMEWORKS_DIR="$APP_PATH/Frameworks"
     if [ -d "$FRAMEWORKS_DIR" ]; then
         if [ "$TEAM_IDENTIFIER" == "" ]; then
-            error "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work"
+            error "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications without a team identifier in the certificate/profile does not work"
         fi
 
         log "Resigning embedded frameworks using certificate: '$CERTIFICATE'"
@@ -569,7 +569,7 @@ function resign {
         do
             if [[ "$framework" == *.framework || "$framework" == *.dylib ]]; then
                 log "Resigning '$framework'"
-                # Must not qote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
+                # Must not quote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
                 # shellcheck disable=SC2086
                 /usr/bin/codesign ${VERBOSE} --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" "$framework"
                 checkStatus
@@ -741,7 +741,7 @@ function resign {
         done
 
         # List of rules for transferring entitlements from app to profile plist
-        # The format for each enty is "KEY[|ID_TYPE]"
+        # The format for each entry is "KEY[|ID_TYPE]"
         # Where KEY is the plist key, e.g. "keychain-access-groups"
         # and ID_TYPE is optional part separated by '|' that specifies what value to patch:
         # TEAM_ID - patch the TeamIdentifierPrefix
@@ -838,7 +838,7 @@ function resign {
                 ENTITLEMENTS_VALUE=$(echo "$ENTITLEMENTS_VALUE" | /usr/bin/sed -e "s/$OLD_ICLOUD_ENV/$NEW_ICLOUD_ENV/g")
             fi
 
-            # Remove the entry for current key from profisioning profile entitlements (if exists)
+            # Remove the entry for current key from provisioning profile entitlements (if exists)
             PlistBuddy -c "Delete $KEY" "$PATCHED_ENTITLEMENTS" 2>/dev/null
 
             # Add new entry to patched entitlements
@@ -882,7 +882,7 @@ function resign {
             log "Creating an archived-expanded-entitlements.xcent file for Xcode 9 builds or earlier"
             cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
         fi
-        # Must not qote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
+        # Must not quote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
         # shellcheck disable=SC2086
         /usr/bin/codesign ${VERBOSE} --generate-entitlement-der ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"
         checkStatus
@@ -916,7 +916,7 @@ log "Repackaging as $NEW_FILE"
 # Zip up the contents of the "$TEMP_DIR" folder
 # Navigate to the temporary directory (sending the output to null)
 # Zip all the contents, saving the zip file in the above directory
-# Navigate back to the orignating directory (sending the output to null)
+# Navigate back to the originating directory (sending the output to null)
 pushd "$TEMP_DIR" > /dev/null
 # TODO: Fix shellcheck warning and remove directive
 # shellcheck disable=SC2035

data/sigh/lib/sigh/commands_generator.rb

@@ -111,7 +111,7 @@ module Sigh
         c.option('-e', '--entitlements PATH', String, 'The path to the entitlements file to use.')
         c.option('--short_version STRING', String, 'Short version string to force binary and all nested binaries to use (CFBundleShortVersionString).')
         c.option('--bundle_version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleVersion).')
-        c.option('--use_app_entitlements', 'Extract app bundle codesigning entitlements and combine with entitlements from new provisionin profile.')
+        c.option('--use_app_entitlements', 'Extract app bundle codesigning entitlements and combine with entitlements from new provisioning profile.')
         c.option('-g', '--new_bundle_id STRING', String, 'New application bundle ID (CFBundleIdentifier)')
         c.option('--keychain_path STRING', String, 'Path to the keychain that /usr/bin/codesign should use')
 

data/sigh/lib/sigh/module.rb

@@ -33,6 +33,104 @@ module Sigh
         "Direct"
       end
     end
+
+    def profile_type_for_config(platform:, in_house:, config:)
+      profile_type = nil
+
+      case platform.to_s
+      when "ios"
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_STORE
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE if in_house
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC if config[:adhoc]
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT if config[:development]
+      when "tvos"
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_STORE
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE if in_house
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC if config[:adhoc]
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT if config[:development]
+      when "macos"
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE if in_house
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT if config[:development]
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT if config[:developer_id]
+      when "catalyst"
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE if in_house
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT if config[:development]
+        profile_type = Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT if config[:developer_id]
+      end
+
+      profile_type
+    end
+
+    def profile_type_for_distribution_type(platform:, distribution_type:)
+      config = { distribution_type.to_sym => true }
+      in_house = distribution_type == "enterprise"
+
+      self.profile_type_for_config(platform: platform, in_house: in_house, config: config)
+    end
+
+    def certificate_types_for_profile_and_platform(platform:, profile_type:)
+      types = []
+
+      case platform
+      when 'ios', 'tvos'
+        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_DEVELOPMENT
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT,
+            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT
+          ]
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_INHOUSE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_INHOUSE
+          # Enterprise accounts don't have access to Apple Distribution certificates
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
+          ]
+        # handles case where the desired certificate type is adhoc but the account is an enterprise account
+        # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
+        # for enterprise accounts, you get nothing back even if they exist.
+        elsif (profile_type == Spaceship::ConnectAPI::Profile::ProfileType::IOS_APP_ADHOC || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::TVOS_APP_ADHOC) && Spaceship::ConnectAPI.client && Spaceship::ConnectAPI.client.in_house?
+          # Enterprise accounts don't have access to Apple Distribution certificates
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
+          ]
+        else
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
+            Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
+          ]
+        end
+
+      when 'macos', 'catalyst'
+        if profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DEVELOPMENT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DEVELOPMENT
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT,
+            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DEVELOPMENT
+          ]
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_STORE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_STORE
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
+            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
+          ]
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
+          ]
+        elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_INHOUSE || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_INHOUSE
+          # Enterprise accounts don't have access to Apple Distribution certificates
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
+          ]
+        else
+          types = [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION,
+            Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION
+          ]
+        end
+      end
+
+      types
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/sigh/lib/sigh/options.rb

@@ -1,6 +1,10 @@
 require 'fastlane_core/configuration/configuration'
 require 'credentials_manager/appfile_config'
 require_relative 'module'
+require 'spaceship/connect_api/models/device'
+require 'spaceship/connect_api/models/certificate'
+require 'spaceship/connect_api/models/bundle_id'
+require 'spaceship/connect_api/models/profile'
 
 module Sigh
   class Options
@@ -192,7 +196,57 @@ module Sigh
                                      description: "Should the command fail if it was about to create a duplicate of an existing provisioning profile. It can happen due to issues on Apple Developer Portal, when profile to be recreated was not properly deleted first",
                                      optional: true,
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+
+        # Cache
+        FastlaneCore::ConfigItem.new(key: :cached_certificates,
+                                     description: "A list of cached certificates",
+                                     optional: true,
+                                     is_string: false,
+                                     default_value: nil,
+                                     verify_block: proc do |value|
+                                       if !value.kind_of?(Array) ||
+                                         value.empty? ||
+                                         !value.all?(Spaceship::ConnectAPI::Certificate)
+                                         UI.user_error!("cached_certificates parameter must be a non-empty array of Spaceship::ConnectAPI::Certificate") unless value.kind_of?(Array)
+                                       end
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :cached_devices,
+                                     description: "A list of cached devices",
+                                     optional: true,
+                                     is_string: false,
+                                     default_value: nil,
+                                     verify_block: proc do |value|
+                                       if !value.kind_of?(Array) ||
+                                         value.empty? ||
+                                         !value.all?(Spaceship::ConnectAPI::Device)
+                                         UI.user_error!("cached_devices parameter must be a non-empty array of Spaceship::ConnectAPI::Device")
+                                       end
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :cached_bundle_ids,
+                                     description: "A list of cached bundle ids",
+                                     optional: true,
+                                     is_string: false,
+                                     default_value: nil,
+                                     verify_block: proc do |value|
+                                       if !value.kind_of?(Array) ||
+                                         value.empty? ||
+                                         !value.all?(Spaceship::ConnectAPI::BundleId)
+                                         UI.user_error!("cached_bundle_ids parameter must be a non-empty array of Spaceship::ConnectAPI::BundleId")
+                                       end
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :cached_profiles,
+                                      description: "A list of cached bundle ids",
+                                      optional: true,
+                                      is_string: false,
+                                      default_value: nil,
+                                      verify_block: proc do |value|
+                                        if !value.kind_of?(Array) ||
+                                          value.empty? ||
+                                          !value.all?(Spaceship::ConnectAPI::Profile)
+                                          UI.user_error!("cached_profiles parameter must be a non-empty array of Spaceship::ConnectAPI::Profile")
+                                        end
+                                      end)
       ]
     end
   end

data/sigh/lib/sigh/resign.rb

@@ -58,7 +58,7 @@ module Sigh
         resign_path.shellescape,
         ipa.shellescape,
         signing_identity.shellescape,
-        provisioning_options, # we are aleady shellescaping this above, when we create the provisioning_options from the provisioning_profiles
+        provisioning_options, # we are already shellescaping this above, when we create the provisioning_options from the provisioning_profiles
         entitlements,
         version,
         display_name,