aherman
/
boundary
mirror of https://github.com/hashicorp/boundary
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test(e2e): Clean up

Browse Source
pull/4446/head
Stan Ryzhov 2 years ago
parent 71639dfa3d
commit 8fa4abed6f
2 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File

25
testing/internal/e2e/boundary/role.go
Unescape View File

@ -58,6 +58,29 @@ func CreateRoleCli(t testing.TB, ctx context.Context, scopeId string) (string, e
return newRoleId, nil
}
// ListRolesCli lists roles from the specified scope using the Boundary CLI.
// Returns a slice of roles or error
func ListRolesCli(t testing.TB, ctx context.Context, scopeId string) ([]*roles.Role, error) {
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs(
"roles", "list",
"-scope-id", scopeId,
"-format", "json",
),
)
if output.Err != nil {
return nil, fmt.Errorf("error listing roles in %s scope: %w: %s", scopeId, output.Err, output.Stderr)
}
var roleListResult roles.RoleListResult
if err := json.Unmarshal(output.Stdout, &roleListResult); err != nil {
return nil, fmt.Errorf("error unmarshalling role list result: %w", err)
}
t.Logf("Listed Roles in scope %s", scopeId)
return roleListResult.Items, nil
}
// AddGrantToRoleCli adds a grant/permission to a role using the cli
func AddGrantToRoleCli(t testing.TB, ctx context.Context, roleId string, grant string) {
output := e2e.RunCommand(ctx, "boundary",
@ -80,7 +103,7 @@ func AddPrincipalToRoleCli(t testing.TB, ctx context.Context, roleId string, pri
),
)
require.NoError(t, output.Err, string(output.Stderr))
t.Logf("Principle %s added to role: %s", principal, roleId)
t.Logf("Principal %s added to role: %s", principal, roleId)
}
// SetGrantScopesToRoleCli uses Boundary CLI to override grant scopes for the role with the provided ones.

107
testing/internal/e2e/tests/base/role_multi_scope_grants_test.go
Unescape View File

