diff --git a/client/client.go b/client/client.go index 998629d9..4d7d8e53 100644 --- a/client/client.go +++ b/client/client.go @@ -194,7 +194,7 @@ func drainBody(b io.ReadCloser) (r1, r2 io.ReadCloser, err error) { // Do not use as a reliable way to get unique IDs, instead use for things like logging. func shortID() string { b := make([]byte, 6) - if _, err := io.ReadFull(rand.Reader, b); err != nil { + if _, err := rand.Read(b); err != nil { panic(err) } return base64.StdEncoding.EncodeToString(b) diff --git a/error.go b/error.go index 431e499e..20956ca9 100644 --- a/error.go +++ b/error.go @@ -33,7 +33,6 @@ import ( "crypto/rand" "encoding/base64" "fmt" - "io" "strings" ) @@ -359,7 +358,7 @@ func asErrorResponse(err error) *ErrorResponse { // are not catastrophic. func newErrorID() string { b := make([]byte, 6) - if _, err := io.ReadFull(rand.Reader, b); err != nil { + if _, err := rand.Read(b); err != nil { panic(err) } return base64.StdEncoding.EncodeToString(b) diff --git a/middleware/log_request.go b/middleware/log_request.go index 46743157..d2ff99e5 100644 --- a/middleware/log_request.go +++ b/middleware/log_request.go @@ -5,7 +5,6 @@ import ( "crypto/rand" "encoding/base64" "encoding/json" - "io" "net" "net/http" "sort" @@ -112,7 +111,7 @@ func LogRequest(verbose bool, sensitiveHeaders ...string) goa.Middleware { // Do not use as a reliable way to get unique IDs, instead use for things like logging. func shortID() string { b := make([]byte, 6) - if _, err := io.ReadFull(rand.Reader, b); err != nil { + if _, err := rand.Read(b); err != nil { panic(err) } return base64.StdEncoding.EncodeToString(b) diff --git a/middleware/request_id.go b/middleware/request_id.go index fba69449..5d699a87 100644 --- a/middleware/request_id.go +++ b/middleware/request_id.go @@ -5,7 +5,6 @@ import ( "crypto/rand" "encoding/base64" "fmt" - "io" "net/http" "strings" "sync/atomic" @@ -34,7 +33,7 @@ func init() { var b64 string replacer := strings.NewReplacer("+", "", "/", "") for len(b64) < 10 { - if _, err := io.ReadFull(rand.Reader, buf[:]); err != nil { + if _, err := rand.Read(buf[:]); err != nil { panic(err) } b64 = base64.StdEncoding.EncodeToString(buf[:]) diff --git a/middleware/xray/middleware.go b/middleware/xray/middleware.go index f833b994..f7db1500 100644 --- a/middleware/xray/middleware.go +++ b/middleware/xray/middleware.go @@ -4,7 +4,6 @@ import ( "context" "crypto/rand" "fmt" - "io" "net" "net/http" "sync" @@ -108,7 +107,7 @@ func New(service, daemon string) (goa.Middleware, error) { // compatible with AWS X-Ray. func NewID() string { b := make([]byte, 8) - if _, err := io.ReadFull(rand.Reader, b); err != nil { + if _, err := rand.Read(b); err != nil { panic(err) } return fmt.Sprintf("%x", b) @@ -118,7 +117,7 @@ func NewID() string { // compatible with AWS X-Ray. func NewTraceID() string { b := make([]byte, 12) - if _, err := io.ReadFull(rand.Reader, b); err != nil { + if _, err := rand.Read(b); err != nil { panic(err) } return fmt.Sprintf("%d-%x-%s", 1, time.Now().Unix(), fmt.Sprintf("%x", b))