Merge pull request #41 from baloise-incubator/feat/deploy-handle-missing-file

deploy: print error message if values file not found

Author: christiansiegel

gitopscli/__main__.py

@@ -1,10 +1,12 @@
 import logging
+import sys
 
 from gitopscli.cliparser import create_cli
 from gitopscli.commands.add_pr_comment import pr_comment_command
 from gitopscli.commands.create_preview import create_preview_command
 from gitopscli.commands.deploy import deploy_command
 from gitopscli.commands.sync_apps import sync_apps_command
+from gitopscli.gitops_exception import GitOpsException
 
 
 def main():
@@ -13,16 +15,19 @@ def main():
     args = create_cli()
 
     if args.command == "deploy":
-        deploy_command(**vars(args))
-
-    if args.command == "sync-apps":
-        sync_apps_command(**vars(args))
-
-    if args.command == "add-pr-comment":
-        pr_comment_command(**vars(args))
-
-    if args.command == "create-preview":
-        create_preview_command(**vars(args))
+        command = deploy_command
+    elif args.command == "sync-apps":
+        command = sync_apps_command
+    elif args.command == "add-pr-comment":
+        command = pr_comment_command
+    elif args.command == "create-preview":
+        command = create_preview_command
+
+    try:
+        command(**vars(args))
+    except GitOpsException as ex:
+        logging.error(ex)
+        sys.exit(1)
 
 
 if __name__ == "__main__":

gitopscli/commands/deploy.py

@@ -5,6 +5,7 @@
 
 from gitopscli.git.create_git import create_git
 from gitopscli.yaml.yaml_util import update_yaml_file, yaml_dump
+from gitopscli.gitops_exception import GitOpsException
 
 
 def deploy_command(
@@ -46,7 +47,11 @@ def deploy_command(
         logging.info("Master checkout successful")
         git.new_branch(branch)
         logging.info("Created branch %s", branch)
+
         full_file_path = git.get_full_file_path(file)
+        if not os.path.isfile(full_file_path):
+            raise GitOpsException(f"No such file: {file}")
+
         updated_values = {}
         for key in values:
             value = values[key]

gitopscli/commands/sync_apps.py

@@ -8,6 +8,7 @@
 
 from gitopscli.git.create_git import create_git
 from gitopscli.yaml.yaml_util import merge_yaml_element
+from gitopscli.gitops_exception import GitOpsException
 
 
 def sync_apps_command(
@@ -92,7 +93,9 @@ def __find_apps_config_from_repo(apps_git, root_git):
             if "applications" in app_config_content and app_config_content["applications"] is not None:
                 apps_from_other_repos += app_config_content["applications"].keys()
     if found_app_config_file is None:
-        raise Exception(f"Could't find config file with .repository={apps_git.get_clone_url()} in apps/ directory")
+        raise GitOpsException(
+            f"Could't find config file with .repository={apps_git.get_clone_url()} in apps/ directory"
+        )
     return found_app_config_file, found_app_config_file_name, apps_from_other_repos
 
 
@@ -134,4 +137,4 @@ def __get_application_directories(full_file_path):
 def __check_if_app_already_exists(apps_dirs, apps_from_other_repos):
     for app_key in apps_dirs:
         if app_key in apps_from_other_repos:
-            raise Exception("application: " + app_key + " already exists in a different repository")
+            raise GitOpsException(f"application: {app_key} already exists in a different repository")

gitopscli/gitops_exception.py

@@ -0,0 +1,2 @@
+class GitOpsException(Exception):
+    pass