github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: move the proxy port map from config to property

Browse Source 
Also remove all direct references to DOKKU_PROXY_PORT_MAP from outside of ports.
This commit is contained in:
Jose Diaz-Gonzalez
2023-07-09 18:35:42 -04:00
parent 977b4567f8
commit f842869c3d
10 changed files with 157 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/unit/apps_2.bats
View File

@@ -108,8 +108,23 @@ teardown() {
}
@test "(apps) apps:clone ssl-app" {
run /bin/bash -c "dokku config:set --no-restart $TEST_APP DOKKU_PROXY_PORT_MAP=https:443:5000 DOKKU_PROXY_SSL_PORT=443"
deploy_app
skip "this test always failed and requires changes in dokku to support detected vs specified functionality"
run /bin/bash -c "dokku apps:create $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ports:set $TEST_APP https:443:5000"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku config:set --no-restart $TEST_APP DOKKU_PROXY_SSL_PORT=443"
echo "output: $output"
echo "status: $status"
assert_success
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku apps:clone $TEST_APP app-without-ssl"
echo "output: $output"
echo "status: $status"

50
tests/unit/nginx-vhosts_3.bats
View File

@@ -17,23 +17,61 @@ teardown() {
}
@test "(nginx-vhosts) grpc endpoint" {
deploy_app gogrpc
dokku ports:add "$TEST_APP" "grpc:80:50051"
run deploy_app gogrpc
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ports:add $TEST_APP grpc:80:50051"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker run --rm ${TEST_APP}-docker-image /go/bin/greeter_client -address ${TEST_APP}.dokku.me:80 -name grpc"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "Greeting: Hello grpc"
}
@test "(nginx-vhosts) grpc endpoint on a port other than 80" {
deploy_app gogrpc
dokku ports:add "$TEST_APP" "grpc:8080:50051"
run deploy_app gogrpc
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ports:add $TEST_APP grpc:8080:50051"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker run --rm ${TEST_APP}-docker-image /go/bin/greeter_client -address ${TEST_APP}.dokku.me:8080 -name grpc8080"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "Greeting: Hello grpc8080"
}
@test "(nginx-vhosts) grpcs endpoint" {
setup_test_tls
deploy_app gogrpc
dokku ports:add "$TEST_APP" "grpcs:443:50051"
run deploy_app gogrpc
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ports:add $TEST_APP grpcs:443:50051"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "docker run --rm ${TEST_APP}-docker-image /go/bin/greeter_client -address ${TEST_APP}.dokku.me:443 -name grpcs -tls"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "Greeting: Hello grpcs"
}