Skip to content

Migrate packages #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Migrate packages #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc07914
Move certificateutil, profileutil, export, exportoptions and plistuti…
godrei Aug 15, 2025
0971cb7
Replace github.com/pkg/errors with the stdlib errors package
godrei Aug 15, 2025
5e39744
Replace howett.net/plist with github.com/bitrise-io/go-plist
godrei Aug 15, 2025
8c39300
Migrate v1 utility libs
godrei Aug 15, 2025
29e3a59
Migrate v1 utility libs and fix tests
godrei Aug 15, 2025
48e384c
Make exportoptions.WritePlistToFile private
godrei Aug 22, 2025
ea734cd
Cleanup export package
godrei Aug 22, 2025
680219d
Merge branch 'master' into migrate-packages
godrei Sep 12, 2025
6e55534
Migrate profileutil
godrei Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions _integration_tests/zip/ipa_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"testing"

"github.com/bitrise-io/go-utils/v2/log"
"github.com/bitrise-io/go-xcode/plistutil"
"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"
)
Expand Down
2 changes: 1 addition & 1 deletion artifacts/ios_xcarchive_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package artifacts

import (
"github.com/bitrise-io/go-xcode/plistutil"
"github.com/bitrise-io/go-xcode/v2/plistutil"
)

// IOSXCArchiveReader ...
Expand Down
6 changes: 3 additions & 3 deletions artifacts/ipa_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package artifacts
import (
"fmt"

"github.com/bitrise-io/go-xcode/plistutil"
"github.com/bitrise-io/go-xcode/profileutil"
"github.com/bitrise-io/go-xcode/v2/plistutil"
"github.com/bitrise-io/go-xcode/v2/profileutil"
)

// IPAReader ...
Expand All @@ -29,7 +29,7 @@ func (reader IPAReader) ProvisioningProfileInfo() (*profileutil.ProvisioningProf
return nil, fmt.Errorf("failed to parse embedded.mobilprovision: %w", err)
}

provisioningProfileInfo, err := profileutil.NewProvisioningProfileInfo(*profilePKCS7)
provisioningProfileInfo, err := profileutil.ProvisioningProfileInfoFromPKCS7(*profilePKCS7)
if err != nil {
return nil, fmt.Errorf("failed to read profile info: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion artifacts/xcarchive_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package artifacts

import (
"github.com/bitrise-io/go-xcode/plistutil"
"github.com/bitrise-io/go-xcode/v2/plistutil"
)

// XCArchiveReader ...
Expand Down
4 changes: 2 additions & 2 deletions autocodesign/autocodesign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"math/big"

"github.com/bitrise-io/go-utils/log"
"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"
)

Expand Down
2 changes: 1 addition & 1 deletion autocodesign/autocodesign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ 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"
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"
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/certdownloader/certdownloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/bitrise-io/go-steputils/input"
"github.com/bitrise-io/go-utils/filedownloader"
"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/certificateutil"
)

