From a2e549ac52801671669525862f30f4c142f6779e Mon Sep 17 00:00:00 2001
From: Stan Ryzhov <60649800+stasryzhov@users.noreply.github.com>
Date: Thu, 2 May 2024 14:58:30 +0000
Subject: [PATCH 1/2] backport of commit
 60706a49e55a325c85e05c2bd4f6c173bba6111f

---
 internal/tests/cli/boundary/_aliases.bash | 11 +++++++++++
 internal/tests/cli/boundary/alias.bats    | 22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/internal/tests/cli/boundary/_aliases.bash b/internal/tests/cli/boundary/_aliases.bash
index 2c6bf37c66..57507047dc 100644
--- a/internal/tests/cli/boundary/_aliases.bash
+++ b/internal/tests/cli/boundary/_aliases.bash
@@ -12,6 +12,17 @@ function create_target_alias() {
     -format json
 }
 
+function create_target_alias_with_host_id() {
+  local value=$1
+  local destid=$2
+  local hostid=$3
+  boundary aliases create target \
+    -value $value \
+    -destination-id $destid \
+    -authorize-session-host-id $hostid \
+    -format json
+}
+
 function read_alias(){
   boundary aliases read -id $1 -format json
 }
diff --git a/internal/tests/cli/boundary/alias.bats b/internal/tests/cli/boundary/alias.bats
index cb0583a5ac..31050c369d 100644
--- a/internal/tests/cli/boundary/alias.bats
+++ b/internal/tests/cli/boundary/alias.bats
@@ -17,6 +17,16 @@ export NEW_HOST="host_for_alias_test"
   [ "$status" -eq 0 ]
 }
 
+@test "boundary/alias: admin user cannot create alias with incorrectly formatted destination id" {
+  run create_target_alias $ALIAS_VALUE incorrectly-formatted-destination-id
+  [ "$status" -eq 1 ]
+}
+
+@test "boundary/alias: admin user cannot create alias with incorrectly formatted host id" {
+  run create_target_alias_with_host_id $ALIAS_VALUE $DEFAULT_TARGET incorrectly-formatted-host-id
+  [ "$status" -eq 1 ]
+}
+
 @test "boundary/alias: admin user can create alias" {
   run create_target_alias $ALIAS_VALUE $DEFAULT_TARGET
   echo $output
@@ -60,6 +70,18 @@ export NEW_HOST="host_for_alias_test"
   [ "$status" -eq 0 ]
 }
 
+@test "boundary/alias: admin user cannot update alias with incorrectly formatted host id" {
+  local id=$(alias_id_from_target_alias $ALIAS_VALUE)
+  run update_target_alias_host_id $id incorrectly-formatted-host-id
+  [ "$status" -eq 1 ]
+}
+
+@test "boundary/alias: admin user cannot update alias with incorrectly formatted destination id" {
+  local id=$(alias_id_from_target_alias $ALIAS_VALUE)
+  run update_target_alias_destination_id $id incorrectly-formatted-destination-id
+  [ "$status" -eq 1 ]
+}
+
 @test "boundary/alias: admin user can connect using an alias configured with host id" {
   run connect_alias $ALIAS_VALUE
   [ "$status" -eq 0 ]

From bf1ed28f97a250fcad48ca09386e70fca3553083 Mon Sep 17 00:00:00 2001
From: Stan Ryzhov <60649800+stasryzhov@users.noreply.github.com>
Date: Thu, 2 May 2024 14:59:08 +0000
Subject: [PATCH 2/2] backport of commit
 99f7e470f2cd4e352b7420767507b65f8bab830d

---
 internal/tests/cli/boundary/alias.bats | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/internal/tests/cli/boundary/alias.bats b/internal/tests/cli/boundary/alias.bats
index 31050c369d..5676902c18 100644
--- a/internal/tests/cli/boundary/alias.bats
+++ b/internal/tests/cli/boundary/alias.bats
@@ -27,6 +27,17 @@ export NEW_HOST="host_for_alias_test"
   [ "$status" -eq 1 ]
 }
 
+@test "boundary/alias: admin user can create alias with host id" {
+  run create_target_alias_with_host_id $ALIAS_VALUE $DEFAULT_TARGET $DEFAULT_HOST
+  [ "$status" -eq 0 ]
+}
+
+@test "boundary/alias: delete alias with host id" {
+  local id=$(alias_id_from_target_alias $ALIAS_VALUE)
+  run delete_alias $id
+  [ "$status" -eq 0 ]
+}
+
 @test "boundary/alias: admin user can create alias" {
   run create_target_alias $ALIAS_VALUE $DEFAULT_TARGET
   echo $output