Skip to content

Commit 7c393f8

Browse files
authored
cleanup unused arguments in cncluster commands (#2355)
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
1 parent d197e75 commit 7c393f8

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

build-tools/cncluster

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,13 +2157,12 @@ function subcmd_purge_unused_dbs() {
21572157
subcommand_whitelist[set_operator_deployment_reference]="Set the git reference for the operator deployment in the cluster config file"
21582158
function subcmd_set_operator_deployment_reference() {
21592159

2160-
# TODO(#1062): remove the ignored parameter once the base version for migration tests is >= 0.4.2
21612160
if [ "$#" -lt 1 ]; then
2162-
echo "Usage: $0 set_operator_deployment_reference <branch> [<ignored>]"
2161+
echo "Usage: $0 set_operator_deployment_reference <branch>"
21632162
exit 1
21642163
fi
2165-
if [ "$#" -gt 2 ]; then
2166-
echo "Usage: $0 set_operator_deployment_reference <branch> [<ignored>]"
2164+
if [ "$#" -gt 1 ]; then
2165+
echo "Usage: $0 set_operator_deployment_reference <branch>"
21672166
exit 1
21682167
fi
21692168
deployment_config=$(cat <<EOF

build-tools/lib/hard-domain-migration-commands

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ function subcmd_update_config() {
1919
migration_id="$2"
2020
shift 2
2121
else
22-
# TODO(#1062): remove the ignored parameter once the base version for migration tests is >= 0.4.2
23-
_error "Usage: $0 $SCRIPTNAME migration_type migration_id [version] [<git_reference> [<ignored>]]"
22+
_error "Usage: $0 $SCRIPTNAME update_config <migration_type> <migration_id> [<version>] [<git_reference>]"
2423
fi
2524
local migration_config
2625
migration_config=$(cat <<EOF
@@ -35,10 +34,9 @@ EOF
3534
)
3635
shift
3736
fi
38-
# TODO(#1062): remove the ignored parameter once the base version for migration tests is >= 0.4.2
3937
if [ "$#" -gt 0 ]; then
40-
if [ "$#" -lt 1 ]; then
41-
_error "Usage: $0 $SCRIPTNAME migration_type migration_id [version] [<git_reference> [<ignored>]]"
38+
if [ "$#" -gt 1 ]; then
39+
_error "Usage: $0 $SCRIPTNAME update_config <migration_type> <migration_id> [<version>] [<git_reference>]"
4240
fi
4341
git_reference="$1"
4442
shift
@@ -57,7 +55,7 @@ subcommand_whitelist[update_active_version]='Upgrade the version of the active m
5755
function subcmd_update_active_version() {
5856
local cluster_directory
5957
if [ "$#" -ne 1 ]; then
60-
_error "Usage: $0 $SCRIPTNAME [version]"
58+
_error "Usage: $0 $SCRIPTNAME [<version>]"
6159
fi
6260
# yq doesn't like the version being unquoted so we quote it here
6361
_update_cluster_config "\"$1\"" "synchronizerMigration.active.version"

0 commit comments

Comments
 (0)