From bccd277c86dd897475b5ab6c5bc1f42113eb46ef Mon Sep 17 00:00:00 2001
From: Marco <maguilar@patriotsoftware.com>
Date: Tue, 2 Apr 2024 16:02:15 -0400
Subject: [PATCH] DAT-1707 clean-up after feedback

---
 action.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/action.yml b/action.yml
index 86d5e74..0f74a77 100644
--- a/action.yml
+++ b/action.yml
@@ -11,15 +11,12 @@ inputs:
     description: 'Database name'
     required: true
   source_database_name:
-    description: 'Source database name'
+    description: 'Source database name. Default is patriot_pay'
     required: false
     default: 'patriot_pay'
   github_actor:
     description: 'GitHub actor property'
     required: true
-  github_sha:
-    description: 'GitHub sha property'
-    required: true
   aws_access_key:
     description: 'AWS Access Key (Required if no aws-actions/configure-aws-credentials)'
     required: true
@@ -46,7 +43,7 @@ runs:
         
     - name: Delete Branch Database
       shell: bash
-      if: ${{ inputs.branch_action == 'Recreate' || inputs.branch_action == 'Delete' }}
+      if: ${{ inputs.branch_action == 'Delete' }}
       run: |
         echo "Deleting branch database ${{ inputs.database_name }}"
         chmod +x ./data/delete_branch_database.sh
@@ -57,8 +54,14 @@ runs:
       shell: bash
       run: |
         echo "Creating branch database ${{ inputs.database_name }}"
-        echo "Recreate database: ${{ inputs.branch_action == 'Recreate' }}"
         chmod +x ./data/create_branch_database.sh
-        ./data/create_branch_database.sh BuildUserDatabaseConnectionSettings ${{ inputs.database_name }} ${{ inputs.github_actor }} ${{ inputs.source_database_name }} ${{ inputs.branch_action == 'Recreate' }}
+        ./data/create_branch_database.sh BuildUserDatabaseConnectionSettings ${{ inputs.database_name }} ${{ inputs.github_actor }} ${{ inputs.source_database_name }} false
 
+    - name: Recreate Branch Database
+      if: ${{ inputs.branch_action == 'Recreate' }}
+      shell: bash
+      run: |
+        echo "Recreate branch database: ${{ inputs.database_name }}"
+        chmod +x ./data/create_branch_database.sh
+        ./data/create_branch_database.sh BuildUserDatabaseConnectionSettings ${{ inputs.database_name }} ${{ inputs.github_actor }} ${{ inputs.source_database_name }} true