Adds minumum profile days validity input. (#266)

* Added support for setting minimum profile days validity (Used to manage code signing assets).
* Pass team ID to code signing

Author: lpusok

README.md

@@ -70,6 +70,7 @@ You can also run this step directly with [Bitrise CLI](https://github.com/bitris
 | `log_formatter` | Defines how `xcodebuild` command's log is formatted.  Available options:  - `xcpretty`: The xcodebuild command's output will be prettified by xcpretty. - `xcodebuild`: Only the last 20 lines of raw xcodebuild output will be visible in the build log.  The raw xcodebuild log will be exported in both cases. | required | `xcpretty` |
 | `automatic_code_signing` | This input determines which Bitrise Apple service connection should be used for automatic code signing.  Available values: - `off`: Do not do any auto code signing. - `api-key`: [Bitrise Apple Service connection with API Key](https://devcenter.bitrise.io/getting-started/connecting-to-services/setting-up-connection-to-an-apple-service-with-api-key/). - `apple-id`: [Bitrise Apple Service connection with Apple ID](https://devcenter.bitrise.io/getting-started/connecting-to-services/connecting-to-an-apple-service-with-apple-id/). | required | `off` |
 | `register_test_devices` | If this input is set, the Step will register the known test devices on Bitrise from team members with the Apple Developer Portal.  Note that setting this to yes may cause devices to be registered against your limited quantity of test devices in the Apple Developer Portal, which can only be removed once annually during your renewal window. | required | `no` |
+| `min_profile_validity` | If this input is set to >0, the managed Provisioning Profile will be renewed if it expires within the configured number of days.  Otherwise the Step renews the managed Provisioning Profile if it is expired. | required | `0` |
 | `certificate_url_list` | URL of the code signing certificate to download.  Multiple URLs can be specified, separated by a pipe (`\|`) character.  Local file path can be specified, using the `file://` URL scheme. | required, sensitive | `$BITRISE_CERTIFICATE_URL` |
 | `passphrase_list` | Passphrases for the provided code signing certificates.  Specify as many passphrases as many Code signing certificate URL provided, separated by a pipe (`\|`) character. | required, sensitive | `$BITRISE_CERTIFICATE_PASSPHRASE` |
 | `keychain_path` | Path to the Keychain where the code signing certificates will be installed. | required | `$HOME/Library/Keychains/login.keychain` |

e2e/bitrise.yml

@@ -96,6 +96,7 @@ workflows:
     - BITRISE_PROJECT_PATH: Fruta.xcodeproj
     - BITRISE_SCHEME: Fruta iOS
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: development
     - LOG_FORMATTER: xcodebuild
     after_run:
@@ -121,6 +122,7 @@ workflows:
     - BITRISE_PROJECT_PATH: Fruta.xcodeproj
     - BITRISE_SCHEME: Fruta iOS
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: development
     - LOG_FORMATTER: xcodebuild
     after_run:
@@ -135,6 +137,7 @@ workflows:
     - BITRISE_PROJECT_PATH: ios-simple-objc/ios-simple-objc.xcodeproj
     - BITRISE_SCHEME: ios-simple-objc
     - CODE_SIGNING_METHOD: apple-id
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: development
     - LOG_FORMATTER: xcodebuild
     after_run:
@@ -150,6 +153,7 @@ workflows:
     - BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
     - BITRISE_SCHEME: code-sign-test
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: app-store
     - LOG_FORMATTER: xcpretty
     after_run:
@@ -165,6 +169,7 @@ workflows:
     - BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
     - BITRISE_SCHEME: code-sign-test
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: app-store
     - LOG_FORMATTER: xcpretty
     after_run:
@@ -180,6 +185,7 @@ workflows:
     - BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
     - BITRISE_SCHEME: code-sign-test
     - CODE_SIGNING_METHOD: apple-id
+    - MIN_DAYS_PROFILE_VALID: 0
     - IPA_EXPORT_METHOD: app-store
     - LOG_FORMATTER: xcpretty
     after_run:
@@ -195,6 +201,7 @@ workflows:
     - BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
     - BITRISE_SCHEME: code-sign-test-Prod
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - TEAM_ID: 72SA8V3WYL
     - IPA_EXPORT_METHOD: development
     - IPA_EXPORT_ICLOUD_CONTAINER_ENVIRONMENT: Production
@@ -212,6 +219,7 @@ workflows:
     - BITRISE_PROJECT_PATH: ios-simple-objc/ios-simple-objc.xcworkspace
     - BITRISE_SCHEME: ios-simple-objc
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - TEAM_ID: 72SA8V3WYL
     - IPA_EXPORT_METHOD: development
     - IPA_EXPORT_ICLOUD_CONTAINER_ENVIRONMENT: ""
@@ -230,6 +238,7 @@ workflows:
     - BITRISE_PROJECT_PATH: ios-simple-objc/ios-simple-objc.xcodeproj
     - BITRISE_SCHEME: ios-simple-objc
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - TEAM_ID: 72SA8V3WYL
     - IPA_EXPORT_METHOD: development
     - IPA_EXPORT_ICLOUD_CONTAINER_ENVIRONMENT: ""
@@ -242,13 +251,17 @@ workflows:
     - _check_archive_zip
 
   test_multi_target:
+    description: |-
+      Test app with multiple targets. Also tests api-key signing with a custom min profile days valid.
+      (Should use Bitrise-managed code signing assets).
     envs:
     - TEST_APP_URL: https://github.com/bitrise-samples/sample-apps-ios-multi-target.git
     - TEST_APP_BRANCH: ""
     - TEST_APP_COMMIT: ab36ed563bbc3125118e9f27df91474822dc0d46
     - BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
     - BITRISE_SCHEME: code-sign-test
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 112
     - TEAM_ID: 72SA8V3WYL
     - IPA_EXPORT_METHOD: development
     - IPA_EXPORT_ICLOUD_CONTAINER_ENVIRONMENT: ""
@@ -266,6 +279,7 @@ workflows:
     - BITRISE_PROJECT_PATH: sample-apps-ios-workspace-swift.xcworkspace
     - BITRISE_SCHEME: sample-apps-ios-workspace-swift
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - TEAM_ID: 72SA8V3WYL
     - IPA_EXPORT_METHOD: development
     - IPA_EXPORT_ICLOUD_CONTAINER_ENVIRONMENT: ""
@@ -283,6 +297,7 @@ workflows:
     - BITRISE_PROJECT_PATH: Catalyst Sample.xcodeproj
     - BITRISE_SCHEME: Catalyst Sample
     - CODE_SIGNING_METHOD: api-key
+    - MIN_DAYS_PROFILE_VALID: 0
     - FORCE_CODE_SIGN_IDENTITY: "iPhone Developer: Dev Portal Bot Bitrise"
     - TEAM_ID: 72SA8V3WYL
     - FORCE_PROV_PROFILE_SPECIFIER: ""
@@ -324,6 +339,7 @@ workflows:
         - project_path: ./_tmp/$BITRISE_PROJECT_PATH
         - scheme: $BITRISE_SCHEME
         - automatic_code_signing: $CODE_SIGNING_METHOD
+        - min_profile_validity: $MIN_DAYS_PROFILE_VALID
         - certificate_url_list: $BITFALL_APPLE_APPLE_CERTIFICATE_URL_LIST|$BITFALL_APPLE_IOS_CERTIFICATE_URL_LIST
         - passphrase_list: $BITFALL_APPLE_APPLE_CERTIFICATE_PASSPHRASE_LIST|$BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST
         - distribution_method: $IPA_EXPORT_METHOD

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/bitrise-io/go-steputils v0.0.0-20210929162140-866a65a1e14a
 	github.com/bitrise-io/go-utils v0.0.0-20211008161027-fa11986847a0
-	github.com/bitrise-io/go-xcode v0.0.0-20211125140650-26a04aa27c0f
+	github.com/bitrise-io/go-xcode v0.0.0-20211126145828-45cb07d2198c
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/ryanuber/go-glob v1.0.0
 	github.com/stretchr/testify v1.7.0

go.sum

@@ -5,22 +5,10 @@ github.com/bitrise-io/go-steputils v0.0.0-20210929162140-866a65a1e14a/go.mod h1:
 github.com/bitrise-io/go-utils v0.0.0-20210924090918-3e7a04d0da9d/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
 github.com/bitrise-io/go-utils v0.0.0-20211008161027-fa11986847a0 h1:fT81H9m8GHazqZ0WsVq7GE5DfK4xSyXnHGJKyita2BM=
 github.com/bitrise-io/go-utils v0.0.0-20211008161027-fa11986847a0/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
-github.com/bitrise-io/go-xcode v0.0.0-20211119121743-cba4c04021b6 h1:ZpLQn0aFZTjrtK1Sy2p/Qo8vevmyOw5cSEhGJKgNfFg=
-github.com/bitrise-io/go-xcode v0.0.0-20211119121743-cba4c04021b6/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211123133459-d4e297141245 h1:wql+Nb0sDQKlQtslpNCrg2e3jNTschLvfAk8k+XcKxo=
-github.com/bitrise-io/go-xcode v0.0.0-20211123133459-d4e297141245/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211123160117-4d852a965240 h1:MHMoskrHZzGFeIk11LFMk+E5+VBoXJw42/U3ohB9gNY=
-github.com/bitrise-io/go-xcode v0.0.0-20211123160117-4d852a965240/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211124103117-d0322c82f4d8 h1:CXzKowAOVUv6hMX79d81uWnutiOFo2vfFyGghOvGi9s=
-github.com/bitrise-io/go-xcode v0.0.0-20211124103117-d0322c82f4d8/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211124104407-4e16ce31b4d6 h1:bVjK9MokR/LON+LZ2S7zgUxhJdmJEqNKf1lfTo4yi/0=
-github.com/bitrise-io/go-xcode v0.0.0-20211124104407-4e16ce31b4d6/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211124152140-304705150829 h1:PGCiS18ImeXJDyKYrKC3IY96BmgfraaLvmFBAk/QQVA=
-github.com/bitrise-io/go-xcode v0.0.0-20211124152140-304705150829/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211125090842-a1caa9a457cb h1:eEWpQwNA5QGNzkAaXOMiY8LqHCWjTmRoEBmZqyHKkSU=
-github.com/bitrise-io/go-xcode v0.0.0-20211125090842-a1caa9a457cb/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
-github.com/bitrise-io/go-xcode v0.0.0-20211125140650-26a04aa27c0f h1:ysNMLgNbUt9wgN+wVQuOgzqIxAp6lgwnp0VLX6R+Nr0=
-github.com/bitrise-io/go-xcode v0.0.0-20211125140650-26a04aa27c0f/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
+github.com/bitrise-io/go-xcode v0.0.0-20211126140007-ef026e692897 h1:pVoTqSPg3gV0MCgU4MWuzIKvCnfhCBYvj47Krycf/l4=
+github.com/bitrise-io/go-xcode v0.0.0-20211126140007-ef026e692897/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
+github.com/bitrise-io/go-xcode v0.0.0-20211126145828-45cb07d2198c h1:nexOxnQNuRVDaU7Ufu7Ug1pWZ4yZLPRbTHJ1bRGFK1M=
+github.com/bitrise-io/go-xcode v0.0.0-20211126145828-45cb07d2198c/go.mod h1:s41EQA9NOMK148ewA6ppM1ClEdv0YomaZq9h5k32ZWo=
 github.com/bitrise-io/pkcs12 v0.0.0-20210430063833-0da06eb56630 h1:V+xoYqGSkN8aUxCc806zDKjGGpBVUtV0Vytf5OsB3gc=
 github.com/bitrise-io/pkcs12 v0.0.0-20210430063833-0da06eb56630/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

main.go

@@ -97,6 +97,7 @@ type Inputs struct {
 	KeychainPath              string          `env:"keychain_path"`
 	KeychainPassword          stepconf.Secret `env:"keychain_password"`
 	RegisterTestDevices       bool            `env:"register_test_devices,opt[yes,no]"`
+	MinDaysProfileValid       int             `env:"min_profile_validity,required"`
 	BuildURL                  string          `env:"BITRISE_BUILD_URL"`
 	BuildAPIToken             stepconf.Secret `env:"BITRISE_BUILD_API_TOKEN"`
 }
@@ -368,11 +369,12 @@ func (s XcodeArchiveStep) createCodesignManager(config Config) (codesign.Manager
 	opts := codesign.Opts{
 		AuthType:                   authType,
 		ShouldConsiderXcodeSigning: true,
+		TeamID:                     config.ExportDevelopmentTeam,
 		ExportMethod:               codesignConfig.DistributionMethod,
 		XcodeMajorVersion:          config.XcodeMajorVersion,
 		RegisterTestDevices:        config.RegisterTestDevices,
 		SignUITests:                false,
-		MinProfileValidity:         30,
+		MinDaysProfileValidity:     config.MinDaysProfileValid,
 		IsVerboseLog:               config.VerboseLog,
 	}
 

step.yml

@@ -194,6 +194,17 @@ inputs:
     - "yes"
     - "no"
 
+- min_profile_validity: "0"
+  opts:
+    category: Automatic code signing
+    title: The minimum days the Provisioning Profile should be valid
+    summary: If this input is set to >0, the managed Provisioning Profile will be renewed if it expires within the configured number of days.
+    description: |-
+      If this input is set to >0, the managed Provisioning Profile will be renewed if it expires within the configured number of days.
+
+      Otherwise the Step renews the managed Provisioning Profile if it is expired.
+    is_required: true
+
 - certificate_url_list: $BITRISE_CERTIFICATE_URL
   opts:
     category: Automatic code signing