diff --git a/cmd/subcommands/run.go b/cmd/subcommands/runs.go similarity index 68% rename from cmd/subcommands/run.go rename to cmd/subcommands/runs.go index 45d2ab70d..972c278c0 100644 --- a/cmd/subcommands/run.go +++ b/cmd/subcommands/runs.go @@ -5,19 +5,19 @@ package subcommands import ( "github.com/spf13/cobra" - "lunchpail.io/cmd/subcommands/run" + "lunchpail.io/cmd/subcommands/runs" "lunchpail.io/pkg/compilation" ) func init() { if compilation.IsCompiled() { cmd := &cobra.Command{ - Use: "run", + Use: "runs", Short: "Commands related to runs", } rootCmd.AddCommand(cmd) - cmd.AddCommand(run.List()) - cmd.AddCommand(run.Instances()) + cmd.AddCommand(runs.List()) + cmd.AddCommand(runs.Instances()) } } diff --git a/cmd/subcommands/run/instances.go b/cmd/subcommands/runs/instances.go similarity index 99% rename from cmd/subcommands/run/instances.go rename to cmd/subcommands/runs/instances.go index 648f13823..d3003fa1d 100644 --- a/cmd/subcommands/run/instances.go +++ b/cmd/subcommands/runs/instances.go @@ -1,6 +1,6 @@ //go:build full || observe -package run +package runs import ( "context" diff --git a/cmd/subcommands/run/list.go b/cmd/subcommands/runs/list.go similarity index 99% rename from cmd/subcommands/run/list.go rename to cmd/subcommands/runs/list.go index 40e712457..dd5f9f5cf 100644 --- a/cmd/subcommands/run/list.go +++ b/cmd/subcommands/runs/list.go @@ -1,6 +1,6 @@ //go:build full || observe -package run +package runs import ( "context" diff --git a/tests/bin/add-data.sh b/tests/bin/add-data.sh index 2447be38b..e26af362c 100755 --- a/tests/bin/add-data.sh +++ b/tests/bin/add-data.sh @@ -9,7 +9,7 @@ set -eo pipefail # Wait for minio component echo "$(tput setaf 2)Pre-Populating s3 app=$testapp target=${LUNCHPAIL_TARGET:-kubernetes} (waiting for s3 to be ready)$(tput sgr0)" -$testapp run instances \ +$testapp runs instances \ --namespace $NAMESPACE \ --target ${LUNCHPAIL_TARGET:-kubernetes} \ --component minio \ diff --git a/tests/bin/helpers.sh b/tests/bin/helpers.sh index 7e59d21f7..8c54b40b1 100644 --- a/tests/bin/helpers.sh +++ b/tests/bin/helpers.sh @@ -81,7 +81,7 @@ function waitForIt { # Note: we will use --run $run_name in a few places, but not all # -- intentionally so we have test coverage of both code paths - local run_name=$($testapp run list --target ${LUNCHPAIL_TARGET:-kubernetes} -n $ns --latest --name) + local run_name=$($testapp runs list --target ${LUNCHPAIL_TARGET:-kubernetes} -n $ns --latest --name) if [ -n "$run_name" ] then echo "✅ PASS found run_name test=$name run_name=$run_name" else echo "❌ FAIL empty run_name test=$name" && return 1 @@ -168,7 +168,7 @@ function waitForNoInstances { echo "Checking that no $component remain running for run=$run_name" while true do - nRunning=$($testapp run instances --run $run_name --target ${LUNCHPAIL_TARGET:-kubernetes} --component $component -n $ns) + nRunning=$($testapp runs instances --run $run_name --target ${LUNCHPAIL_TARGET:-kubernetes} --component $component -n $ns) if [[ $nRunning == 0 ]] then echo "✅ PASS run-controller test=$name no $component remain running" && break else echo "$nRunning ${component}(s) remaining running" && sleep 2 @@ -253,7 +253,7 @@ function waitForUnassignedAndOutbox { done echo "✅ PASS run-controller run test $name" - local run_name=$($testapp run list --target ${LUNCHPAIL_TARGET:-kubernetes} -n $ns --latest --name) + local run_name=$($testapp runs list --target ${LUNCHPAIL_TARGET:-kubernetes} -n $ns --latest --name) echo "✅ PASS run-controller found run test=$name" waitForEveryoneToDie $run_name