Feature: added ability to override the default branch

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/main.py

@@ -133,6 +133,10 @@ def prepare_deployment_account(sts, deployment_account_id, config):
     deployment_account_parameter_store.put_parameter(
         'deployment_account_bucket', DEPLOYMENT_ACCOUNT_S3_BUCKET_NAME
     )
+    deployment_account_parameter_store.put_parameter(
+        'default_scm_branch', config.config.get(
+        'scm', {}).get('default-scm-branch', 'master')
+    )
     auto_create_repositories = config.config.get(
         'scm', {}).get('auto-create-repositories')
     if auto_create_repositories is not None:

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/cdk_constructs/adf_codepipeline.py

@@ -43,6 +43,7 @@ def __init__(self, **kwargs):
         self.account_id = self.map_params["default_providers"]["source"].get('properties', {}).get("account_id")
         self.role_arn = self._generate_role_arn()
         self.notification_endpoint = self.map_params.get("topic_arn")
+        self.default_scm_branch = self.map_params.get("default_scm_branch", 'master')
         self.configuration = self._generate_configuration()
         self.config = self.generate()
 
@@ -110,13 +111,13 @@ def _generate_configuration(self): #pylint: disable=R0912, R0911, R0915
             return {
                 "ConnectionArn": connection_arn,
                 "FullRepositoryId": f"{owner}/{repo}",
-                "BranchName": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', {}) or 'master'
+                "BranchName": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', {}) or self.default_scm_branch
             }
         if self.provider == "GitHub":
             return {
                 "Owner": self.map_params.get('default_providers', {}).get('source').get('properties', {}).get('owner', {}),
                 "Repo": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('repository', {}) or self.map_params['name'],
-                "Branch": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', {}) or 'master',
+                "Branch": self.map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', {}) or self.default_scm_branch,
                 # pylint: disable=no-value-for-parameter
                 "OAuthToken": core.SecretValue.secrets_manager(
                     self.map_params['default_providers']['source'].get('properties', {}).get('oauth_token_path'),
@@ -248,7 +249,7 @@ def _generate_configuration(self): #pylint: disable=R0912, R0911, R0915
             }
         if self.provider == "CodeCommit":
             return {
-                "BranchName": self.map_params['default_providers']['source'].get('properties', {}).get('branch', 'master'),
+                "BranchName": self.map_params['default_providers']['source'].get('properties', {}).get('branch', self.default_scm_branch),
                 "RepositoryName": self.map_params['default_providers']['source'].get('properties', {}).get('repository', {}) or self.map_params['name'],
                 "PollForSourceChanges": (
                     self.map_params['default_providers']['source'].get('properties', {}).get('trigger_on_changes', True)
@@ -407,6 +408,7 @@ def __init__(self, scope: core.Construct, id: str, map_params: dict, ssm_params:
             "artifact_stores": Pipeline.generate_artifact_stores(map_params, ssm_params),
             "tags": Pipeline.restructure_tags(map_params.get('tags', {}))
         }
+        self.default_scm_branch = map_params.get("default_scm_branch", 'master')
         self.cfn = _codepipeline.CfnPipeline(
             self,
             'pipeline',
@@ -428,7 +430,7 @@ def __init__(self, scope: core.Construct, id: str, map_params: dict, ssm_params:
                 "provider": map_params.get('default_providers', {}).get('source', {}).get('provider'),
                 "account_id": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('account_id'),
                 "repo_name": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('repository') or map_params['name'],
-                "branch": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', 'master'),
+                "branch": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('branch', self.default_scm_branch),
                 "poll_for_changes": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('poll_for_changes', False),
                 "trigger_on_changes": map_params.get('default_providers', {}).get('source', {}).get('properties', {}).get('trigger_on_changes', True),
             }

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/cdk/generate_pipeline_inputs.py

@@ -82,6 +82,7 @@ def fetch_required_ssm_params(regions):
         }
         if region == DEPLOYMENT_ACCOUNT_REGION:
             output[region]["modules"] = parameter_store.fetch_parameter('deployment_account_bucket')
+            output['default_scm_branch'] = parameter_store.fetch_parameter('default_scm_branch')
     return output
 
 
@@ -125,6 +126,7 @@ def worker_thread(p, organizations, auto_create_repositories, deployment_map, pa
     with open('cdk_inputs/{0}.json'.format(pipeline.input['name']), 'w') as outfile:
         data = {}
         data['input'] = pipeline.input
+        data['input']['default_scm_branch'] = ssm_params.get('default_scm_branch')
         data['ssm_params'] = ssm_params
         json.dump(data, outfile)
 

src/lambda_codebase/initial_commit/bootstrap_repository/example-adfconfig.yml

@@ -15,5 +15,6 @@ config:
       action: safe  # Can be safe or remove-base (see docs)
   scp:
     keep-default-scp: enabled  # determines if the default AWSFullAccess SCP stays attached to all OU's 
-  scm: # Source control management, if true and using codecommit as source the repository will be automatically created
-    auto-create-repositories: enabled
+  scm: # Source control management
+    auto-create-repositories: enabled # if true and using codecommit as source the repository will be automatically created
+    default-scm-branch: master        # allow to specify custom defualt branch if pipeline specific is not provided. If parameter is not specified -  "master" branch will be used.