From 4046d8489643570fe78fdd21c68c9f916722ea9f Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 25 May 2020 17:07:30 +0200 Subject: [PATCH 1/2] fix(delete-preview): only create new branch in config repo if --create-pr --- gitopscli/commands/delete_preview.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitopscli/commands/delete_preview.py b/gitopscli/commands/delete_preview.py index 333212d8..c10308ae 100644 --- a/gitopscli/commands/delete_preview.py +++ b/gitopscli/commands/delete_preview.py @@ -60,10 +60,13 @@ def delete_preview_command( root_git.checkout("master") logging.info("Config repo branch master checkout successful") - config_branch = f"gitopscli-delete-preview-{str(uuid.uuid4())[:8]}" if create_pr else "master" + if create_pr: + config_branch = f"gitopscli-delete-preview-{str(uuid.uuid4())[:8]}" + root_git.new_branch(config_branch) + logging.info("Created branch %s in config repo", config_branch) + else: + config_branch = "master" - root_git.new_branch(config_branch) - logging.info("Created branch %s in config repo", config_branch) shortened_branch_hash = hashlib.sha256(branch.encode("utf-8")).hexdigest()[:8] logging.info("Hashed branch %s to hash: %s", branch, shortened_branch_hash) preview_folder_name = gitops_config.application_name + "-" + shortened_branch_hash + "-preview" From 0b4fe09b7a2eb7c48fdfade4e37844249857f0b4 Mon Sep 17 00:00:00 2001 From: Christian Siegel Date: Mon, 25 May 2020 17:14:06 +0200 Subject: [PATCH 2/2] fix(delete-preview): improve error message for missing .gitops.config.yaml --- gitopscli/commands/delete_preview.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitopscli/commands/delete_preview.py b/gitopscli/commands/delete_preview.py index c10308ae..ea43b757 100644 --- a/gitopscli/commands/delete_preview.py +++ b/gitopscli/commands/delete_preview.py @@ -43,7 +43,10 @@ def delete_preview_command( apps_git.checkout("master") logging.info("App repo branch master checkout successful") - gitops_config = GitOpsConfig(apps_git.get_full_file_path(".gitops.config.yaml")) + try: + gitops_config = GitOpsConfig(apps_git.get_full_file_path(".gitops.config.yaml")) + except FileNotFoundError as ex: + raise GitOpsException(f"Couldn't find .gitops.config.yaml") from ex logging.info("Read GitOpsConfig: %s", gitops_config) root_git = create_git(