Merge pull request #3486 from tao12345666333/rm-unnecessary-str-fmt

fuweid · web-flow · commit b05a2b26ff05 · 2019-08-05T14:05:51.000+08:00
remotes: remove unnecessary string formatting
diff --git a/remotes/docker/authorizer.go b/remotes/docker/authorizer.go
@@ -265,7 +265,7 @@ func (ah *authHandler) doBasicAuth(ctx context.Context) (string, error) {
 	}
 
 	auth := base64.StdEncoding.EncodeToString([]byte(username + ":" + secret))
-	return fmt.Sprintf("%s %s", "Basic", auth), nil
+	return fmt.Sprintf("Basic %s", auth), nil
 }
 
 func (ah *authHandler) doBearerAuth(ctx context.Context) (string, error) {
@@ -307,7 +307,7 @@ func (ah *authHandler) doBearerAuth(ctx context.Context) (string, error) {
 		token, err = ah.fetchToken(ctx, to)
 		err = errors.Wrap(err, "failed to fetch anonymous token")
 	}
-	token = fmt.Sprintf("%s %s", "Bearer", token)
+	token = fmt.Sprintf("Bearer %s", token)
 
 	r.token, r.err = token, err
 	r.Done()

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ func (ah *authHandler) doBasicAuth(ctx context.Context) (string, error) {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`auth := base64.StdEncoding.EncodeToString([]byte(username + ":" + secret))`
`268`		`- return fmt.Sprintf("%s %s", "Basic", auth), nil`
	`268`	`+ return fmt.Sprintf("Basic %s", auth), nil`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`func (ah *authHandler) doBearerAuth(ctx context.Context) (string, error) {`
`@@ -307,7 +307,7 @@ func (ah *authHandler) doBearerAuth(ctx context.Context) (string, error) {`
`307`	`307`	`token, err = ah.fetchToken(ctx, to)`
`308`	`308`	`err = errors.Wrap(err, "failed to fetch anonymous token")`
`309`	`309`	`}`
`310`		`- token = fmt.Sprintf("%s %s", "Bearer", token)`
	`310`	`+ token = fmt.Sprintf("Bearer %s", token)`
`311`	`311`
`312`	`312`	`r.token, r.err = token, err`
`313`	`313`	`r.Done()`