Displayed the output variable in the logs

Author: mcasperson

management_instance/runbooks/shared_scripts/fork_repo_github.py

@@ -86,10 +86,28 @@ def init_argparse():
         usage='%(prog)s [OPTION] [FILE]...',
         description='Fork a GitHub repo'
     )
-    parser.add_argument('--new-project-name', action='store',
+    parser.add_argument('--new-repo-name', action='store',
                         default=get_octopusvariable_quiet(
-                            'ForkGithubRepo.Exported.Project.Name') or get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.NewRepoName') or get_octopusvariable_quiet(
                             'Exported.Project.Name'))
+    parser.add_argument('--new-repo-name-prefix', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(
+                            'Git.Url.NewRepoNamePrefix'))
+    parser.add_argument('--template-repo-name', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Original.Project.Name') or
+                                re.sub('[^a-zA-Z0-9-]', '_', get_octopusvariable_quiet('Octopus.Project.Name')))
+    parser.add_argument('--tenant-name', action='store',
+                        default=get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'))
+    parser.add_argument('--git-organization', action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet('Git.Url.Organization'))
+    parser.add_argument('--mainline-branch',
+                        action='store',
+                        default=get_octopusvariable_quiet(
+                            'ForkGiteaRepo.Git.Branch.MainLine') or get_octopusvariable_quiet('Git.Branch.MainLine'),
+                        help='The branch name to use for the fork. Defaults to "main".')
     parser.add_argument('--github-app-id', action='store',
                         default=get_octopusvariable_quiet(
                             'ForkGithubRepo.GitHub.App.Id') or get_octopusvariable_quiet('GitHub.App.Id'))
@@ -106,24 +124,7 @@ def init_argparse():
                             'ForkGithubRepo.GitHub.Credentials.AccessToken') or get_octopusvariable_quiet(
                             'GitHub.Credentials.AccessToken'),
                         help='The GitHub access token. This takes precedence over the --github-app-id,  --github-app-installation-id, and --github-app-private-key')
-    parser.add_argument('--git-organization', action='store',
-                        default=get_octopusvariable_quiet(
-                            'ForkGithubRepo.Git.Url.Organization') or get_octopusvariable_quiet('Git.Url.Organization'))
-    parser.add_argument('--tenant-name', action='store',
-                        default=get_octopusvariable_quiet('Octopus.Deployment.Tenant.Name'))
-    parser.add_argument('--new-repo-name-prefix', action='store',
-                        default=get_octopusvariable_quiet(
-                            'ForkGithubRepo.Git.Url.NewRepoNamePrefix') or get_octopusvariable_quiet(
-                            'Git.Url.NewRepoNamePrefix'))
-    parser.add_argument('--template-repo-name', action='store',
-                        default=get_octopusvariable_quiet(
-                            'ForkGithubRepo.Original.Project.Name') or
-                                re.sub('[^a-zA-Z0-9-]', '_', get_octopusvariable_quiet('Octopus.Project.Name')))
-    parser.add_argument('--mainline-branch',
-                        action='store',
-                        default=get_octopusvariable_quiet(
-                            'ForkGiteaRepo.Git.Branch.MainLine') or get_octopusvariable_quiet('Git.Branch.MainLine'),
-                        help='The branch name to use for the fork. Defaults to "main".')
+
     return parser.parse_known_args()
 
 
@@ -310,14 +311,14 @@ def ensure_git_exists():
 template_repo = parser.template_repo_name.strip()
 new_repo_custom_prefix = re.sub('[^a-zA-Z0-9-]', '_', parser.new_repo_name_prefix.strip())
 tenant_name_sanitized = re.sub('[^a-zA-Z0-9-]', '_', parser.tenant_name.strip())
-project_name_sanitized = re.sub('[^a-zA-Z0-9-]', '_',
-                                parser.new_project_name.strip() if parser.new_project_name.strip() else template_repo)
+project_repo_sanitized = re.sub('[^a-zA-Z0-9-]', '_',
+                                parser.new_repo_name.strip() if parser.new_repo_name.strip() else template_repo)
 
 # The new repo is prefixed either with the custom prefix or the tenant name if no custom prefix is defined
 new_repo_prefix = new_repo_custom_prefix if len(new_repo_custom_prefix) != 0 else tenant_name_sanitized
 
 # The new repo name is the prefix + the name of thew new project
-new_repo = new_repo_prefix + '_' + project_name_sanitized if len(new_repo_prefix) != 0 else project_name_sanitized
+new_repo = new_repo_prefix + '_' + project_repo_sanitized if len(new_repo_prefix) != 0 else project_repo_sanitized
 
 # Assume the main branch if nothing else was specified
 branch = parser.mainline_branch or 'main'
@@ -335,3 +336,6 @@ def ensure_git_exists():
         + 'https://github.com/' + cac_org + '/' + new_repo)
 else:
     print('Repo at https://github.com/' + cac_org + '/' + new_repo + ' already exists and has not been modified')
+
+print('New repo URL is defined in the output variable "NewRepo": #{Octopus.Action[' +
+      get_octopusvariable_quiet('Octopus.Step.Name') + '].Output.NewRepo}')