[actions] Notarization - Printing log on error (#21609)

* Notarization - Printing log on error * Notarization - Printing log on error * Notarization - Printing log on error * Notarization - Printing log on error * Notarization - Printing log on error * Notarization - Printing log on error
fastlane · Nov 11, 2023 · 5017060 · 5017060
1 parent 30b67fe
commit 5017060
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/fastlane/lib/fastlane/actions/notarize.rb b/fastlane/lib/fastlane/actions/notarize.rb
@@ -85,9 +85,9 @@ def self.notarytool(params, package_path, bundle_id, skip_stapling, print_log, v
         notarization_info = JSON.parse(submit_response)
 
         # Staple
+        submission_id = notarization_info["id"]
         case notarization_info['status']
         when 'Accepted'
-          submission_id = notarization_info["id"]
           UI.success("Successfully uploaded package to notarization service with request identifier #{submission_id}")
 
           if skip_stapling
@@ -100,7 +100,22 @@ def self.notarytool(params, package_path, bundle_id, skip_stapling, print_log, v
             UI.success("Successfully notarized and stapled package")
           end
         when 'Invalid'
-          UI.user_error!("Could not notarize package with message '#{notarization_info['statusSummary']}'")
+          if submission_id && print_log
+            log_request_parts = [
+              "xcrun notarytool log #{submission_id}"
+            ] + auth_parts
+            log_request_command = log_request_parts.join(' ')
+            log_request_response = Actions.sh(
+              log_request_command,
+              log: verbose,
+              error_callback: lambda { |msg|
+                UI.error("Error requesting the notarization log: #{msg}")
+              }
+            )
+            UI.user_error!("Could not notarize package with message '#{log_request_response}'")
+          else
+            UI.user_error!("Could not notarize package. To see the error, please set 'print_log' to true.")
+          end
         else
           UI.crash!("Could not notarize package with status '#{notarization_info['status']}'")
         end

diff --git a/fastlane/spec/actions_specs/notarize_spec.rb b/fastlane/spec/actions_specs/notarize_spec.rb
@@ -108,7 +108,7 @@
                   asc_provider: '#{asc_provider}',
                 )
               end").runner.execute(:test)
-            end.to raise_error(FastlaneCore::Interface::FastlaneError, "Could not notarize package with message 'Archive contains critical validation errors'")
+            end.to raise_error(FastlaneCore::Interface::FastlaneError, "Could not notarize package. To see the error, please set 'print_log' to true.")
           end
         end
       end