Add account ID templating (#518)
* Remove default role and create via the same mechanism as other initial resources
This commit is contained in:
1 parent
19aecfefae
commit
fa700dc002
24 files changed
+291
-142
No files matched your search
@@ -538,7 +538,7 @@ func toProto(in *iam.Role, principals []iam.PrincipalRole, grants []*iam.RoleGra
|
||||
}
|
||||
for _, g := range grants {
|
||||
out.GrantStrings = append(out.GrantStrings, g.GetRawGrant())
|
||||
parsed, err := perms.Parse(in.GetGrantScopeId(), "", g.GetRawGrant(), false)
|
||||
parsed, err := perms.Parse(in.GetGrantScopeId(), g.GetRawGrant())
|
||||
if err != nil {
|
||||
// This should never happen as we validate on the way in, but let's
|
||||
// return what we can since we are still returning the raw grant
|
||||
@@ -625,11 +625,6 @@ func validateUpdateRequest(req *pbs.UpdateRoleRequest) error {
|
||||
|
||||
func validateDeleteRequest(req *pbs.DeleteRoleRequest) error {
|
||||
return handlers.ValidateDeleteRequest(iam.RolePrefix, req, func() map[string]string {
|
||||
if req.GetId() == "r_default" {
|
||||
return map[string]string{
|
||||
"id": `Deleting "r_default" is not allowed`,
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
@@ -279,14 +279,6 @@ func TestDelete(t *testing.T) {
|
||||
},
|
||||
err: handlers.ApiErrorWithCode(codes.NotFound),
|
||||
},
|
||||
{
|
||||
name: "Delete default role",
|
||||
scopeId: "global",
|
||||
req: &pbs.DeleteRoleRequest{
|
||||
Id: "r_default",
|
||||
},
|
||||
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
|
||||
},
|
||||
{
|
||||
name: "Bad Role Id formatting",
|
||||
scopeId: or.GetPublicId(),
|
||||
@@ -504,7 +496,7 @@ func TestCreate(t *testing.T) {
|
||||
|
||||
func TestUpdate(t *testing.T) {
|
||||
grantString := "id=*;type=*;actions=*"
|
||||
g, err := perms.Parse("global", "", grantString, false)
|
||||
g, err := perms.Parse("global", grantString)
|
||||
require.NoError(t, err)
|
||||
_, actions := g.Actions()
|
||||
grant := &pb.Grant{
|
||||
@@ -1339,7 +1331,7 @@ func checkEqualGrants(t *testing.T, expected []string, got *pb.Role) {
|
||||
require.Equal(len(expected), len(got.GrantStrings))
|
||||
require.Equal(len(expected), len(got.Grants))
|
||||
for i, v := range expected {
|
||||
parsed, err := perms.Parse("o_abc123", "", v, false)
|
||||
parsed, err := perms.Parse("o_abc123", v)
|
||||
require.NoError(err)
|
||||
assert.Equal(expected[i], got.GrantStrings[i])
|
||||
assert.Equal(expected[i], got.Grants[i].GetRaw())
|
||||
|
||||
@@ -614,8 +614,8 @@ func TestCreate(t *testing.T) {
|
||||
switch role.GetName() {
|
||||
case "Administration":
|
||||
assert.Equal(fmt.Sprintf("Role created for administration of scope %s by user %s at its creation time", got.GetItem().GetId(), userId), role.GetDescription())
|
||||
case "Default Grants":
|
||||
assert.Equal(fmt.Sprintf("Role created for authentication to and listing of some resources of scope %s at its creation time", got.GetItem().GetId()), role.GetDescription())
|
||||
case "Login and Default Grants":
|
||||
assert.Equal(fmt.Sprintf("Role created for login capability and account self-management for users of scope %s at its creation time", got.GetItem().GetId()), role.GetDescription())
|
||||
default:
|
||||
t.Fatal("unexpected role name", role.GetName())
|
||||
}
|
||||
|
||||
@@ -230,6 +230,10 @@ type TestControllerOpts struct {
|
||||
// DefaultPassword is the password used when creating the default account.
|
||||
DefaultPassword string
|
||||
|
||||
// DisableInitialLoginRoleCreation can be set true to disable creating the
|
||||
// global scope login role automatically.
|
||||
DisableInitialLoginRoleCreation bool
|
||||
|
||||
// DisableAuthMethodCreation can be set true to disable creating an auth
|
||||
// method automatically.
|
||||
DisableAuthMethodCreation bool
|
||||
@@ -389,22 +393,27 @@ func NewTestController(t *testing.T, opts *TestControllerOpts) *TestController {
|
||||
if err := tc.b.CreateGlobalKmsKeys(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opts.DisableAuthMethodCreation {
|
||||
if _, _, err := tc.b.CreateInitialAuthMethod(ctx); err != nil {
|
||||
if !opts.DisableInitialLoginRoleCreation {
|
||||
if _, err := tc.b.CreateInitialLoginRole(context.Background()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opts.DisableScopesCreation {
|
||||
if _, _, err := tc.b.CreateInitialScopes(ctx); err != nil {
|
||||
if !opts.DisableAuthMethodCreation {
|
||||
if _, _, err := tc.b.CreateInitialAuthMethod(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opts.DisableHostResourcesCreation {
|
||||
if _, _, _, err := tc.b.CreateInitialHostResources(ctx); err != nil {
|
||||
if !opts.DisableScopesCreation {
|
||||
if _, _, err := tc.b.CreateInitialScopes(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opts.DisableTargetCreation {
|
||||
if _, err := tc.b.CreateInitialTarget(ctx); err != nil {
|
||||
if !opts.DisableHostResourcesCreation {
|
||||
if _, _, _, err := tc.b.CreateInitialHostResources(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opts.DisableTargetCreation {
|
||||
if _, err := tc.b.CreateInitialTarget(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user