Merge pull request #3871 from dokku/proxy-go

Rewrite proxy plugin in golang

tests/unit/20_config.bats

@@ -177,7 +177,7 @@ teardown() {
 
   run /bin/bash -c "dokku --app $TEST_APP config:show"
   echo "output: $output"
-  echo "status: "$stat
+  echo "status: $status"
   assert_output "=====> $TEST_APP env vars"$'\nBKEY:  true\naKey:  true\nbKey:  true\nzKey:  true'
 }
 
@@ -189,21 +189,21 @@ teardown() {
 
   run /bin/bash -c "dokku config:export --format docker-args $TEST_APP"
   echo "output: $output"
-  echo "status: "$stat
+  echo "status: $status"
   assert_output "--env=BKEY='true' --env=aKey='true' --env=bKey='true' --env=zKey='true'"
 
   run /bin/bash -c "dokku config:export --format shell $TEST_APP"
   echo "output: $output"
-  echo "status: "$stat
+  echo "status: $status"
   assert_output "BKEY='true' aKey='true' bKey='true' zKey='true' "
 
   run /bin/bash -c "dokku config:export --format json $TEST_APP"
   echo "output: $output"
-  echo "status: "$stat
+  echo "status: $status"
   assert_output '{"BKEY":"true","aKey":"true","bKey":"true","zKey":"true"}'
 
   run /bin/bash -c "dokku config:export --format json-list $TEST_APP"
   echo "output: $output"
-  echo "status: "$stat
+  echo "status: $status"
   assert_output '[{"name":"BKEY","value":"true"},{"name":"aKey","value":"true"},{"name":"bKey","value":"true"},{"name":"zKey","value":"true"}]'
 }

tests/unit/20_nginx-vhosts_1.bats

@@ -151,8 +151,8 @@ teardown() {
 
   create_attach_network
   run /bin/bash -c "dokku nginx:build-config $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
+  echo "output: $output"
+  echo "status: $status"
   assert_success
 }
 

tests/unit/30_buildpacks.bats

@@ -4,11 +4,9 @@ load test_helper
 
 setup() {
   global_setup
-  deploy_app
 }
 
 teardown() {
-  destroy_app
   global_teardown
 }
 
@@ -211,7 +209,6 @@ teardown() {
 }
 
 @test "(buildpacks) buildpacks deploy" {
-  destroy_app
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -230,4 +227,9 @@ teardown() {
   echo "output: $output"
   echo "status: $status"
   assert_success
+
+  run destroy_app
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
 }

tests/unit/40_app-json.bats

@@ -5,26 +5,22 @@ load test_helper
 setup() {
   global_setup
   create_app
-  DOCKERFILE="$BATS_TMPDIR/Dockerfile"
 }
 
 teardown() {
-  rm -rf /home/dokku/$TEST_APP/tls
   destroy_app
-  dokku config:unset --global DOKKU_RM_CONTAINER
-  rm -f "$DOCKERFILE"
   global_teardown
 }
 
 @test "(app-json) app.json scripts" {
   deploy_app nodejs-express
 
-  run /bin/bash -c "dokku run $TEST_APP ls /app/prebuild.test"
+  run /bin/bash -c "dokku --rm run $TEST_APP ls /app/prebuild.test"
   echo "output: $output"
   echo "status: $status"
   assert_failure
 
-  run /bin/bash -c "dokku run $TEST_APP ls /app/predeploy.test"
+  run /bin/bash -c "dokku --rm run $TEST_APP ls /app/predeploy.test"
   echo "output: $output"
   echo "status: $status"
   assert_success