Merge pull request #6707 from dokku/6657-remove-by-index
Correct issue where removing by index failed due to incorrect input validation
This commit is contained in:
3 files changed
+34
-4
No files matched your search
@@ -44,7 +44,7 @@ func rewriteBuildpacksFile(sourceWorkDir string) error {
|
|||||||
|
|
||||||
func validBuildpackURL(buildpack string) (string, error) {
|
func validBuildpackURL(buildpack string) (string, error) {
|
||||||
if buildpack == "" {
|
if buildpack == "" {
|
||||||
return buildpack, errors.New("Must specify a buildpack to add")
|
return buildpack, errors.New("Must specify a buildpack url or reference")
|
||||||
}
|
}
|
||||||
|
|
||||||
reHerokuValue := regexp.MustCompile(`(?m)^([\w-]+\/[\w-]+)$`)
|
reHerokuValue := regexp.MustCompile(`(?m)^([\w-]+\/[\w-]+)$`)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ func CommandRemove(appName string, buildpack string, index int) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildpack, err = validBuildpackURL(buildpack)
|
buildpack, err = validBuildpackURL(buildpack)
|
||||||
if err != nil {
|
if index == 0 && err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ teardown() {
|
|||||||
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_output_contains "https://github.com/heroku/heroku-buildpack-nodejs.git https://github.com/heroku/heroku-buildpack-ruby.git"
|
assert_output "https://github.com/heroku/heroku-buildpack-nodejs.git https://github.com/heroku/heroku-buildpack-ruby.git"
|
||||||
|
|
||||||
run /bin/bash -c "dokku buildpacks:remove $TEST_APP heroku/nodejs"
|
run /bin/bash -c "dokku buildpacks:remove $TEST_APP heroku/nodejs"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
@@ -215,7 +215,7 @@ teardown() {
|
|||||||
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_output_contains "https://github.com/heroku/heroku-buildpack-ruby.git"
|
assert_output "https://github.com/heroku/heroku-buildpack-ruby.git"
|
||||||
|
|
||||||
run /bin/bash -c "dokku buildpacks:remove $TEST_APP heroku/php"
|
run /bin/bash -c "dokku buildpacks:remove $TEST_APP heroku/php"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
@@ -231,6 +231,36 @@ teardown() {
|
|||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_output_not_exists
|
assert_output_not_exists
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku buildpacks:add $TEST_APP https://github.com/heroku/heroku-buildpack-nodejs.git"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku buildpacks:add $TEST_APP https://github.com/heroku/heroku-buildpack-ruby.git"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku buildpacks:add $TEST_APP https://github.com/yespark/heroku-imagemagick-buildpack"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "https://github.com/heroku/heroku-buildpack-nodejs.git https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/yespark/heroku-imagemagick-buildpack"
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku buildpacks:remove $TEST_APP --index 1"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | xargs"
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_output "https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/yespark/heroku-imagemagick-buildpack"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "(buildpacks) buildpacks:clear" {
|
@test "(buildpacks) buildpacks:clear" {
|
||||||
|
|||||||
Reference in new issue
Block a user