Skip to content

refactor(user): the caller names the resource, so the validator does not #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
retr0h merged 1 commit into from
Oct 3, 2026
Merged

refactor(user): the caller names the resource, so the validator does not #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/provider/node/user/debian_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (d *Debian) GetGroup(
) (*Group, error) {
_ = ctx

if err := validateAccountName("group", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("group: %w", err)
}

Expand All @@ -82,7 +82,7 @@ func (d *Debian) CreateGroup(
) (*GroupResult, error) {
_ = ctx

if err := validateAccountName("group", opts.Name); err != nil {
if err := validateAccountName(opts.Name); err != nil {
return nil, fmt.Errorf("group: %w", err)
}

Expand Down Expand Up @@ -112,7 +112,7 @@ func (d *Debian) UpdateGroup(
) (*GroupResult, error) {
_ = ctx

if err := validateAccountName("group", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("group: %w", err)
}

Expand Down Expand Up @@ -141,7 +141,7 @@ func (d *Debian) DeleteGroup(
) (*GroupResult, error) {
_ = ctx

if err := validateAccountName("group", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("group: %w", err)
}

Expand Down
18 changes: 9 additions & 9 deletions internal/provider/node/user/debian_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func (suite *DebianPublicTestSuite) TestGetUser() {
validateFunc: func(result *user.User, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
{
Expand Down Expand Up @@ -540,7 +540,7 @@ func (suite *DebianPublicTestSuite) TestCreateUser() {
validateFunc: func(result *user.Result, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -691,7 +691,7 @@ func (suite *DebianPublicTestSuite) TestUpdateUser() {
validateFunc: func(result *user.Result, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -749,7 +749,7 @@ func (suite *DebianPublicTestSuite) TestDeleteUser() {
validateFunc: func(result *user.Result, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -860,7 +860,7 @@ func (suite *DebianPublicTestSuite) TestChangePassword() {
validateFunc: func(result *user.Result, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -1024,7 +1024,7 @@ func (suite *DebianPublicTestSuite) TestGetGroup() {
validateFunc: func(result *user.Group, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid group name")
suite.Contains(err.Error(), "name \"Invalid\" must match")
},
},
}
Expand Down Expand Up @@ -1126,7 +1126,7 @@ func (suite *DebianPublicTestSuite) TestCreateGroup() {
validateFunc: func(result *user.GroupResult, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid group name")
suite.Contains(err.Error(), "name \"Invalid\" must match")
},
},
}
Expand Down Expand Up @@ -1194,7 +1194,7 @@ func (suite *DebianPublicTestSuite) TestUpdateGroup() {
validateFunc: func(result *user.GroupResult, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid group name")
suite.Contains(err.Error(), "name \"Invalid\" must match")
},
},
}
Expand Down Expand Up @@ -1252,7 +1252,7 @@ func (suite *DebianPublicTestSuite) TestDeleteGroup() {
validateFunc: func(result *user.GroupResult, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid group name")
suite.Contains(err.Error(), "name \"Invalid\" must match")
},
},
}
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/node/user/debian_ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (d *Debian) ListKeys(
) ([]SSHKey, error) {
_ = ctx

if err := validateAccountName("user", username); err != nil {
if err := validateAccountName(username); err != nil {
return nil, fmt.Errorf("ssh key: list: %w", err)
}

Expand Down Expand Up @@ -90,7 +90,7 @@ func (d *Debian) AddKey(
) (*SSHKeyResult, error) {
_ = ctx

if err := validateAccountName("user", username); err != nil {
if err := validateAccountName(username); err != nil {
return nil, fmt.Errorf("ssh key: add: %w", err)
}

Expand Down Expand Up @@ -181,7 +181,7 @@ func (d *Debian) RemoveKey(
) (*SSHKeyResult, error) {
_ = ctx

if err := validateAccountName("user", username); err != nil {
if err := validateAccountName(username); err != nil {
return nil, fmt.Errorf("ssh key: remove: %w", err)
}

Expand Down
6 changes: 3 additions & 3 deletions internal/provider/node/user/debian_ssh_key_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func (suite *DebianSSHKeyPublicTestSuite) TestListKeys() {
validateFunc: func(keys []user.SSHKey, err error) {
suite.Error(err)
suite.Nil(keys)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -721,7 +721,7 @@ func (suite *DebianSSHKeyPublicTestSuite) TestAddKey() {
validateFunc: func(result *user.SSHKeyResult, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down Expand Up @@ -944,7 +944,7 @@ func (suite *DebianSSHKeyPublicTestSuite) TestRemoveKey() {
validateFunc: func(result *user.SSHKeyResult, err error) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid user name")
suite.Contains(err.Error(), "must match")
},
},
}
Expand Down
10 changes: 5 additions & 5 deletions internal/provider/node/user/debian_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (d *Debian) GetUser(
) (*User, error) {
_ = ctx

if err := validateAccountName("user", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("user: %w", err)
}

Expand Down Expand Up @@ -112,7 +112,7 @@ func (d *Debian) CreateUser(
) (*Result, error) {
_ = ctx

if err := validateAccountName("user", opts.Name); err != nil {
if err := validateAccountName(opts.Name); err != nil {
return nil, fmt.Errorf("user: %w", err)
}

Expand Down Expand Up @@ -156,7 +156,7 @@ func (d *Debian) UpdateUser(
) (*Result, error) {
_ = ctx

if err := validateAccountName("user", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("user: %w", err)
}

Expand Down Expand Up @@ -191,7 +191,7 @@ func (d *Debian) DeleteUser(
) (*Result, error) {
_ = ctx

if err := validateAccountName("user", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("user: %w", err)
}

Expand Down Expand Up @@ -219,7 +219,7 @@ func (d *Debian) ChangePassword(
) (*Result, error) {
_ = ctx

if err := validateAccountName("user", name); err != nil {
if err := validateAccountName(name); err != nil {
return nil, fmt.Errorf("user: %w", err)
}

Expand Down
8 changes: 3 additions & 5 deletions internal/provider/node/user/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,14 @@ var accountNamePattern = regexp.MustCompile(`^[a-z_][a-z0-9_-]*\$?$`)
const accountNameMaxLength = 32

// validateAccountName rejects a user or group name that does not match
// accountNamePattern or exceeds accountNameMaxLength. kind names the
// resource in the error message ("user" or "group").
// accountNamePattern or exceeds accountNameMaxLength. The caller names the
// resource, so this message does not.
func validateAccountName(
kind string,
name string,
) error {
if len(name) > accountNameMaxLength || !accountNamePattern.MatchString(name) {
return fmt.Errorf(
"invalid %s name %q: must match %s and be at most %d characters",
kind,
"name %q must match %s and be at most %d characters",
name,
accountNamePattern.String(),
accountNameMaxLength,
Expand Down
Loading