shorten further

f0ssel · f0ssel · commit e5e27d5fd75d · 2024-07-25T20:44:00.000Z
diff --git a/coderd/provisionerkey/provisionerkey.go b/coderd/provisionerkey/provisionerkey.go
@@ -12,8 +12,12 @@ import (
 	"github.com/coder/coder/v2/cryptorand"
 )
 
+const (
+	secretLength = 32
+)
+
 func New(organizationID uuid.UUID, name string, tags map[string]string) (database.InsertProvisionerKeyParams, string, error) {
-	secret, err := cryptorand.String(64)
+	secret, err := cryptorand.String(secretLength)
 	if err != nil {
 		return database.InsertProvisionerKeyParams{}, "", xerrors.Errorf("generate secret: %w", err)
 	}
@@ -33,8 +37,8 @@ func New(organizationID uuid.UUID, name string, tags map[string]string) (databas
 }
 
 func Validate(token string) error {
-	if len(token) != 64 {
-		return xerrors.Errorf("must be 64 characters")
+	if len(token) != secretLength {
+		return xerrors.Errorf("must be %d characters", secretLength)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,12 @@ import (`
`12`	`12`	`"github.com/coder/coder/v2/cryptorand"`
`13`	`13`	`)`
`14`	`14`
	`15`	`+const (`
	`16`	`+ secretLength = 32`
	`17`	`+)`
	`18`	`+`
`15`	`19`	`func New(organizationID uuid.UUID, name string, tags map[string]string) (database.InsertProvisionerKeyParams, string, error) {`
`16`		`- secret, err := cryptorand.String(64)`
	`20`	`+ secret, err := cryptorand.String(secretLength)`
`17`	`21`	`if err != nil {`
`18`	`22`	`return database.InsertProvisionerKeyParams{}, "", xerrors.Errorf("generate secret: %w", err)`
`19`	`23`	`}`
`@@ -33,8 +37,8 @@ func New(organizationID uuid.UUID, name string, tags map[string]string) (databas`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`func Validate(token string) error {`
`36`		`- if len(token) != 64 {`
`37`		`- return xerrors.Errorf("must be 64 characters")`
	`40`	`+ if len(token) != secretLength {`
	`41`	`+ return xerrors.Errorf("must be %d characters", secretLength)`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`return nil`