diff --git a/testing/internal/e2e/boundary/role.go b/testing/internal/e2e/boundary/role.go index 9292f3f15f..c8ad014655 100644 --- a/testing/internal/e2e/boundary/role.go +++ b/testing/internal/e2e/boundary/role.go @@ -28,28 +28,6 @@ func CreateNewRoleApi(t testing.TB, ctx context.Context, client *api.Client, sco return newRoleId } -// CreateNewRoleCli creates a new role using the cli. -// Returns the id of the new role. -func CreateNewRoleCli(t testing.TB, ctx context.Context, scopeId string) string { - output := e2e.RunCommand(ctx, "boundary", - e2e.WithArgs( - "roles", "create", - "-scope-id", scopeId, - "-name", "e2e Role", - "-description", "e2e", - "-format", "json", - ), - ) - require.NoError(t, output.Err, string(output.Stderr)) - var newRoleResult roles.RoleCreateResult - err := json.Unmarshal(output.Stdout, &newRoleResult) - require.NoError(t, err) - - newRoleId := newRoleResult.Item.Id - t.Logf("Created Role: %s", newRoleId) - return newRoleId -} - // CreateRoleCli creates a new role using the Boundary CLI. // Returns the id of the new role or error func CreateRoleCli(t testing.TB, ctx context.Context, scopeId string) (string, error) { 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 666e1916f0..63eaa4a01a 100644 --- a/testing/internal/e2e/tests/base/session_cancel_group_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_group_test.go @@ -98,7 +98,8 @@ func TestCliSessionCancelGroup(t *testing.T) { boundary.AddUserToGroup(t, ctx, newUserId, newGroupId) // Create a role for a group - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newGroupId) 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 6406e989a9..6faf4be221 100644 --- a/testing/internal/e2e/tests/base/session_cancel_user_test.go +++ b/testing/internal/e2e/tests/base/session_cancel_user_test.go @@ -93,7 +93,8 @@ func TestCliSessionCancelUser(t *testing.T) { // Create a role for user boundary.AuthenticateAdminCli(t, ctx) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) 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 97c9130a5f..444cb5255b 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 @@ -58,7 +58,8 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) 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 7c7d96cfb6..0963794497 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 @@ -58,7 +58,8 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) 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 a00caee840..0150e023fe 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 @@ -54,7 +54,8 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) 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 954ce74f04..79ac503f6b 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 @@ -58,7 +58,8 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) 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 3337cf9b96..4aef7837bb 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 @@ -63,7 +63,8 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) { } }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) diff --git a/testing/internal/e2e/tests/base_plus/ldap_test.go b/testing/internal/e2e/tests/base_plus/ldap_test.go index ff36ab193d..d55f7af9b0 100644 --- a/testing/internal/e2e/tests/base_plus/ldap_test.go +++ b/testing/internal/e2e/tests/base_plus/ldap_test.go @@ -155,7 +155,8 @@ func TestCliLdap(t *testing.T) { require.Contains(t, managedGroupReadResult.Item.MemberIds, newAccountId) // Add managed group as a principal to a role with permissions to read auth methods - newRoleId := boundary.CreateNewRoleCli(t, ctx, newOrgId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newOrgId) + require.NoError(t, err) boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, managedGroupId) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=auth-method;actions=read") diff --git a/testing/internal/e2e/tests/base_plus/rate_limit_test.go b/testing/internal/e2e/tests/base_plus/rate_limit_test.go index 7720c86450..b4efd0ef17 100644 --- a/testing/internal/e2e/tests/base_plus/rate_limit_test.go +++ b/testing/internal/e2e/tests/base_plus/rate_limit_test.go @@ -171,7 +171,8 @@ func TestHttpRateLimit(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=*;actions=*") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) @@ -306,7 +307,8 @@ func TestCliRateLimit(t *testing.T) { require.NoError(t, output.Err, string(output.Stderr)) }) boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=*;actions=*") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId) diff --git a/testing/internal/e2e/tests/database/migration_test.go b/testing/internal/e2e/tests/database/migration_test.go index f9c1d74b19..e92cbbc473 100644 --- a/testing/internal/e2e/tests/database/migration_test.go +++ b/testing/internal/e2e/tests/database/migration_test.go @@ -241,7 +241,8 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId) newGroupId := boundary.CreateNewGroupCli(t, ctx, "global") boundary.AddUserToGroup(t, ctx, newUserId, newGroupId) - newRoleId := boundary.CreateNewRoleCli(t, ctx, newProjectId) + newRoleId, err := boundary.CreateRoleCli(t, ctx, newProjectId) + require.NoError(t, err) boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=target;actions=authorize-session") boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newGroupId) @@ -277,7 +278,7 @@ func populateBoundaryDatabase(t testing.TB, ctx context.Context, c *config, te T ) require.NoError(t, output.Err, string(output.Stderr)) var tokenCreateResult vault.CreateTokenResponse - err := json.Unmarshal(output.Stdout, &tokenCreateResult) + err = json.Unmarshal(output.Stdout, &tokenCreateResult) require.NoError(t, err) credStoreToken := tokenCreateResult.Auth.Client_Token t.Log("Created Vault Cred Store Token")