[match] Add support for Developer ID certificates from G2 Sub-CA

cert/lib/cert/runner.rb

@@ -138,26 +138,34 @@ def find_existing_cert
     # All certificates of this type
     def certificates
       filter = {
-        certificateType: certificate_type
+        certificateType: certificate_types.join(",")
       }
       return Spaceship::ConnectAPI::Certificate.all(filter: filter)
     end
 
-    # The kind of certificate we're interested in
+    # The kind of certificate we're interested in (for creating)
     def certificate_type
+      return certificate_types.first
+    end
+
+    # The kind of certificates we're interested in (for listing)
+    def certificate_types
       if Cert.config[:type]
         case Cert.config[:type].to_sym
         when :mac_installer_distribution
-          return Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION
+          return [Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION]
         when :developer_id_application
-          return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          return [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2,
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          ]
         when :developer_id_kext
-          return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_KEXT
+          return [Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_KEXT]
         when :developer_id_installer
           if !Spaceship::ConnectAPI.token.nil?
             raise "As of 2021-11-09, the App Store Connect API does not allow accessing DEVELOPER_ID_INSTALLER with the API Key. Please file an issue on GitHub if this has changed and needs to be updated"
           else
-            return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_INSTALLER
+            return [Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_INSTALLER]
           end
         else
           UI.user_error("Unaccepted value for :type - #{Cert.config[:type]}")
@@ -182,7 +190,7 @@ def certificate_type
         end
       end
 
-      return cert_type
+      return [cert_type]
     end
 
     def create_certificate

match/lib/match/importer.rb

@@ -71,7 +71,8 @@ def import_cert(params, cert_path: nil, p12_path: nil, profile_path: nil)
         ].join(',')
       when :developer_id_application
         certificate_type = [
-          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
         ].join(',')
       when :mac_installer_distribution
         certificate_type = [

sigh/lib/sigh/runner.rb

@@ -251,7 +251,8 @@ def certificates_for_profile_and_platform
           ]
         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,
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
           ]
         else
           types = [

spaceship/lib/spaceship/connect_api/models/certificate.rb

@@ -41,6 +41,7 @@ module CertificateType
         MAC_APP_DEVELOPMENT = "MAC_APP_DEVELOPMENT"
         DEVELOPER_ID_KEXT = "DEVELOPER_ID_KEXT"
         DEVELOPER_ID_APPLICATION = "DEVELOPER_ID_APPLICATION"
+        DEVELOPER_ID_APPLICATION_G2 = "DEVELOPER_ID_APPLICATION_G2"
 
         # As of 2021-11-09, this is only available with Apple ID auth
         DEVELOPER_ID_INSTALLER = "DEVELOPER_ID_INSTALLER"