appease the linter

johnstcn · johnstcn · commit da8c984b35fe · 2023-08-29T12:51:39.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -243,8 +243,7 @@ func (r *RootCmd) Command(subcommands []*clibase.Cmd) (*clibase.Cmd, error) {
 		for _, opt := range cmd.Options {
 			// Verify that every option is configurable.
 			if opt.Flag == "" && opt.Env == "" {
-				// TODO(Cian): maybe move dbcrypt-rotate under server to work around this?
-				if cmd.Name() == "server" || cmd.Name() == "dbcrypt-rotate" {
+				if cmd.Name() == "server" {
 					// The server command is funky and has YAML-only options, e.g.
 					// support links.
 					return
diff --git a/enterprise/dbcrypt/cipher.go b/enterprise/dbcrypt/cipher.go
@@ -98,11 +98,11 @@ func (cs Ciphers) Encrypt(plaintext []byte) ([]byte, error) {
 		return nil, xerrors.Errorf("no ciphers configured")
 	}
 	prefix := []byte(c.HexDigest() + "-")
-	crypted, err := c.Encrypt(plaintext)
+	encrypted, err := c.Encrypt(plaintext)
 	if err != nil {
 		return nil, err
 	}
-	return append(prefix, crypted...), nil
+	return append(prefix, encrypted...), nil
 }
 
 // Decrypt decrypts the given ciphertext using the cipher indicated by the

Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,11 @@ func (cs Ciphers) Encrypt(plaintext []byte) ([]byte, error) {`
`98`	`98`	`return nil, xerrors.Errorf("no ciphers configured")`
`99`	`99`	`}`
`100`	`100`	`prefix := []byte(c.HexDigest() + "-")`
`101`		`- crypted, err := c.Encrypt(plaintext)`
	`101`	`+ encrypted, err := c.Encrypt(plaintext)`
`102`	`102`	`if err != nil {`
`103`	`103`	`return nil, err`
`104`	`104`	`}`
`105`		`- return append(prefix, crypted...), nil`
	`105`	`+ return append(prefix, encrypted...), nil`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// Decrypt decrypts the given ciphertext using the cipher indicated by the`