1 parent
3b0bf4d8f2
commit
7136da1aa5
4 files changed
+86
No files matched your search
@@ -32,6 +32,11 @@ func BuildConfig(appName string) error {
|
|||||||
return common.PlugnTrigger("proxy-build-config", []string{appName}...)
|
return common.PlugnTrigger("proxy-build-config", []string{appName}...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ClearConfig clears the proxy config for the specified app
|
||||||
|
func ClearConfig(appName string) error {
|
||||||
|
return common.PlugnTrigger("proxy-clear-config", []string{appName}...)
|
||||||
|
}
|
||||||
|
|
||||||
// Disable disables proxy implementations for the specified app
|
// Disable disables proxy implementations for the specified app
|
||||||
func Disable(appName string) error {
|
func Disable(appName string) error {
|
||||||
if !IsAppProxyEnabled(appName) {
|
if !IsAppProxyEnabled(appName) {
|
||||||
|
|||||||
@@ -25,6 +25,12 @@ func main() {
|
|||||||
args.Parse(os.Args[2:])
|
args.Parse(os.Args[2:])
|
||||||
appName := args.Arg(0)
|
appName := args.Arg(0)
|
||||||
err = proxy.CommandBuildConfig(appName, *allApps, *parallelCount)
|
err = proxy.CommandBuildConfig(appName, *allApps, *parallelCount)
|
||||||
|
case "clear-config":
|
||||||
|
args := flag.NewFlagSet("proxy:clear-config", flag.ExitOnError)
|
||||||
|
allApps := args.Bool("all", false, "--all: build-config for all apps")
|
||||||
|
args.Parse(os.Args[2:])
|
||||||
|
appName := args.Arg(0)
|
||||||
|
err = proxy.CommandClearConfig(appName, *allApps)
|
||||||
case "disable":
|
case "disable":
|
||||||
args := flag.NewFlagSet("proxy:disable", flag.ExitOnError)
|
args := flag.NewFlagSet("proxy:disable", flag.ExitOnError)
|
||||||
allApps := args.Bool("all", false, "--all: disable proxy for all apps")
|
allApps := args.Bool("all", false, "--all: disable proxy for all apps")
|
||||||
|
|||||||
@@ -21,6 +21,19 @@ func CommandBuildConfig(appName string, allApps bool, parallelCount int) error {
|
|||||||
return BuildConfig(appName)
|
return BuildConfig(appName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CommandClearConfig clears config for a given app
|
||||||
|
func CommandClearConfig(appName string, allApps bool) error {
|
||||||
|
if allApps {
|
||||||
|
return ClearConfig("--all")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := common.VerifyAppName(appName); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return ClearConfig(appName)
|
||||||
|
}
|
||||||
|
|
||||||
// CommandDisable disables the proxy for app via command line
|
// CommandDisable disables the proxy for app via command line
|
||||||
func CommandDisable(appName string, allApps bool, parallelCount int) error {
|
func CommandDisable(appName string, allApps bool, parallelCount int) error {
|
||||||
if allApps {
|
if allApps {
|
||||||
|
|||||||
@@ -28,6 +28,68 @@ teardown() {
|
|||||||
assert_output "$help_output"
|
assert_output "$help_output"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(proxy) proxy:build-config/clear-config" {
|
||||||
|
run deploy_app
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "rm -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_failure
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku proxy:build-config $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku proxy:clear-config $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_failure
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku proxy:build-config $TEST_APP"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku proxy:clear-config --all"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "test -f $DOKKU_ROOT/$TEST_APP/nginx.conf"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_failure
|
||||||
|
}
|
||||||
|
|
||||||
@test "(proxy) proxy:enable/disable" {
|
@test "(proxy) proxy:enable/disable" {
|
||||||
deploy_app
|
deploy_app
|
||||||
assert_nonssl_domain "${TEST_APP}.dokku.me"
|
assert_nonssl_domain "${TEST_APP}.dokku.me"
|
||||||
|
|||||||
Reference in new issue
Block a user