@ -22,144 +22,121 @@ func TestCliApplyGrantsForMultipleScopes(t *testing.T) {
boundary.AuthenticateAdminCli(t, ctx)
// Create Org and Project
newOrgId := boundary.CreateNewOrgCli(t, ctx)
orgId := boundary.CreateNewOrgCli(t, ctx)
t.Cleanup(func() {
ctx := context.Background()
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("scopes", "delete", "-id", newOrgId))
output := e2e.RunCommand(ctx, "boundary", e2e.WithArgs("scopes", "delete", "-id", orgId))
require.NoError(t, output.Err, string(output.Stderr))
})
newProjectId := boundary.CreateNewProjectCli(t, ctx, newOrgId)
projectId := boundary.CreateNewProjectCli(t, ctx, orgId)
// Create Account
acctName := "e2e-account"
newAccountId, acctPassword := boundary.CreateNewAccountCli(t, ctx, bc.AuthMethodId, acctName)
accountId, acctPassword := boundary.CreateNewAccountCli(t, ctx, bc.AuthMethodId, acctName)
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("accounts", "delete", "-id", newAccountId),
e2e.WithArgs("accounts", "delete", "-id", accountId),
)
require.NoError(t, output.Err, string(output.Stderr))
})
// Create User and set Account to it
newUserId := boundary.CreateNewUserCli(t, ctx, "global")
userId := boundary.CreateNewUserCli(t, ctx, "global")
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("users", "delete", "-id", newUserId),
e2e.WithArgs("users", "delete", "-id", userId),
)
require.NoError(t, output.Err, string(output.Stderr))
})
boundary.SetAccountToUserCli(t, ctx, newUserId, newAccountId)
// Create Role and add admin grants to it
newRoleId, err := boundary.CreateRoleCli(t, ctx, "global")
require.NoError(t, err)
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("roles", "delete", "-id", newRoleId),
)
require.NoError(t, output.Err, string(output.Stderr))
})
boundary.AddGrantToRoleCli(t, ctx, newRoleId, "ids=*;type=*;actions=*")
boundary.SetAccountToUserCli(t, ctx, userId, accountId)
// Authenticate test user and try to:
// - create role in global scope: expect error
// - create role in org scope: expect error
// - create role in proj scope: expect error
// - list Roles in global scope: expect error
// - list Roles in org scope: expect error
// - list Roles in proj scope: expect error
boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, acctName, acctPassword)
_, err = boundary.CreateRoleCli(t, ctx, "global")
require.Error(t, err)
_, err = boundary.CreateRoleCli(t, ctx, newOrgId)
_, err = boundary.CreateRoleCli(t, ctx, orgId)
require.Error(t, err)
_, err = boundary.CreateRoleCli(t, ctx, newProjectId)
_, err = boundary.CreateRoleCli(t, ctx, projectId)
require.Error(t, err)
// Add User as a principle to the admin Role
// Create Role, and add grants and principal to it
boundary.AuthenticateAdminCli(t, ctx)
boundary.AddPrincipalToRoleCli(t, ctx, newRoleId, newUserId)
// Authenticate User and try to:
// - create Role in global scope: expect success
// - create Role in org scope: expect error
// - create Role in proj scope: expect error
boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, acctName, acctPassword)
newGlobalRoleId2, err := boundary.CreateRoleCli(t, ctx, "global")
roleId, err := boundary.CreateRoleCli(t, ctx, "global")
require.NoError(t, err)
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("roles", "delete", "-id", newGlobalRoleId2),
e2e.WithArgs("roles", "delete", "-id", roleId),
)
require.NoError(t, output.Err, string(output.Stderr))
})
boundary.AddGrantToRoleCli(t, ctx, roleId, "ids=*;type=role;actions=list")
boundary.AddPrincipalToRoleCli(t, ctx, roleId, userId)
_, err = boundary.CreateRoleCli(t, ctx, newOrgId)
// Authenticate User and try to:
// - list Roles in global scope: expect success
// - list Roles in org scope: expect error
// - list Roles in proj scope: expect error
boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, acctName, acctPassword)
_, err = boundary.ListRolesCli(t, ctx, "global")
require.NoError(t, err)
_, err = boundary.ListRolesCli(t, ctx, orgId)
require.Error(t, err)
_, err = boundary.CreateRoleCli(t, ctx, newProjectId)
_, err = boundary.ListRolesCli(t, ctx, projectId)
require.Error(t, err)
// Set Grant Scopes to Role: this, children
boundary.AuthenticateAdminCli(t, ctx)
err = boundary.SetGrantScopesToRoleCli(t, ctx, newRoleId,
err = boundary.SetGrantScopesToRoleCli(t, ctx, roleId,
boundary.WithGrantScopeId("this"),
boundary.WithGrantScopeId("children"),
)
require.NoError(t, err)
// Authenticate User and try to:
// - create Role in global scope: expect success
// - create Role in org scope: expect success
// - create Role in proj scope: expect error
// - list Roles in global scope: expect success
// - list Roles in org scope: expect success
// - list Roles in proj scope: expect error
boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, acctName, acctPassword)
newGlobalRoleId3, err := boundary.CreateRoleCli(t, ctx, "global")
_, err = boundary.ListRolesCli(t, ctx, "global")
require.NoError(t, err)
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("roles", "delete", "-id", newGlobalRoleId3),
)
require.NoError(t, output.Err, string(output.Stderr))
})
_, err = boundary.CreateRoleCli(t, ctx, newOrgId)
_, err = boundary.ListRolesCli(t, ctx, orgId)
require.NoError(t, err)
_, err = boundary.CreateRoleCli(t, ctx, newProjectId)
_, err = boundary.ListRolesCli(t, ctx, projectId)
require.Error(t, err)
// Set Grant Scopes to Role: this, descendants
boundary.AuthenticateAdminCli(t, ctx)
err = boundary.SetGrantScopesToRoleCli(t, ctx, newRoleId,
err = boundary.SetGrantScopesToRoleCli(t, ctx, roleId,
boundary.WithGrantScopeId("this"),
boundary.WithGrantScopeId("descendants"),
)
require.NoError(t, err)
// Authenticate User and try to:
// - create Role in global scope: expect success
// - create Role in org scope: expect success
// - create Role in proj scope: expect success
// - list Roles in global scope: expect success
// - list Roles in org scope: expect success
// - list Roles in proj scope: expect success
boundary.AuthenticateCli(t, ctx, bc.AuthMethodId, acctName, acctPassword)
newGlobalRoleId4, err := boundary.CreateRoleCli(t, ctx, "global")
_, err = boundary.ListRolesCli(t, ctx, "global")
require.NoError(t, err)
t.Cleanup(func() {
boundary.AuthenticateAdminCli(t, ctx)
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("roles", "delete", "-id", newGlobalRoleId4),
)
require.NoError(t, output.Err, string(output.Stderr))
})
_, err = boundary.CreateRoleCli(t, ctx, newOrgId)
_, err = boundary.ListRolesCli(t, ctx, orgId)
require.NoError(t, err)
_, err = boundary.CreateRoleCli(t, ctx, newProjectId)
_, err = boundary.ListRolesCli(t, ctx, projectId)
require.NoError(t, err)
}

Write Preview
Loading…
Cancel
Save