Step 2168 move certificateutil to v2

_integration_tests/zip/ipa_reader_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/bitrise-io/go-utils/v2/log"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/_integration_tests"
 	"github.com/bitrise-io/go-xcode/v2/artifacts"
 	internalzip "github.com/bitrise-io/go-xcode/v2/internal/zip"
 	"github.com/bitrise-io/go-xcode/v2/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/zip"
 	"github.com/stretchr/testify/require"
 )

artifacts/ipa_reader.go

@@ -3,8 +3,8 @@ package artifacts
 import (
 	"fmt"
 
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/plistutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // IPAReader ...
@@ -24,12 +24,7 @@ func (reader IPAReader) ProvisioningProfileInfo() (*profileutil.ProvisioningProf
 		return nil, err
 	}
 
-	profilePKCS7, err := profileutil.ProvisioningProfileFromContent(b)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse embedded.mobilprovision: %w", err)
-	}
-
-	provisioningProfileInfo, err := profileutil.NewProvisioningProfileInfo(*profilePKCS7)
+	provisioningProfileInfo, err := profileutil.NewProvisioningProfileInfoFromPKCS7Content(b)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read profile info: %w", err)
 	}

autocodesign/autocodesign.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/v2/retry"
-	"github.com/bitrise-io/go-xcode/certificateutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/devportalservice"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
 )
 

autocodesign/autocodesign_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/v2/retry"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	devportaltime "github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

autocodesign/certdownloader/certdownloader.go

@@ -12,8 +12,8 @@ import (
 	"github.com/bitrise-io/go-utils/v2/fileutil"
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/v2/pathutil"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateAndPassphrase contains a p12 file URL and passphrase

autocodesign/certdownloader/certdownloader_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/bitrise-io/go-utils/v2/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/assert"
 )
 

autocodesign/certificates.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 func selectCertificatesAndDistributionTypes(certificateSource DevPortalClient, typeToLocalCerts LocalCertificates, distribution DistributionType, signUITestTargets bool, verboseLog bool) (map[appstoreconnect.CertificateType][]Certificate, []DistributionType, error) {

autocodesign/certificates_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )

autocodesign/codesignasset/writer.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/bitrise-io/go-utils/log"
 	"github.com/bitrise-io/go-utils/pathutil"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/keychain"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 const (

autocodesign/devportalclient/appstoreconnectclient/certificates.go

