Skip to content

Commit

Permalink
chore: grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
mxyng committed Mar 24, 2022
1 parent 506f2c6 commit 7db5da2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ server:

grants:
# 1. Grant user(s) or group(s) as Infra administrator
# Setup an user as Infra administrator
# Setup a user as Infra administrator
- user: you@example.com
role: admin
resource: infra
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/infra/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ server:
## Infra server UI proxy URL
# uiProxyURL: ""

## Duration of an user session
## Duration of a user session
# sessionDuration: 12h0m0s

## Additional identity providers to configure
Expand Down
8 changes: 3 additions & 5 deletions internal/cmd/identities.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ func newIdentitiesAddCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "add NAME|EMAIL",
Short: "Create an identity.",
Long: `Create a machine identity with NAME or an user identity with EMAIL.
Long: `Create a machine identity with NAME or a user identity with EMAIL.
NAME must only contain alphanumeric characters ('a-z', 'A-Z', '0-9') or the
special characters '-', '_', or '/' and has a maximum length of 256 characters.
EMAIL must conform to RFC5322 Addr-Spec specificiations. This value accepts a
complete RFC5322 address, e.g. "Alice <alice@example.com>", however only the
address component will be used.
EMAIL must contain a valid email address in the form of "<local>@<domain>".
`,
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
Expand Down Expand Up @@ -250,7 +248,7 @@ func newIdentitiesRemoveCmd() *cobra.Command {
return cmd
}

// checkNameOrEmail infers whether the input s specifies an user identity (email) or a machine
// checkNameOrEmail infers whether the input s specifies a user identity (email) or a machine
// identity (name). The input is considered a name if it has the format `^[a-zA-Z0-9-_/]+$`.
// All other input formats will be considered an email. If an email input fails validation,
// return an error.
Expand Down
2 changes: 1 addition & 1 deletion internal/server/data/user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestDeleteUser(t *testing.T) {
err = DeleteUsers(db, ByEmail(bond.Email))
require.NoError(t, err)

// deleting an user should not delete unrelated users
// deleting a user should not delete unrelated users
_, err = GetUser(db, ByEmail(bourne.Email))
require.NoError(t, err)
}
Expand Down

0 comments on commit 7db5da2

Please sign in to comment.