pr feedback

Author: m4rc0z

gitopscli/commands/create_pr_preview.py

@@ -45,7 +45,6 @@ def create_pr_preview_command(
 
         apps_git.checkout(pr_branch)
         logging.info("App repo PR branch %s checkout successful", pr_branch)
-        preview_id = hashlib.sha256(pr_branch.encode("utf-8")).hexdigest()[:8]
         git_hash = apps_git.get_last_commit_hash()
         create_preview_command(
             username,
@@ -57,8 +56,8 @@ def create_pr_preview_command(
             git_provider,
             git_provider_url,
             git_hash,
-            preview_id,
-            create_deployment_replaced_callback(parent_id, pr_id),
+            hashlib.sha256(pr_branch.encode("utf-8")).hexdigest()[:8],
+            create_deployment_already_up_to_date_callback(parent_id, pr_id),
             create_deployment_exist_callback(parent_id, pr_id, pr_branch),
             create_deployment_new_callback(parent_id, pr_id, pr_branch),
         )
@@ -67,16 +66,16 @@ def create_pr_preview_command(
         delete_tmp_dir(root_tmp_dir)
 
 
-def create_deployment_replaced_callback(parent_id, pr_id):
-    def deployment_replaced_callback(apps_git, new_image_tag):
+def create_deployment_already_up_to_date_callback(parent_id, pr_id):
+    def deployment_already_up_to_date_callback(apps_git, new_image_tag):
         logging.info("The image tag %s has already been deployed. Doing nothing.", new_image_tag)
         pr_comment_text = f"""
         The version `{new_image_tag}` has already been deployed. Nothing to do here.
         """
         logging.info("Creating PullRequest comment for pr with id %s and content: %s", pr_id, pr_comment_text)
         apps_git.add_pull_request_comment(pr_id, pr_comment_text, parent_id)
 
-    return deployment_replaced_callback
+    return deployment_already_up_to_date_callback
 
 
 def create_deployment_new_callback(parent_id, pr_id, pr_branch):

gitopscli/commands/create_preview.py

@@ -24,7 +24,7 @@ def create_preview_command(
     git_provider_url,
     git_hash,
     preview_id,
-    deployment_replaced_callback=None,
+    deployment_already_up_to_date_callback=None,
     deployment_exists_callback=None,
     deployment_new_callback=None,
 ):
@@ -86,14 +86,13 @@ def create_preview_command(
                 root_git,
                 gitops_config.application_name,
             )
-        new_image_tag = apps_git.get_last_commit_hash()
-        logging.info("Using image tag from last app repo commit: %s", new_image_tag)
+        logging.info("Using image tag from last app repo commit: %s", git_hash)
         route_host = None
         value_replaced = False
         for replacement in gitops_config.replacements:
             route_host, value_replaced = __replace_value(
                 gitops_config,
-                new_image_tag,
+                git_hash,
                 new_preview_folder_name,
                 replacement,
                 root_git,
@@ -102,8 +101,8 @@ def create_preview_command(
                 value_replaced,
             )
         if not value_replaced:
-            if deployment_replaced_callback:
-                deployment_replaced_callback(apps_git, new_image_tag)
+            if deployment_already_up_to_date_callback:
+                deployment_already_up_to_date_callback(apps_git, git_hash)
             return
 
         if branch_preview_env_already_exist:

gitopscli/commands/delete_preview.py

@@ -78,11 +78,4 @@ def delete_preview_command(
 
     finally:
         delete_tmp_dir(apps_tmp_dir)
-        delete_tmp_dir(root_tmp_dir)
-
-
-def __create_tmp_dir():
-    tmp_dir = f"/tmp/gitopscli/{uuid.uuid4()}"
-    os.makedirs(tmp_dir)
-    logging.info("Created directory %s", tmp_dir)
-    return tmp_dir
+        delete_tmp_dir(root_tmp_dir)