Merge pull request #8613 from dokku/8610-git-report-deploy-branch-keep-git-dir-return-computed-value-at-bare-key-no-raw-per-app-key

Expose raw deploy-branch and keep-git-dir in git:report

tests/unit/git_1.bats

@@ -17,6 +17,12 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
   assert_output "master"
 
   run /bin/bash -c "dokku git:set $TEST_APP deploy-branch main"
@@ -30,6 +36,29 @@ teardown() {
   assert_success
   assert_output "main"
 
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "main"
+
+  run /bin/bash -c "dokku git:set $TEST_APP deploy-branch"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "master"
+
   run /bin/bash -c "dokku git:report $TEST_APP --git-sha"
   echo "output: $output"
   echo "status: $status"
@@ -42,6 +71,80 @@ teardown() {
   assert_output_contains "Invalid flag passed"
 }
 
+@test "(git:report) keep-git-dir raw vs computed" {
+  run /bin/bash -c "dokku git:report $TEST_APP --git-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "false"
+
+  run /bin/bash -c "dokku git:set $TEST_APP keep-git-dir true"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "true"
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "true"
+
+  run /bin/bash -c "dokku git:set $TEST_APP keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-keep-git-dir"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "false"
+}
+
+@test "(git:report) raw and computed keys in --format json" {
+  run /bin/bash -c "dokku git:report $TEST_APP --format json | jq -r '.\"deploy-branch\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --format json | jq -r '.\"computed-deploy-branch\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "master"
+
+  run /bin/bash -c "dokku git:report $TEST_APP --format json | jq -r '.\"keep-git-dir\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output ""
+
+  run /bin/bash -c "dokku git:report $TEST_APP --format json | jq -r '.\"computed-keep-git-dir\"'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output "false"
+}
+
 @test "(git) git:help" {
   run /bin/bash -c "dokku git"
   echo "output: $output"

tests/unit/git_3.bats

@@ -770,7 +770,7 @@ teardown() {
 }
 
 @test "(git:sync) --skip-deploy-branch" {
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -798,7 +798,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -810,7 +810,7 @@ teardown() {
   assert_success
   assert_output_contains "skipping deploy-branch setting"
 
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -818,7 +818,7 @@ teardown() {
 }
 
 @test "(git:sync) --build --skip-deploy-branch" {
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -831,7 +831,7 @@ teardown() {
   assert_output_contains "skipping deploy-branch setting"
   assert_output_contains "Application deployed"
 
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -839,7 +839,7 @@ teardown() {
 }
 
 @test "(git:sync) --build-if-changes --skip-deploy-branch" {
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -852,7 +852,7 @@ teardown() {
   assert_output_contains "skipping deploy-branch setting"
   assert_output_contains "Application deployed"
 
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -864,7 +864,7 @@ teardown() {
   assert_success
   assert_output_contains "Skipping build as no changes were detected"
 
-  run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
+  run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
   echo "output: $output"
   echo "status: $status"
   assert_success