Enterprise api (#365)

* Add new package

* Update dependencies

* New override field

* Update dependencies

* Fix indentation

* Update dependencies

* Update go-xcode

* Update step input properties

---------

Co-authored-by: LaszloP <[email protected]>
Co-authored-by: Szabolcs Toth <[email protected]>
Co-authored-by: Gabor Szakacs <[email protected]>

Author: 4 people

go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.23
 	github.com/bitrise-io/go-utils v1.0.12
 	github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23
-	github.com/bitrise-io/go-xcode v1.1.1
-	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.48
+	github.com/bitrise-io/go-xcode v1.1.2-0.20241021091717-e6ebe7ad2c74
+	github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.50
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/stretchr/testify v1.9.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -11,10 +11,10 @@ github.com/bitrise-io/go-utils v1.0.12 h1:iJV1ZpyvSA0NCte/N6x+aIQ9TrNr5sIBlcJBf0
 github.com/bitrise-io/go-utils v1.0.12/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
 github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23 h1:Dfh4nyZPuEtilBisidejqxBrkx9cWvbOUrpq8VEION0=
 github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
-github.com/bitrise-io/go-xcode v1.1.1 h1:Krfa8iYZZWdLBuH7AXbufFZwL+Pys7etqvd8+Ehdwt8=
-github.com/bitrise-io/go-xcode v1.1.1/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.48 h1:nsd41UsIGZrPy94tlFxoDCfH2I19A9buPOA/cLgucjA=
-github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.48/go.mod h1:KpxSPrRLgY0fscSajOyO/5h7MhapsqnSJr17oXEaPsg=
+github.com/bitrise-io/go-xcode v1.1.2-0.20241021091717-e6ebe7ad2c74 h1:gs74s+ljimZhALk+YwquKh6xLT+wHJ4NLK8nhukFaww=
+github.com/bitrise-io/go-xcode v1.1.2-0.20241021091717-e6ebe7ad2c74/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.50 h1:vh3miMo4lZb5fz8D1Tca0AerRv2hO3gZS4R5nEeSXKg=
+github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.50/go.mod h1:KpxSPrRLgY0fscSajOyO/5h7MhapsqnSJr17oXEaPsg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

step.yml

@@ -422,7 +422,6 @@ inputs:
       on a step-level. Most of the time it's easier to set up the connection on the App Settings page on Bitrise.
       The input value can be a file path (eg. `$TMPDIR/private_key.p8`) or an HTTPS URL.
       This input only takes effect if the other two connection override inputs are set too (`api_key_id`, `api_key_issuer_id`).
-    is_required: false
 
 - api_key_id:
   opts:
@@ -434,7 +433,6 @@ inputs:
       This overrides the Bitrise-managed API connection, only set this input if you want to control the API connection
       on a step-level. Most of the time it's easier to set up the connection on the App Settings page on Bitrise.
       This input only takes effect if the other two connection override inputs are set too (`api_key_path`, `api_key_issuer_id`).
-    is_required: false
 
 - api_key_issuer_id:
   opts:
@@ -446,7 +444,19 @@ inputs:
       This overrides the Bitrise-managed API connection, only set this input if you want to control the API connection
       on a step-level. Most of the time it's easier to set up the connection on the App Settings page on Bitrise.
       This input only takes effect if the other two connection override inputs are set too (`api_key_path`, `api_key_id`).
-    is_required: false
+
+- api_key_enterprise_account: "no"
+  opts:
+    category: App Store Connect connection override
+    title: App Store Connect API enterprise account
+    summary: Indicates if the account is an enterprise type. This overrides the Bitrise-managed API connection.
+    description: |-
+      Indicates if the account is an enterprise type.
+      This overrides the Bitrise-managed API connection, only set this input if you know you have an enterprise account.
+    value_options:
+    - "yes"
+    - "no"
+    is_required: true
 
 # Debugging
 

step/step.go

@@ -21,7 +21,6 @@ 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/devportalservice"
 	"github.com/bitrise-io/go-xcode/exportoptions"
 	"github.com/bitrise-io/go-xcode/profileutil"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/certdownloader"
@@ -31,6 +30,7 @@ import (
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/profiledownloader"
 	"github.com/bitrise-io/go-xcode/v2/autocodesign/projectmanager"
 	"github.com/bitrise-io/go-xcode/v2/codesign"
+	"github.com/bitrise-io/go-xcode/v2/devportalservice"
 	"github.com/bitrise-io/go-xcode/v2/exportoptionsgenerator"
 	"github.com/bitrise-io/go-xcode/v2/xcconfig"
 	cache "github.com/bitrise-io/go-xcode/v2/xcodecache"
@@ -104,6 +104,7 @@ type Inputs struct {
 	APIKeyPath                      stepconf.Secret `env:"api_key_path"`
 	APIKeyID                        string          `env:"api_key_id"`
 	APIKeyIssuerID                  string          `env:"api_key_issuer_id"`
+	APIKeyEnterpriseAccount         bool            `env:"api_key_enterprise_account,opt[yes,no]"`
 	BuildURL                        string          `env:"BITRISE_BUILD_URL"`
 	BuildAPIToken                   stepconf.Secret `env:"BITRISE_BUILD_API_TOKEN"`
 }
@@ -705,7 +706,7 @@ func (s XcodebuildArchiver) createCodesignManager(config Config) (codesign.Manag
 		return codesign.Manager{}, err
 	}
 
-	devPortalClientFactory := devportalclient.NewFactory(s.logger)
+	devPortalClientFactory := devportalclient.NewFactory(s.logger, s.fileManager)
 
 	var serviceConnection *devportalservice.AppleDeveloperConnection = nil
 	if config.BuildURL != "" && config.BuildAPIToken != "" {
@@ -715,9 +716,10 @@ func (s XcodebuildArchiver) createCodesignManager(config Config) (codesign.Manag
 	}
 
 	connectionInputs := codesign.ConnectionOverrideInputs{
-		APIKeyPath:     config.Inputs.APIKeyPath,
-		APIKeyID:       config.Inputs.APIKeyID,
-		APIKeyIssuerID: config.Inputs.APIKeyIssuerID,
+		APIKeyPath:              config.Inputs.APIKeyPath,
+		APIKeyID:                config.Inputs.APIKeyID,
+		APIKeyIssuerID:          config.Inputs.APIKeyIssuerID,
+		APIKeyEnterpriseAccount: config.Inputs.APIKeyEnterpriseAccount,
 	}
 
 	appleAuthCredentials, err := codesign.SelectConnectionCredentials(authType, serviceConnection, connectionInputs, s.logger)