match/lib/match/nuke.rb in fastlane-2.148.1 vs match/lib/match/nuke.rb in fastlane-2.149.0

@@ -25,10 +25,12 @@
       self.params = params
       self.type = type
 
       update_optional_values_depending_on_storage_type(params)
 
+      spaceship_login
+
       self.storage = Storage.for_mode(params[:storage_mode], {
         git_url: params[:git_url],
         shallow_clone: params[:shallow_clone],
         skip_docs: params[:skip_docs],
         git_branch: params[:git_branch],
@@ -39,11 +41,12 @@
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
         google_cloud_project_id: params[:google_cloud_project_id].to_s,
         s3_region: params[:s3_region].to_s,
         s3_access_key: params[:s3_access_key].to_s,
         s3_secret_access_key: params[:s3_secret_access_key].to_s,
-        s3_bucket: params[:s3_bucket].to_s
+        s3_bucket: params[:s3_bucket].to_s,
+        team_id: params[:team_id] || Spaceship.client.team_id
       })
       self.storage.download
 
       # After the download was complete
       self.encryption = Encryption.for_storage_mode(params[:storage_mode], {
@@ -91,21 +94,11 @@
       if params[:storage_mode] != "git"
         params.option_for_key(:git_url).optional = true
       end
     end
 
-    # Collect all the certs/profiles
-    def prepare_list
-      UI.message("Fetching certificates and profiles...")
-      cert_type = Match.cert_type_sym(type)
-      cert_types = [cert_type]
-
-      prov_types = []
-      prov_types = [:development] if cert_type == :development
-      prov_types = [:appstore, :adhoc, :developer_id] if cert_type == :distribution
-      prov_types = [:enterprise] if cert_type == :enterprise
-
+    def spaceship_login
       Spaceship.login(params[:username])
       Spaceship.select_team(team_id: params[:team_id], team_name: params[:team_name])
 
       if Spaceship.client.in_house? && (type == "distribution" || type == "enterprise")
         UI.error("---")
@@ -114,11 +107,23 @@
         UI.error("By nuking your account's enterprise, all your in-house apps will stop working!") if type == "enterprise"
         UI.error("---")
 
         UI.user_error!("Enterprise account nuke cancelled") unless UI.confirm("Do you really want to nuke your Enterprise account?")
       end
+    end
 
+    # Collect all the certs/profiles
+    def prepare_list
+      UI.message("Fetching certificates and profiles...")
+      cert_type = Match.cert_type_sym(type)
+      cert_types = [cert_type]
+
+      prov_types = []
+      prov_types = [:development] if cert_type == :development
+      prov_types = [:appstore, :adhoc, :developer_id] if cert_type == :distribution
+      prov_types = [:enterprise] if cert_type == :enterprise
+
       # Get all iOS and macOS profile
       self.profiles = []
       prov_types.each do |prov_type|
         self.profiles += profile_type(prov_type).all(mac: false)
         self.profiles += profile_type(prov_type).all(mac: true)
@@ -139,18 +144,18 @@
 
       # Finds all the .cer and .p12 files in the file storage
       certs = []
       keys = []
       cert_types.each do |ct|
-        certs += Dir[File.join(self.storage.working_directory, "**", ct.to_s, "*.cer")]
-        keys += Dir[File.join(self.storage.working_directory, "**", ct.to_s, "*.p12")]
+        certs += self.storage.list_files(file_name: ct.to_s, file_ext: "cer")
+        keys += self.storage.list_files(file_name: ct.to_s, file_ext: "p12")
       end
 
       # Finds all the iOS and macOS profofiles in the file storage
       profiles = []
       prov_types.each do |prov_type|
-        profiles += Dir[File.join(self.storage.working_directory, "**", prov_type.to_s, "*.mobileprovision")]
-        profiles += Dir[File.join(self.storage.working_directory, "**", prov_type.to_s, "*.provisionprofile")]
+        profiles += self.storage.list_files(file_name: prov_type.to_s, file_ext: "mobileprovision")
+        profiles += self.storage.list_files(file_name: prov_type.to_s, file_ext: "provisionprofile")
       end
 
       self.files = certs + keys + profiles
     end