@@ -7,9 +7,9 @@ import (
 	"math/big"
 
 	"github.com/bitrise-io/go-utils/log"
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateSource ...

autocodesign/devportalclient/spaceship/certificates.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 // CertificateSource ...

autocodesign/keychain/keychain.go

@@ -11,7 +11,7 @@ import (
 	"github.com/bitrise-io/go-utils/fileutil"
 	"github.com/bitrise-io/go-utils/pathutil"
 	"github.com/bitrise-io/go-utils/v2/command"
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 	"github.com/hashicorp/go-version"
 )
 

autocodesign/keychain/keychain_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/bitrise-io/go-steputils/v2/stepconf"
 	"github.com/bitrise-io/go-utils/v2/command"
 	"github.com/bitrise-io/go-utils/v2/env"
-	"github.com/bitrise-io/go-xcode/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
 )
 
 func TestCreateKeychain(t *testing.T) {

autocodesign/localcodesignasset/localcodesignasset_test.go

@@ -6,12 +6,12 @@ import (
 
 	devportaltime "github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/exportoptions"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/localcodesignasset/mocks"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

autocodesign/localcodesignasset/profile.go

@@ -1,10 +1,10 @@
 package localcodesignasset
 
 import (
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/time"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // Profile ...

autocodesign/localcodesignasset/profileconverter.go

@@ -2,9 +2,11 @@ package localcodesignasset
 
 import (
 	"os"
+	"path/filepath"
 
-	"github.com/bitrise-io/go-xcode/profileutil"
+	"github.com/bitrise-io/go-utils/v2/pathutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 // ProvisioningProfileConverter ...
@@ -22,7 +24,7 @@ func NewProvisioningProfileConverter() ProvisioningProfileConverter {
 
 // ProfileInfoToProfile ...
 func (c provisioningProfileConverter) ProfileInfoToProfile(info profileutil.ProvisioningProfileInfoModel) (autocodesign.Profile, error) {
-	_, pth, err := profileutil.FindProvisioningProfile(info.UUID)
+	pth, err := findProvisioningProfile(info.UUID)
 	if err != nil {
 		return nil, err
 	}
@@ -33,3 +35,32 @@ func (c provisioningProfileConverter) ProfileInfoToProfile(info profileutil.Prov
 
 	return NewProfile(info, content), nil
 }
+
+func findProvisioningProfile(uuid string) (string, error) {
+	// TODO: wire in as a dep on the struct
+	pathModifier := pathutil.NewPathModifier()
+	pathChecker := pathutil.NewPathChecker()
+
+	absProvProfileDirPath, err := pathModifier.AbsPath(profileutil.ProvProfileSystemDirPath)
+	if err != nil {
+		return "", err
+	}
+
+	iosProvisioningProfileExt := ".mobileprovision"
+	pth := filepath.Join(absProvProfileDirPath, uuid+iosProvisioningProfileExt)
+	if exist, err := pathChecker.IsPathExists(pth); err != nil {
+		return "", err
+	} else if exist {
+		return pth, nil
+	}
+
+	macOsProvisioningProfileExt := ".provisionprofile"
+	pth = filepath.Join(absProvProfileDirPath, uuid+macOsProvisioningProfileExt)
+	if exist, err := pathChecker.IsPathExists(pth); err != nil {
+		return "", err
+	} else if exist {
+		return pth, nil
+	}
+
+	return "", nil
+}

autocodesign/localcodesignasset/profilelookup.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 func findProfile(localProfiles []profileutil.ProvisioningProfileInfoModel, platform autocodesign.Platform, distributionType autocodesign.DistributionType, bundleID string, entitlements autocodesign.Entitlements, minProfileDaysValid int, certSerials []string, deviceUDIDs []string) *profileutil.ProvisioningProfileInfoModel {

autocodesign/localcodesignasset/profilelookup_test.go

@@ -3,10 +3,10 @@ package localcodesignasset
 import (
 	"testing"
 
-	"github.com/bitrise-io/go-xcode/certificateutil"
 	"github.com/bitrise-io/go-xcode/exportoptions"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
+	"github.com/bitrise-io/go-xcode/v2/certificateutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 	"github.com/stretchr/testify/assert"
 )
 

autocodesign/localcodesignasset/profileprovider.go

@@ -1,6 +1,11 @@
 package localcodesignasset
 
-import "github.com/bitrise-io/go-xcode/profileutil"
+import (
+	"github.com/bitrise-io/go-utils/v2/fileutil"
+	"github.com/bitrise-io/go-utils/v2/log"
+	"github.com/bitrise-io/go-utils/v2/pathutil"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
+)
 
 // ProvisioningProfileProvider can list profile infos.
 type ProvisioningProfileProvider interface {
@@ -16,5 +21,7 @@ func NewProvisioningProfileProvider() ProvisioningProfileProvider {
 
 // ListProvisioningProfiles ...
 func (p provisioningProfileProvider) ListProvisioningProfiles() ([]profileutil.ProvisioningProfileInfoModel, error) {
-	return profileutil.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
+	// TODO: wire in as a dep on the struct
+	profileReader := profileutil.NewProfileReader(log.NewLogger(), fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider(), pathutil.NewPathChecker())
+	return profileReader.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
 }

autocodesign/profiledownloader/profiledownloader.go

@@ -11,9 +11,9 @@ import (
 	"github.com/bitrise-io/go-utils/v2/fileutil"
 	"github.com/bitrise-io/go-utils/v2/log"
 	"github.com/bitrise-io/go-utils/v2/pathutil"
-	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/localcodesignasset"
+	"github.com/bitrise-io/go-xcode/v2/profileutil"
 )
 
 type downloader struct {
@@ -65,12 +65,7 @@ func (d downloader) GetProfiles() ([]autocodesign.LocalProfile, error) {
 			return nil, fmt.Errorf("profile (%s) is empty", url)
 		}
 
-		parsedProfile, err := profileutil.ProvisioningProfileFromContent(content)
-		if err != nil {
-			return nil, fmt.Errorf("invalid pkcs7 file format: %w", err)
-		}
-
-		profileInfo, err := profileutil.NewProvisioningProfileInfo(*parsedProfile)
+		profileInfo, err := profileutil.NewProvisioningProfileInfoFromPKCS7Content(content)
 		if err != nil {
 			return nil, fmt.Errorf("unknown provisioning profile format: %w", err)
 		}