Support query compatible trait only for json protocol #3204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -602,12 +602,16 @@ namespace Aws | |||
| SSOCredentialsClient::SSOCredentialsClient(const Aws::Client::ClientConfiguration& clientConfiguration, Aws::Http::Scheme scheme, const Aws::String& region) | |||
| : AWSHttpResourceClient(clientConfiguration, SSO_RESOURCE_CLIENT_LOG_TAG) | |||
| { | |||
| SetErrorMarshaller(Aws::MakeUnique<Aws::Client::JsonErrorMarshaller>(SSO_RESOURCE_CLIENT_LOG_TAG)); | |||
| (Aws::MakeUnique<Aws::Client::JsonErrorMarshaller>( | |||
There was a problem hiding this comment.
???
why this file is even changed?
There was a problem hiding this comment.
I am not sure. I will revert this
| @@ -356,6 +358,7 @@ namespace Aws | |||
| Aws::String m_serviceName = "AWSBaseClient"; | |||
| Aws::Client::RequestCompressionConfig m_requestCompressionConfig; | |||
| Aws::Vector<std::shared_ptr<smithy::interceptor::Interceptor>> m_interceptors; | |||
| Aws::Http::HeaderValueCollection m_featureHeaders; | |||
There was a problem hiding this comment.
I guess smithy client needs to be updated as well.
There was a problem hiding this comment.
Ok, I will extend this to smithy client
sbera87
commented
Nov 22, 2024
| @@ -56,7 +56,7 @@ jobs: | |||
| run: | | |||
| clang-format --version | |||
| if [ -s diff_output.patch ]; then | |||
| python3 clang-format-diff.py -p1 -style=file:.clang-format < diff_output.patch > formatted_differences.patch 2> error.log || true | |||
| python3 clang-format-diff.py -iregex '.*\.(cpp|cc|c\+\+|cxx|c|h|hh|hpp)' -p1 -style=file:.clang-format < diff_output.patch > formatted_differences.patch 2> error.log || true | |||
There was a problem hiding this comment.
without this just the java file fails clang format in the pipeline, locally , no matter which version
src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h
Outdated
Show resolved
Hide resolved
sbera87
commented
Nov 22, 2024
src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h
Outdated
Show resolved
Hide resolved
sbera87
commented
Nov 22, 2024
| @@ -39,6 +39,9 @@ namespace ${serviceNamespace} | |||
| headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::CONTENT_TYPE_HEADER, ${CppViewHelper.computeRequestContentType($metadata)} )); | |||
| #if($metadata.acceptHeader) | |||
| headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::ACCEPT_HEADER, "${metadata.acceptHeader}")); | |||
| #end | |||
| #if ($metadata.awsQueryCompatible) | |||
| headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::X_AMZN_QUERY_MODE,"True")); | |||
There was a problem hiding this comment.
the specification uses lowercase "true" here.
while http headers must be case-insensitive, I'd prefer to be consistent "just in case".
SergeyRyabinin
approved these changes
Nov 25, 2024
sbiscigl
reviewed
Nov 25, 2024
| @@ -21,6 +21,9 @@ namespace ${serviceNamespace} | |||
| class ${CppViewHelper.computeExportValue($metadata.classNamePrefix)} $className : public Aws::Client::JsonErrorMarshaller | |||
| { | |||
| public: | |||
| #if ($metadata.awsQueryCompatible) | |||
| explicit $className(bool queryCompatibilityMode) : Aws::Client::JsonErrorMarshaller(queryCompatibilityMode){} | |||
There was a problem hiding this comment.
I think that we can make this code a little bit more maintainable using a decorator instead of a boolean. This also forces the query compatible decision to compile time and not runtime. i.e. we could do
class JsonErrorMarshallerQueryCompatible: public JsonErrorMarshaller {
public:
AWSError<CoreErrors> Marshall(const Aws::Http::HttpResponse& response) const override {
//do special query compatible stuff
}
AWSError<CoreErrors> BuildAWSError(const std::shared_ptr<Http::HttpResponse>& httpResponse) const override {
//do special query compatible stuff
}
};then at code generation time we could do
explicit $className : public Aws::Client::JsonErrorMarshallerQueryCompatible
and avoid passing around true and falses
sbiscigl
approved these changes
Nov 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
Check all that applies:
Check which platforms you have built SDK on to verify the correctness of this PR.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.