Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add awsQueryCompatible error code translation support #4597

Merged
merged 14 commits into from
Dec 28, 2022
Merged

Add awsQueryCompatible error code translation support #4597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
656fc74
Add AWSQueryCompatible support that returns a AWSQuery compatible err…
eddy-aws Oct 24, 2022
d79ea2a
Fix indentation
eddy-aws Oct 24, 2022
ef45b90
Fix build failure
eddy-aws Oct 24, 2022
6bebd63
Fix test failure
eddy-aws Oct 24, 2022
039e58b
Fix query header population in tests
eddy-aws Oct 24, 2022
fa12a7d
Add AWSQueryCompatible trait support
eddy-aws Oct 24, 2022
a0910dc
Fix import
eddy-aws Oct 25, 2022
0622cb0
Review comments
eddy-aws Nov 19, 2022
1740546
Rename type error variable
eddy-aws Nov 19, 2022
87493d8
Preserve error type and response metadata
eddy-aws Dec 13, 2022
85ca501
Rename code variable and type
eddy-aws Dec 14, 2022
ef33e60
simplify generic errors
eddy-aws Dec 14, 2022
9adcdc0
Review comments
eddy-aws Dec 16, 2022
3f9c4f2
add changelog file
isaiahvita Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix query header population in tests
  • Loading branch information
@eddy-aws
eddy-aws committed Oct 24, 2022
commit 039e58b0f3ac2f973484fc99ff1e3d76218e7e11
20 changes: 14 additions & 6 deletions private/model/api/codegentest/service/awsquerycompatible/awsquerycompatible_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,26 @@ func TestAWSQuery(t *testing.T) {
io.Reader
Len() int
}
headers http.Header
headers map[string]string
expectErrorCode string
}{
"when header is present": {
statusCode: 500,
responseBody: strings.NewReader(`{"__type":"com.amazonaws.awsquerycompatible#QueueDeletedRecently", "message":"Some user-visible message"}`),
expectErrorCode: "AWS.SimpleQueueService.QueueDeletedRecently",
headers: http.Header{"x-amzn-query-error": []string{"AWS.SimpleQueueService.QueueDeletedRecently;Sender"}},
headers: map[string]string{"x-amzn-query-error": "AWS.SimpleQueueService.QueueDeletedRecently;Sender"},
},
"for unmodlled error code": {
eddy-aws marked this conversation as resolved.
Show resolved Hide resolved
statusCode: 400,
responseBody: strings.NewReader(`{"__type":"com.amazonaws.awsquerycompatible#AccessDeniedException", "message":"Some user-visible message"}`),
expectErrorCode: "AccessDenied",
headers: http.Header{"x-amzn-query-error": []string{"AccessDenied;Sender"}},
headers: map[string]string{"x-amzn-query-error": "AccessDenied;Sender"},
},
"when header is not present": {
statusCode: 400,
responseBody: strings.NewReader(`{"__type":"com.amazonaws.awsquerycompatible#AccessDeniedException", "message":"Some user-visible message"}`),
expectErrorCode: "AccessDeniedException",
headers: http.Header{},
headers: map[string]string{},
},
"when header is nil": {
statusCode: 400,
Expand All @@ -56,7 +56,7 @@ func TestAWSQuery(t *testing.T) {
statusCode: 500,
responseBody: strings.NewReader(`{"__type":"com.amazonaws.awsquerycompatible#QueueDeletedRecently", "message":"Some user-visible message"}`),
expectErrorCode: "QueueDeletedRecently",
eddy-aws marked this conversation as resolved.
Show resolved Hide resolved
headers: http.Header{"x-amzn-query-error": []string{"AWS.SimpleQueueService.QueueDeletedRecently-Sender"}},
headers: map[string]string{"x-amzn-query-error": "AWS.SimpleQueueService.QueueDeletedRecently-Sender"},
},
}

Expand All @@ -77,7 +77,15 @@ func TestAWSQuery(t *testing.T) {
}
return int64(c.responseBody.Len())
}(),
Header: c.headers,
Header: func() http.Header {
h := http.Header{}
if c.headers != nil {
for key, value := range c.headers {
h.Set(key, value)
}
}
return h
}(),
Body: ioutil.NopCloser(c.responseBody),
}
},
Expand Down
22 changes: 10 additions & 12 deletions private/protocol/jsonrpc/unmarshal_error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,16 @@ func (u *UnmarshalTypedError) UnmarshalError(
code := codeParts[len(codeParts)-1]
eddy-aws marked this conversation as resolved.
Show resolved Hide resolved
msg := jsonErr.Message

if (resp.Header != nil) {
queryCodeHeader := resp.Header[awsQueryError]
if len(queryCodeHeader) > 0 {
queryCodeParts := strings.Split(queryCodeHeader[0], ";")
if queryCodeParts != nil && len(queryCodeParts) == 2 {
return awserr.NewRequestFailure(
awserr.New(queryCodeParts[0], msg, nil),
respMeta.StatusCode,
respMeta.RequestID,
), nil
}
}
queryCodeHeader := resp.Header.Get(awsQueryError)
if queryCodeHeader != "" {
queryCodeParts := strings.Split(queryCodeHeader, ";")
if queryCodeParts != nil && len(queryCodeParts) == 2 {
return awserr.NewRequestFailure(
awserr.New(queryCodeParts[0], msg, nil),
respMeta.StatusCode,
respMeta.RequestID,
), nil
}
}

if fn, ok := u.exceptions[code]; ok {
Expand Down