Skip to content

Go xcode v2 #275

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 7 commits into
base: master
Choose a base branch
from
Draft

Go xcode v2 #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e2402d
Move certificateutil to go-xcode@v2
godrei Jun 20, 2025
60e4288
Add profileutil and export packages to go-xcode@v2
godrei Jun 20, 2025
f9903ec
Move xcarchive to v2
godrei Jun 20, 2025
5ea8e3c
Remove unused xcarchive functionalities and move exportoptions to v2
godrei Jun 20, 2025
72bf032
Move plistutil to v2 and renamePlistData to MapData
godrei Jun 20, 2025
e93b98b
Rename CertificateInfoModel to CertificateInfo and removed unused fun…
godrei Jun 20, 2025
c298d85
Inverse certificateutil dependencies
godrei Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 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 Expand Up @@ -57,10 +57,10 @@ func Benchmark_ZipReaders(b *testing.B) {
watchTestIPAPath := filepath.Join(sampleArtifactsDir, "ipas", "watch-test.ipa")

for name, zipFunc := range map[string]readIPAFunc{
"dittoReader": func() (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel) {
"dittoReader": func() (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel) {
return readIPAWithDittoZipReader(b, watchTestIPAPath)
},
"stdlibReader": func() (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel) {
"stdlibReader": func() (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel) {
return readIPAWithStdlibZipReader(b, watchTestIPAPath)
},
} {
Expand All @@ -70,9 +70,9 @@ func Benchmark_ZipReaders(b *testing.B) {
}
}

type readIPAFunc func() (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel)
type readIPAFunc func() (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel)

func readIPAWithStdlibZipReader(t require.TestingT, archivePth string) (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel) {
func readIPAWithStdlibZipReader(t require.TestingT, archivePth string) (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel) {
r, err := internalzip.NewStdlibRead(archivePth, log.NewLogger())
require.NoError(t, err)
defer func() {
Expand All @@ -83,7 +83,7 @@ func readIPAWithStdlibZipReader(t require.TestingT, archivePth string) (plistuti
return readIPA(t, r)
}

func readIPAWithDittoZipReader(t require.TestingT, archivePth string) (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel) {
func readIPAWithDittoZipReader(t require.TestingT, archivePth string) (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel) {
r := internalzip.NewDittoReader(archivePth, log.NewLogger())
defer func() {
err := r.Close()
Expand All @@ -93,7 +93,7 @@ func readIPAWithDittoZipReader(t require.TestingT, archivePth string) (plistutil
return readIPA(t, r)
}

func readIPA(t require.TestingT, zipReader artifacts.ZipReadCloser) (plistutil.PlistData, *profileutil.ProvisioningProfileInfoModel) {
func readIPA(t require.TestingT, zipReader artifacts.ZipReadCloser) (plistutil.MapData, *profileutil.ProvisioningProfileInfoModel) {
ipaReader := artifacts.NewIPAReader(zipReader)
plist, err := ipaReader.AppInfoPlist()
require.NoError(t, err)
Expand Down
6 changes: 3 additions & 3 deletions 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 All @@ -15,11 +15,11 @@ func NewIOSXCArchiveReader(reader ZipReadCloser) IOSXCArchiveReader {
}

// AppInfoPlist ...
func (reader IOSXCArchiveReader) AppInfoPlist() (plistutil.PlistData, error) {
func (reader IOSXCArchiveReader) AppInfoPlist() (plistutil.MapData, error) {
b, err := reader.zipReader.ReadFile("*.xcarchive/Products/Applications/*.app/Info.plist")
if err != nil {
return nil, err
}

return plistutil.NewPlistDataFromContent(string(b))
return plistutil.NewMapDataFromPlistContent(string(b))
}
8 changes: 4 additions & 4 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 Down Expand Up @@ -38,11 +38,11 @@ func (reader IPAReader) ProvisioningProfileInfo() (*profileutil.ProvisioningProf
}

// AppInfoPlist ...
func (reader IPAReader) AppInfoPlist() (plistutil.PlistData, error) {
func (reader IPAReader) AppInfoPlist() (plistutil.MapData, error) {
b, err := reader.zipReader.ReadFile("Payload/*.app/Info.plist")
if err != nil {
return nil, err
}

return plistutil.NewPlistDataFromContent(string(b))
return plistutil.NewMapDataFromPlistContent(string(b))
}
6 changes: 3 additions & 3 deletions 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 All @@ -15,13 +15,13 @@ func NewXCArchiveReader(reader ZipReadCloser) XCArchiveReader {
}

// InfoPlist ...
func (reader XCArchiveReader) InfoPlist() (plistutil.PlistData, error) {
func (reader XCArchiveReader) InfoPlist() (plistutil.MapData, error) {
b, err := reader.zipReader.ReadFile("*.xcarchive/Info.plist")
if err != nil {
return nil, err
}

return plistutil.NewPlistDataFromContent(string(b))
return plistutil.NewMapDataFromPlistContent(string(b))
}

// IsMacOS ...
Expand Down
14 changes: 7 additions & 7 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 All @@ -31,7 +31,7 @@ type Profile interface {
type AppCodesignAssets struct {
ArchivableTargetProfilesByBundleID map[string]Profile
UITestTargetProfilesByBundleID map[string]Profile
Certificate certificateutil.CertificateInfoModel
Certificate certificateutil.CertificateInfo
}

// Platform ...
Expand Down Expand Up @@ -63,7 +63,7 @@ type Entitlements serialized.Object

// Certificate is certificate present on Apple App Store Connect API, could match a local certificate
type Certificate struct {
CertificateInfo certificateutil.CertificateInfoModel
CertificateInfo certificateutil.CertificateInfo
ID string
}

Expand Down Expand Up @@ -96,7 +96,7 @@ type DevPortalClient interface {
// AssetWriter ...
type AssetWriter interface {
Write(codesignAssetsByDistributionType map[DistributionType]AppCodesignAssets) error
InstallCertificate(certificate certificateutil.CertificateInfoModel) error
InstallCertificate(certificate certificateutil.CertificateInfo) error
InstallProfile(profile Profile) error
}

Expand All @@ -114,11 +114,11 @@ type AppLayout struct {

// CertificateProvider returns codesigning certificates (with private key)
type CertificateProvider interface {
GetCertificates() ([]certificateutil.CertificateInfoModel, error)
GetCertificates() ([]certificateutil.CertificateInfo, error)
}

// LocalCertificates is a map from the certificate type (development, distribution) to an array of installed certs
type LocalCertificates map[appstoreconnect.CertificateType][]certificateutil.CertificateInfoModel
type LocalCertificates map[appstoreconnect.CertificateType][]certificateutil.CertificateInfo

// LocalProfile ...
type LocalProfile struct {
Expand Down
53 changes: 28 additions & 25 deletions 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 Expand Up @@ -62,22 +62,16 @@ func newMockProfile(m profileArgs) Profile {
return profile
}

func newCertificate(t *testing.T, teamID, teamName, commonName string, expiry time.Time) certificateutil.CertificateInfoModel {
cert, privateKey, err := certificateutil.GenerateTestCertificate(int64(1), teamID, teamName, commonName, expiry)
if err != nil {
t.Fatalf("init: failed to generate certificate: %s", err)
}
return certificateutil.NewCertificateInfo(*cert, privateKey)
}

func Test_codesignAssetManager_EnsureCodesignAssets(t *testing.T) {
log.SetEnableDebugLog(true)

const teamID = "MYTEAMID"
const commonNameIOSDevelopment = "Apple Development: test"
const teamName = "BITFALL FEJLESZTO KORLATOLT FELELOSSEGU TARSASAG"
expiry := time.Now().AddDate(1, 0, 0)
devCert := newCertificate(t, teamID, teamName, commonNameIOSDevelopment, expiry)
notBefore := time.Now()
expiry := notBefore.AddDate(1, 0, 0)
devCert, err := certificateutil.GenerateTestCertificateInfo(1, teamID, teamName, commonNameIOSDevelopment, notBefore, expiry)
require.NoError(t, err)

t.Logf("Test certificate generated. %s", devCert)

Expand Down Expand Up @@ -287,8 +281,10 @@ func Test_codesignAssetManager_EnsureCodesignAssets(t *testing.T) {
func Test_GivenNoValidAppID_WhenEnsureAppClipProfile_ThenItFails(t *testing.T) {
// Given
const teamID = "MY_TEAM_ID"
expiry := time.Now().AddDate(1, 0, 0)
devCert := newCertificate(t, teamID, "MY_TEAM", "Apple Development: test", expiry)
notBefore := time.Now()
expiry := notBefore.AddDate(1, 0, 0)
devCert, err := certificateutil.GenerateTestCertificateInfo(1, teamID, "MY_TEAM", "Apple Development: test", notBefore, expiry)
require.NoError(t, err)

client := newClientWithoutAppIDAndProfile(devCert)
assetWriter := newDefaultMockAssetWriter()
Expand All @@ -311,7 +307,7 @@ func Test_GivenNoValidAppID_WhenEnsureAppClipProfile_ThenItFails(t *testing.T) {
}

// When
_, err := manager.EnsureCodesignAssets(appLayout, opts)
_, err = manager.EnsureCodesignAssets(appLayout, opts)

// Then
require.ErrorAs(t, err, &ErrAppClipAppID{})
Expand All @@ -322,8 +318,10 @@ func Test_GivenAppIDWithoutAppleSignIn_WhenEnsureAppClipProfile_ThenItFails(t *t
const teamID = "MY_TEAM_ID"
const appClipBundleID = "io.bitrise.appclip"

expiry := time.Now().AddDate(1, 0, 0)
devCert := newCertificate(t, teamID, "MY_TEAM", "Apple Development: test", expiry)
notBefore := time.Now()
expiry := notBefore.AddDate(1, 0, 0)
devCert, err := certificateutil.GenerateTestCertificateInfo(1, teamID, "MY_TEAM", "Apple Development: test", notBefore, expiry)
require.NoError(t, err)

client := newClientWithAppIDWithoutAppleSignIn(devCert, appClipBundleID)
assetWriter := newDefaultMockAssetWriter()
Expand All @@ -349,7 +347,7 @@ func Test_GivenAppIDWithoutAppleSignIn_WhenEnsureAppClipProfile_ThenItFails(t *t
}

// When
_, err := manager.EnsureCodesignAssets(appLayout, opts)
_, err = manager.EnsureCodesignAssets(appLayout, opts)

// Then
require.ErrorAs(t, err, &ErrAppClipAppIDWithAppleSigning{})
Expand All @@ -358,8 +356,10 @@ func Test_GivenAppIDWithoutAppleSignIn_WhenEnsureAppClipProfile_ThenItFails(t *t
func Test_GivenProfileExpired_WhenProfilesInconsistent_ThenItRetries(t *testing.T) {
// Given
const teamID = "MY_TEAM_ID"
expiry := time.Now().AddDate(1, 0, 0)
devCert := newCertificate(t, teamID, "MY_TEAM", "Apple Development: test", expiry)
notBefore := time.Now()
expiry := notBefore.AddDate(1, 0, 0)
devCert, err := certificateutil.GenerateTestCertificateInfo(1, teamID, "MY_TEAM", "Apple Development: test", notBefore, expiry)
require.NoError(t, err)

expiredProfile := newMockProfile(profileArgs{
attributes: appstoreconnect.ProfileAttributes{
Expand Down Expand Up @@ -423,7 +423,7 @@ func Test_GivenProfileExpired_WhenProfilesInconsistent_ThenItRetries(t *testing.
}

// When
_, err := manager.EnsureCodesignAssets(appLayout, opts)
_, err = manager.EnsureCodesignAssets(appLayout, opts)

// Then
require.NoError(t, err)
Expand All @@ -432,9 +432,12 @@ func Test_GivenProfileExpired_WhenProfilesInconsistent_ThenItRetries(t *testing.
func Test_GivenLocalProfile_WhenCertificateIsMissing_ThenInstalled(t *testing.T) {
// Given
const teamID = "MY_TEAM_ID"
expiry := time.Now().AddDate(1, 0, 0)
devCert1 := newCertificate(t, teamID, "MY_TEAM", "Apple Development: test 1", expiry)
devCert2 := newCertificate(t, teamID, "MY_TEAM", "Apple Development: test 2", expiry)
notBefore := time.Now()
expiry := notBefore.AddDate(1, 0, 0)
devCert1, err := certificateutil.GenerateTestCertificateInfo(1, teamID, "MY_TEAM", "Apple Development: test 1", notBefore, expiry)
require.NoError(t, err)
devCert2, err := certificateutil.GenerateTestCertificateInfo(1, teamID, "MY_TEAM", "Apple Development: test 2", notBefore, expiry)
require.NoError(t, err)

validProfile := newMockProfile(profileArgs{
attributes: appstoreconnect.ProfileAttributes{
Expand Down Expand Up @@ -511,7 +514,7 @@ func Test_GivenLocalProfile_WhenCertificateIsMissing_ThenInstalled(t *testing.T)
require.Equal(t, wantAssets, gotAssets)
}

func newClientWithoutAppIDAndProfile(cert certificateutil.CertificateInfoModel) *MockDevPortalClient {
func newClientWithoutAppIDAndProfile(cert certificateutil.CertificateInfo) *MockDevPortalClient {
client := newMockDevportalClient(devportalArgs{
certs: map[appstoreconnect.CertificateType][]Certificate{
appstoreconnect.IOSDevelopment: {{
Expand All @@ -528,7 +531,7 @@ func newClientWithoutAppIDAndProfile(cert certificateutil.CertificateInfoModel)
return client
}

func newClientWithAppIDWithoutAppleSignIn(cert certificateutil.CertificateInfoModel, bundleID string) *MockDevPortalClient {
func newClientWithAppIDWithoutAppleSignIn(cert certificateutil.CertificateInfo, bundleID string) *MockDevPortalClient {
appID := appstoreconnect.BundleID{
Attributes: appstoreconnect.BundleIDAttributes{
Identifier: bundleID,
Expand Down
10 changes: 5 additions & 5 deletions 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 All @@ -33,8 +33,8 @@ func NewDownloader(certs []CertificateAndPassphrase, client *http.Client) autoco
}

// GetCertificates ...
func (d downloader) GetCertificates() ([]certificateutil.CertificateInfoModel, error) {
var certInfos []certificateutil.CertificateInfoModel
func (d downloader) GetCertificates() ([]certificateutil.CertificateInfo, error) {
var certInfos []certificateutil.CertificateInfo

for i, p12 := range d.certs {
log.Debugf("Downloading p12 file number %d from %s", i, p12.URL)
Expand All @@ -52,7 +52,7 @@ func (d downloader) GetCertificates() ([]certificateutil.CertificateInfoModel, e
}

// downloadAndParsePKCS12 downloads a pkcs12 format file and parses certificates and matching private keys.
func downloadAndParsePKCS12(httpClient *http.Client, certificateURL, passphrase string) ([]certificateutil.CertificateInfoModel, error) {
func downloadAndParsePKCS12(httpClient *http.Client, certificateURL, passphrase string) ([]certificateutil.CertificateInfo, error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

Expand All @@ -74,7 +74,7 @@ func downloadAndParsePKCS12(httpClient *http.Client, certificateURL, passphrase
return infos, nil
}

func certsToString(certs []certificateutil.CertificateInfoModel) (s string) {
func certsToString(certs []certificateutil.CertificateInfo) (s string) {
for i, cert := range certs {
s += "- "
s += cert.String()
Expand Down
Loading