diff --git a/install.sh b/install.sh index 50ddfdf..9f280b2 100755 --- a/install.sh +++ b/install.sh @@ -2761,7 +2761,7 @@ _account_already_prefixed() { local current_name="$1" local lower_name lower_name=$(printf '%s' "$current_name" | tr '[:upper:]' '[:lower:]') - if [[ "$lower_name" == loki-* ]]; then + if [[ "$lower_name" == loki* ]]; then local display_name display_name=$(printf '%s' "$current_name" | tr -d '\000-\037') ok "Account already named for Loki: $(printf '%s' "$display_name")" diff --git a/tests/test-account-rename.sh b/tests/test-account-rename.sh index 1d8d1a9..918a9f8 100755 --- a/tests/test-account-rename.sh +++ b/tests/test-account-rename.sh @@ -345,6 +345,26 @@ test_already_prefixed_case_insensitive() { assert_contains "detects case-insensitive prefix" "already named for Loki" "$_OUTPUT" }; test_already_prefixed_case_insensitive +test_already_prefixed_loki_variant() { + source "$TMPDIR/functions.sh" + DISABLE_ACCOUNT_RENAME=false + _AWS_ACCOUNT_INFO_EXIT=0 + _AWS_ACCOUNT_INFO_RESULT='{"AccountName":"loki1-MyAccount"}' + _OUTPUT="" _TELEM_EVENTS=() + maybe_rename_account + assert_contains "detects loki1- as already prefixed" "already named for Loki" "$_OUTPUT" +}; test_already_prefixed_loki_variant + +test_already_prefixed_lokidev() { + source "$TMPDIR/functions.sh" + DISABLE_ACCOUNT_RENAME=false + _AWS_ACCOUNT_INFO_EXIT=0 + _AWS_ACCOUNT_INFO_RESULT='{"AccountName":"LokiDev-SomeAccount"}' + _OUTPUT="" _TELEM_EVENTS=() + maybe_rename_account + assert_contains "detects LokiDev- as already prefixed" "already named for Loki" "$_OUTPUT" +}; test_already_prefixed_lokidev + test_headless_no_opt_in() { source "$TMPDIR/functions.sh" DISABLE_ACCOUNT_RENAME=false