// CertificateAndPassphrase contains a p12 file URL and passphrase
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/certdownloader/certdownloader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/bitrise-io/go-xcode/certificateutil"
"github.com/bitrise-io/go-xcode/v2/certificateutil"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion autocodesign/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/certificates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/codesignasset/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/devportalclient/appstoreconnectclient/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/devportalclient/devportalclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (f Factory) Create(credentials devportalservice.Credentials, teamID string)
f.logger.Println()
f.logger.Infof("Initializing Developer Portal client")
var devportalClient autocodesign.DevPortalClient
tracker := appstoreconnect.NewDefaultTracker(analytics.NewDefaultTracker(f.logger), env.NewRepository())
tracker := appstoreconnect.NewDefaultTracker(analytics.NewDefaultTracker(f.logger, env.NewRepository()), env.NewRepository())
if credentials.APIKey != nil {
httpClient := appstoreconnect.NewRetryableHTTPClient()
client := appstoreconnect.NewClient(
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/devportalclient/spaceship/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/keychain/keychain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion autocodesign/keychain/keychain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions autocodesign/localcodesignasset/localcodesignasset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/exportoptions"
"github.com/bitrise-io/go-xcode/v2/profileutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/localcodesignasset/mocks/ProvisioningProfileConverter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autocodesign/localcodesignasset/mocks/ProvisioningProfileProvider.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autocodesign/localcodesignasset/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ...
Expand Down
13 changes: 11 additions & 2 deletions autocodesign/localcodesignasset/profileconverter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package localcodesignasset
import (
"os"

"github.com/bitrise-io/go-xcode/profileutil"
"github.com/bitrise-io/go-utils/v2/fileutil"
"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 ...
Expand All @@ -22,10 +24,17 @@ func NewProvisioningProfileConverter() ProvisioningProfileConverter {

// ProfileInfoToProfile ...
func (c provisioningProfileConverter) ProfileInfoToProfile(info profileutil.ProvisioningProfileInfoModel) (autocodesign.Profile, error) {
_, pth, err := profileutil.FindProvisioningProfile(info.UUID)
profileProvider := profileutil.NewProfileProvider(fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathChecker())
_, pth, err := profileProvider.FindProvisioningProfile(info.UUID, profileutil.ProfileTypeIos)
if err != nil {
return nil, err
}
if pth == "" {
_, pth, err = profileProvider.FindProvisioningProfile(info.UUID, profileutil.ProfileTypeTvOs)
if err != nil {
return nil, err
}
}
content, err := os.ReadFile(pth)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐛 Bug

Potential nil pointer dereference when pth is empty string. If both iOS and tvOS profile lookups fail to find a profile (both return empty path), pth will be empty and os.ReadFile will fail with a misleading error.

🔄 Suggestion:

Suggested change
content, err := os.ReadFile(pth)
if pth == "" {
return nil, fmt.Errorf("provisioning profile with UUID %s not found", info.UUID)
}
content, err := os.ReadFile(pth)

if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/localcodesignasset/profilelookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/bitrise-io/go-utils/sliceutil"
"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 {
Expand Down
6 changes: 3 additions & 3 deletions autocodesign/localcodesignasset/profilelookup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/exportoptions"
"github.com/bitrise-io/go-xcode/v2/profileutil"
"github.com/stretchr/testify/assert"
)

Expand Down
9 changes: 7 additions & 2 deletions autocodesign/localcodesignasset/profileprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
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/pathutil"
"github.com/bitrise-io/go-xcode/v2/profileutil"
)

// ProvisioningProfileProvider can list profile infos.
type ProvisioningProfileProvider interface {
Expand All @@ -16,5 +20,6 @@ func NewProvisioningProfileProvider() ProvisioningProfileProvider {

// ListProvisioningProfiles ...
func (p provisioningProfileProvider) ListProvisioningProfiles() ([]profileutil.ProvisioningProfileInfoModel, error) {
return profileutil.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
profileProvider := profileutil.NewProfileProvider(fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathChecker())
return profileProvider.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
}
2 changes: 1 addition & 1 deletion autocodesign/mock_AssetWriter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autocodesign/mock_CertificateProvider.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions autocodesign/profiledownloader/profiledownloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/bitrise-io/go-steputils/input"
"github.com/bitrise-io/go-utils/filedownloader"
"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 {
Expand Down Expand Up @@ -54,7 +54,7 @@ func (d downloader) GetProfiles() ([]autocodesign.LocalProfile, error) {
return nil, fmt.Errorf("invalid pkcs7 file format: %w", err)
}

profileInfo, err := profileutil.NewProvisioningProfileInfo(*parsedProfile)
profileInfo, err := profileutil.ProvisioningProfileInfoFromPKCS7(*parsedProfile)
if err != nil {
return nil, fmt.Errorf("unknown provisioning profile format: %w", err)
}
Expand Down
6 changes: 3 additions & 3 deletions autocodesign/profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/go-utils/retry"
"github.com/bitrise-io/go-utils/sliceutil"
"github.com/bitrise-io/go-xcode/profileutil"
"github.com/bitrise-io/go-xcode/v2/autocodesign/devportalclient/appstoreconnect"
"github.com/bitrise-io/go-xcode/v2/profileutil"
"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
)

Expand Down Expand Up @@ -386,7 +386,7 @@ func ParseRawProfileDeviceUDIDs(profileContents []byte) (DeviceUDIDs, error) {
return nil, fmt.Errorf("failed to parse pkcs7 from profile content: %s", err)
}

profile, err := profileutil.NewProvisioningProfileInfo(*pkcs)
profile, err := profileutil.ProvisioningProfileInfoFromPKCS7(*pkcs)
if err != nil {
return nil, fmt.Errorf("failed to parse profile info from pkcs7 content: %s", err)
}
Expand All @@ -401,7 +401,7 @@ func ParseRawProfileEntitlements(profileContents []byte) (Entitlements, error) {
return nil, fmt.Errorf("failed to parse pkcs7 from profile content: %s", err)
}

profile, err := profileutil.NewProvisioningProfileInfo(*pkcs)
profile, err := profileutil.ProvisioningProfileInfoFromPKCS7(*pkcs)
if err != nil {
return nil, fmt.Errorf("failed to parse profile info from pkcs7 content: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/projectmanager/projecthelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"regexp"
"strings"

"github.com/bitrise-io/go-plist"
"github.com/bitrise-io/go-utils/fileutil"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/go-utils/pathutil"
Expand All @@ -17,7 +18,6 @@ import (
"github.com/bitrise-io/go-xcode/xcodeproject/serialized"
"github.com/bitrise-io/go-xcode/xcodeproject/xcodeproj"
"github.com/bitrise-io/go-xcode/xcodeproject/xcscheme"
"howett.net/plist"
)

// ProjectHelper ...
Expand Down
2 changes: 1 addition & 1 deletion autocodesign/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package autocodesign
import (
"testing"

"github.com/bitrise-io/go-xcode/certificateutil"
"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/certificateutil"
"github.com/stretchr/testify/assert"
)

Expand Down
Loading
Loading