From e821781c949986e2deb0c96f3842b56421aca7bf Mon Sep 17 00:00:00 2001 From: Michael Li Date: Wed, 19 Jul 2023 08:33:37 -0400 Subject: [PATCH] test(e2e): Update grants to use new ids field (#3475) --- testing/internal/e2e/tests/base/session_cancel_group_test.go | 4 ++-- testing/internal/e2e/tests/base/session_cancel_user_test.go | 4 ++-- .../e2e/tests/base/session_end_delete_host_set_test.go | 2 +- .../internal/e2e/tests/base/session_end_delete_host_test.go | 2 +- .../e2e/tests/base/session_end_delete_project_test.go | 2 +- .../internal/e2e/tests/base/session_end_delete_target_test.go | 2 +- .../internal/e2e/tests/base/session_end_delete_user_test.go | 2 +- testing/internal/e2e/tests/database/migration_test.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/internal/e2e/tests/base/session_cancel_group_test.go b/testing/internal/e2e/tests/base/session_cancel_group_test.go index 1a1ec1a184..ee3d4c3be1 100644 --- a/testing/internal/e2e/tests/base/session_cancel_group_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_group_test.go @@ -99,7 +99,7 @@ func TestCliSessionCancelGroup(t *testing.T) { // Create a role for a group newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newGroupId) // Connect to target to create a session @@ -207,7 +207,7 @@ func TestApiCreateGroup(t *testing.T) { newRoleId := newRoleResult.Item.Id t.Logf("Created Role: %s", newRoleId) - _, err = rClient.AddGrants(ctx, newRoleId, 0, []string{"id=*;type=target;actions=authorize-session"}, + _, err = rClient.AddGrants(ctx, newRoleId, 0, []string{"ids=*;type=target;actions=authorize-session"}, roles.WithAutomaticVersioning(true), ) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/session_cancel_user_test.go b/testing/internal/e2e/tests/base/session_cancel_user_test.go index a60f2bd746..1cb8a822cb 100644 --- a/testing/internal/e2e/tests/base/session_cancel_user_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_user_test.go @@ -94,7 +94,7 @@ func TestCliSessionCancelUser(t *testing.T) { // Create a role for user boundary.AuthenticateAdminCli(t, ctx) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session @@ -193,7 +193,7 @@ func TestApiCreateUser(t *testing.T) { newRoleId := newRoleResult.Item.Id t.Logf("Created Role: %s", newRoleId) - _, err = rClient.AddGrants(ctx, newRoleId, 0, []string{"id=*;type=target;actions=authorize-session"}, + _, err = rClient.AddGrants(ctx, newRoleId, 0, []string{"ids=*;type=target;actions=authorize-session"}, roles.WithAutomaticVersioning(true), ) require.NoError(t, err) diff --git a/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go index 9095287f62..b8b8ccf644 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_host_set_test.go @@ -59,7 +59,7 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) { }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session diff --git a/testing/internal/e2e/tests/base/session_end_delete_host_test.go b/testing/internal/e2e/tests/base/session_end_delete_host_test.go index 46c87a6d6c..b30a59a7e3 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_host_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_host_test.go @@ -59,7 +59,7 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) { }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session diff --git a/testing/internal/e2e/tests/base/session_end_delete_project_test.go b/testing/internal/e2e/tests/base/session_end_delete_project_test.go index 7c38695e65..eff4446c26 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_project_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_project_test.go @@ -55,7 +55,7 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) { }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session diff --git a/testing/internal/e2e/tests/base/session_end_delete_target_test.go b/testing/internal/e2e/tests/base/session_end_delete_target_test.go index 3e2dc65305..a0812a50dc 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_target_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_target_test.go @@ -59,7 +59,7 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) { }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session diff --git a/testing/internal/e2e/tests/base/session_end_delete_user_test.go b/testing/internal/e2e/tests/base/session_end_delete_user_test.go index 19e470a49d..6b73993db9 100644 --- a/testing/internal/e2e/tests/base/session_end_delete_user_test.go +++ b/testing/internal/e2e/tests/base/session_end_delete_user_test.go @@ -64,7 +64,7 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) // Connect to target to create a session diff --git a/testing/internal/e2e/tests/database/migration_test.go b/testing/internal/e2e/tests/database/migration_test.go index 8b54720a8e..504c003b5f 100644 --- a/testing/internal/e2e/tests/database/migration_test.go +++ b/testing/internal/e2e/tests/database/migration_test.go @@ -213,7 +213,7 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T newGroupId := boundary.CreateNewGroupCli(t, ctx, "global") boundary.AddUserToGroup(t, ctx, newUserId, newGroupId) newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) - boundary.AddGrantToRoleCli(t, ctx, newRoleId, "id=*;type=target;actions=authorize-session") + boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newGroupId) // Create static credentials