Skip to content

Commit 19d98e3

Browse files
author
djedward
committed
Fix improper use of Printf-style functions
1 parent 7112c0a commit 19d98e3

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

aws/session/shared_config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ func (cfg *sharedConfig) setFromIniFiles(profiles map[string]struct{}, profile s
349349
if cfg.hasSSOTokenProviderConfiguration() {
350350
skippedFiles = 0
351351
for _, f := range files {
352-
section, ok := f.IniData.GetSection(fmt.Sprintf(ssoSectionPrefix + strings.TrimSpace(cfg.SSOSessionName)))
352+
section, ok := f.IniData.GetSection(ssoSectionPrefix + strings.TrimSpace(cfg.SSOSessionName))
353353
if ok {
354354
var ssoSession ssoSession
355355
ssoSession.setFromIniSection(section)

awstesting/assert.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ func Match(t *testing.T, regex, expected string) {
2525
func AssertURL(t *testing.T, expect, actual string, msgAndArgs ...interface{}) bool {
2626
expectURL, err := url.Parse(expect)
2727
if err != nil {
28-
t.Errorf(errMsg("unable to parse expected URL", err, msgAndArgs))
28+
t.Error(errMsg("unable to parse expected URL", err, msgAndArgs))
2929
return false
3030
}
3131
actualURL, err := url.Parse(actual)
3232
if err != nil {
33-
t.Errorf(errMsg("unable to parse actual URL", err, msgAndArgs))
33+
t.Error(errMsg("unable to parse actual URL", err, msgAndArgs))
3434
return false
3535
}
3636

@@ -47,12 +47,12 @@ var queryMapKey = regexp.MustCompile("(.*?)\\.[0-9]+\\.key")
4747
func AssertQuery(t *testing.T, expect, actual string, msgAndArgs ...interface{}) bool {
4848
expectQ, err := url.ParseQuery(expect)
4949
if err != nil {
50-
t.Errorf(errMsg("unable to parse expected Query", err, msgAndArgs))
50+
t.Error(errMsg("unable to parse expected Query", err, msgAndArgs))
5151
return false
5252
}
5353
actualQ, err := url.ParseQuery(actual)
5454
if err != nil {
55-
t.Errorf(errMsg("unable to parse actual Query", err, msgAndArgs))
55+
t.Error(errMsg("unable to parse actual Query", err, msgAndArgs))
5656
return false
5757
}
5858

@@ -99,13 +99,13 @@ func AssertQuery(t *testing.T, expect, actual string, msgAndArgs ...interface{})
9999
func AssertJSON(t *testing.T, expect, actual string, msgAndArgs ...interface{}) bool {
100100
expectVal := map[string]interface{}{}
101101
if err := json.Unmarshal([]byte(expect), &expectVal); err != nil {
102-
t.Errorf(errMsg("unable to parse expected JSON", err, msgAndArgs...))
102+
t.Error(errMsg("unable to parse expected JSON", err, msgAndArgs...))
103103
return false
104104
}
105105

106106
actualVal := map[string]interface{}{}
107107
if err := json.Unmarshal([]byte(actual), &actualVal); err != nil {
108-
t.Errorf(errMsg("unable to parse actual JSON", err, msgAndArgs...))
108+
t.Error(errMsg("unable to parse actual JSON", err, msgAndArgs...))
109109
return false
110110
}
111111

private/model/api/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func (a *API) Setup() error {
225225

226226
a.fixStutterNames()
227227
if err := a.validateShapeNames(); err != nil {
228-
log.Fatalf(err.Error())
228+
log.Fatal(err.Error())
229229
}
230230
a.renameExportable()
231231
a.applyShapeNameAliases()

service/dynamodb/dynamodbattribute/converter.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dynamodbattribute
33
import (
44
"bytes"
55
"encoding/json"
6+
"errors"
67
"fmt"
78
"reflect"
89
"runtime"
@@ -25,7 +26,7 @@ func ConvertToMap(in interface{}) (item map[string]*dynamodb.AttributeValue, err
2526
if e, ok := r.(runtime.Error); ok {
2627
err = e
2728
} else if s, ok := r.(string); ok {
28-
err = fmt.Errorf(s)
29+
err = errors.New(s)
2930
} else {
3031
err = r.(error)
3132
}
@@ -73,7 +74,7 @@ func ConvertFromMap(item map[string]*dynamodb.AttributeValue, v interface{}) (er
7374
if e, ok := r.(runtime.Error); ok {
7475
err = e
7576
} else if s, ok := r.(string); ok {
76-
err = fmt.Errorf(s)
77+
err = errors.New(s)
7778
} else {
7879
err = r.(error)
7980
}
@@ -127,7 +128,7 @@ func ConvertToList(in interface{}) (item []*dynamodb.AttributeValue, err error)
127128
if e, ok := r.(runtime.Error); ok {
128129
err = e
129130
} else if s, ok := r.(string); ok {
130-
err = fmt.Errorf(s)
131+
err = errors.New(s)
131132
} else {
132133
err = r.(error)
133134
}
@@ -176,7 +177,7 @@ func ConvertFromList(item []*dynamodb.AttributeValue, v interface{}) (err error)
176177
if e, ok := r.(runtime.Error); ok {
177178
err = e
178179
} else if s, ok := r.(string); ok {
179-
err = fmt.Errorf(s)
180+
err = errors.New(s)
180181
} else {
181182
err = r.(error)
182183
}
@@ -224,7 +225,7 @@ func ConvertTo(in interface{}) (item *dynamodb.AttributeValue, err error) {
224225
if e, ok := r.(runtime.Error); ok {
225226
err = e
226227
} else if s, ok := r.(string); ok {
227-
err = fmt.Errorf(s)
228+
err = errors.New(s)
228229
} else {
229230
err = r.(error)
230231
}
@@ -254,7 +255,7 @@ func ConvertFrom(item *dynamodb.AttributeValue, v interface{}) (err error) {
254255
if e, ok := r.(runtime.Error); ok {
255256
err = e
256257
} else if s, ok := r.(string); ok {
257-
err = fmt.Errorf(s)
258+
err = errors.New(s)
258259
} else {
259260
err = r.(error)
260261
}

service/sqs/checksums.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func verifySendMessage(r *request.Request) {
3737
out := r.Data.(*SendMessageOutput)
3838
err := checksumsMatch(in.MessageBody, out.MD5OfMessageBody)
3939
if err != nil {
40-
setChecksumError(r, err.Error())
40+
setChecksumError(r, "%s", err.Error())
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)