Skip to content

Commit bdee5c1

Browse files
godreigodrei
committed
Update profileutil usages
1 parent aa5785f commit bdee5c1

6 files changed

Lines changed: 53 additions & 26 deletions

File tree

‎autocodesign/example_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func Example() {
7878
}
7979
profileReader := profileutil.NewProfileReader(logger, fileManager, pathutil.NewPathModifier(), pathutil.NewPathProvider())
8080
assetWriter := codesignasset.NewWriter(logger, *keychain, fileManager, profileReader, xcodeVersion.Major)
81-
profileProvider := localcodesignasset.NewProvisioningProfileProvider()
81+
profileProvider := localcodesignasset.NewProvisioningProfileProvider(profileReader)
8282
profileConverter := localcodesignasset.NewProvisioningProfileConverter()
8383
localCodesignAssetManager := localcodesignasset.NewManager(profileProvider, profileConverter)
8484

‎autocodesign/localcodesignasset/profileconverter.go‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package localcodesignasset
22

33
import (
4-
"os"
4+
"io"
55

66
"github.com/bitrise-io/go-utils/v2/fileutil"
77
"github.com/bitrise-io/go-utils/v2/log"
@@ -16,35 +16,48 @@ type ProvisioningProfileConverter interface {
1616
}
1717

1818
type provisioningProfileConverter struct {
19+
fileManager fileutil.FileManager
20+
profileReader profileutil.ProfileReader
1921
}
2022

2123
// NewProvisioningProfileConverter ...
2224
func NewProvisioningProfileConverter() ProvisioningProfileConverter {
23-
return provisioningProfileConverter{}
25+
logger := log.NewLogger()
26+
fileManager := fileutil.NewFileManager()
27+
pathModifier := pathutil.NewPathModifier()
28+
pathProvider := pathutil.NewPathProvider()
29+
profileReader := profileutil.NewProfileReader(logger, fileManager, pathModifier, pathProvider)
30+
31+
return provisioningProfileConverter{
32+
fileManager: fileManager,
33+
profileReader: profileReader,
34+
}
2435
}
2536

2637
// ProfileInfoToProfile ...
2738
func (c provisioningProfileConverter) ProfileInfoToProfile(info profileutil.ProvisioningProfileInfoModel) (autocodesign.Profile, error) {
28-
pth, err := findProvisioningProfile(info.UUID)
39+
pth, err := c.findProvisioningProfile(info.UUID)
40+
if err != nil {
41+
return nil, err
42+
}
43+
profile, err := c.fileManager.Open(pth)
2944
if err != nil {
3045
return nil, err
3146
}
32-
content, err := os.ReadFile(pth)
47+
content, err := io.ReadAll(profile)
3348
if err != nil {
3449
return nil, err
3550
}
3651

3752
return NewProfile(info, content), nil
3853
}
3954

40-
func findProvisioningProfile(uuid string) (string, error) {
41-
// TODO: wire deps on ProvisioningProfileConverter
42-
profileReader := profileutil.NewProfileReader(log.NewLogger(), fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
43-
paths, err := profileReader.ListProfiles(profileutil.ProfileTypeIos, uuid)
55+
func (c provisioningProfileConverter) findProvisioningProfile(uuid string) (string, error) {
56+
paths, err := c.profileReader.ListProfiles(profileutil.ProfileTypeIos, uuid)
4457
if err != nil {
4558
return "", err
4659
}
47-
macOSPaths, err := profileReader.ListProfiles(profileutil.ProfileTypeMacOs, uuid)
60+
macOSPaths, err := c.profileReader.ListProfiles(profileutil.ProfileTypeMacOs, uuid)
4861
if err != nil {
4962
return "", err
5063
}
@@ -55,7 +68,7 @@ func findProvisioningProfile(uuid string) (string, error) {
5568
return "", nil
5669
}
5770

58-
_, err = profileReader.ProvisioningProfileInfoFromFile(paths[0])
71+
_, err = c.profileReader.ProvisioningProfileInfoFromFile(paths[0])
5972
if err != nil {
6073
return "", err
6174
}

‎autocodesign/localcodesignasset/profileprovider.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@ type ProvisioningProfileProvider interface {
1212
ListProvisioningProfiles() ([]profileutil.ProvisioningProfileInfoModel, error)
1313
}
1414

15-
type provisioningProfileProvider struct{}
15+
type provisioningProfileProvider struct {
16+
profileReader profileutil.ProfileReader
17+
}
1618

1719
// NewProvisioningProfileProvider ...
1820
func NewProvisioningProfileProvider() ProvisioningProfileProvider {
19-
return provisioningProfileProvider{}
21+
profileReader := profileutil.NewProfileReader(log.NewLogger(), fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
22+
return provisioningProfileProvider{
23+
profileReader: profileReader,
24+
}
2025
}
2126

2227
// ListProvisioningProfiles ...
2328
func (p provisioningProfileProvider) ListProvisioningProfiles() ([]profileutil.ProvisioningProfileInfoModel, error) {
24-
// TODO: wire deps on provisioningProfileProvider
25-
profileReader := profileutil.NewProfileReader(log.NewLogger(), fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
26-
return profileReader.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
29+
return p.profileReader.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
2730
}

‎exportoptionsgenerator/certificates.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ type CodesignIdentityProvider interface {
1010
// LocalCodesignIdentityProvider ...
1111
type LocalCodesignIdentityProvider struct{}
1212

13+
func NewLocalCodesignIdentityProvider() LocalCodesignIdentityProvider {
14+
return LocalCodesignIdentityProvider{}
15+
}
16+
1317
// ListCodesignIdentities ...
1418
func (p LocalCodesignIdentityProvider) ListCodesignIdentities() ([]certificateutil.CertificateInfoModel, error) {
1519
certs, err := certificateutil.InstalledCodesigningCertificateInfos()

‎exportoptionsgenerator/exportoptionsgenerator.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import (
44
"fmt"
55
"slices"
66

7+
"github.com/bitrise-io/go-utils/v2/fileutil"
78
"github.com/bitrise-io/go-utils/v2/log"
9+
"github.com/bitrise-io/go-utils/v2/pathutil"
810
"github.com/bitrise-io/go-xcode/exportoptions"
911
"github.com/bitrise-io/go-xcode/v2/exportoptionsgenerator/internal/codesigngroup"
1012
"github.com/bitrise-io/go-xcode/v2/plistutil"
@@ -39,10 +41,12 @@ type ExportOptionsGenerator struct {
3941

4042
// New constructs a new ExportOptionsGenerator.
4143
func New(xcodeVersionReader xcodeversion.Reader, logger log.Logger) ExportOptionsGenerator {
44+
profileReader := profileutil.NewProfileReader(logger, fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
45+
4246
return ExportOptionsGenerator{
4347
xcodeVersionReader: xcodeVersionReader,
44-
certificateProvider: LocalCodesignIdentityProvider{},
45-
profileProvider: LocalProvisioningProfileProvider{logger: logger},
48+
certificateProvider: NewLocalCodesignIdentityProvider(),
49+
profileProvider: NewLocalProvisioningProfileProvider(profileReader, logger),
4650
codeSignGroupProvider: NewCodeSignGroupProvider(logger),
4751
logger: logger,
4852
}

‎exportoptionsgenerator/profiles.go‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"os"
77
"path/filepath"
88

9-
"github.com/bitrise-io/go-utils/v2/fileutil"
109
"github.com/bitrise-io/go-utils/v2/log"
1110
"github.com/bitrise-io/go-utils/v2/pathutil"
1211
"github.com/bitrise-io/go-xcode/v2/profileutil"
@@ -20,14 +19,20 @@ type ProvisioningProfileProvider interface {
2019

2120
// LocalProvisioningProfileProvider ...
2221
type LocalProvisioningProfileProvider struct {
23-
logger log.Logger
22+
logger log.Logger
23+
profileReader profileutil.ProfileReader
24+
}
25+
26+
func NewLocalProvisioningProfileProvider(profileReader profileutil.ProfileReader, logger log.Logger) LocalProvisioningProfileProvider {
27+
return LocalProvisioningProfileProvider{
28+
logger: logger,
29+
profileReader: profileReader,
30+
}
2431
}
2532

2633
// ListProvisioningProfiles ...
2734
func (p LocalProvisioningProfileProvider) ListProvisioningProfiles() ([]profileutil.ProvisioningProfileInfoModel, error) {
28-
// TODO: wire in as a dep on the struct
29-
profileReader := profileutil.NewProfileReader(p.logger, fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
30-
return profileReader.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
35+
return p.profileReader.InstalledProvisioningProfileInfos(profileutil.ProfileTypeIos)
3136
}
3237

3338
// GetDefaultProvisioningProfile ...
@@ -67,9 +72,7 @@ func (p LocalProvisioningProfileProvider) GetDefaultProvisioningProfile() (profi
6772
return profileutil.ProvisioningProfileInfoModel{}, err
6873
}
6974

70-
// TODO: wire in as a dep on the struct
71-
profileReader := profileutil.NewProfileReader(p.logger, fileutil.NewFileManager(), pathutil.NewPathModifier(), pathutil.NewPathProvider())
72-
defaultProfile, err := profileReader.ProvisioningProfileInfoFromFile(tmpDst)
75+
defaultProfile, err := p.profileReader.ProvisioningProfileInfoFromFile(tmpDst)
7376
if err != nil {
7477
return profileutil.ProvisioningProfileInfoModel{}, err
7578
}

0 commit comments

Comments
 (0)