Saikred/feature/happy path #3276
Merged
Conversation
This file contains hidden or 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
millems
reviewed
Jul 5, 2022
|
|
||
| private final SdkHttpClient httpClient; | ||
|
|
||
| private final Logger log = LoggerFactory.getLogger(DefaultEc2Metadata.class); |
|
|
||
| private final Logger log = LoggerFactory.getLogger(DefaultEc2Metadata.class); | ||
|
|
||
| private RequestMarshaller requestMarshaller = new RequestMarshaller(); |
core/imds/src/main/java/software/amazon/awssdk/imds/internal/DefaultEc2Metadata.java
Show resolved
Hide resolved
| try { | ||
| String token = getToken(); | ||
| URI uri = URI.create(endpoint + path); | ||
| HttpExecuteRequest httpExecuteRequest = requestMarshaller.createDataRequest(uri , SdkHttpMethod.GET, token, |
Contributor
There was a problem hiding this comment.
nit: extra space before comma
Contributor
Author
There was a problem hiding this comment.
Good catch . Surprising that when I ran checkstyle during local build , it did not show up as warning/error.
| URI uri = URI.create(endpoint + path); | ||
| HttpExecuteRequest httpExecuteRequest = requestMarshaller.createDataRequest(uri , SdkHttpMethod.GET, token, | ||
| tokenTtl); | ||
| HttpExecuteResponse response = httpClient.prepareRequest(httpExecuteRequest).call(); |
core/imds/src/main/java/software/amazon/awssdk/imds/internal/DefaultEc2Metadata.java
Outdated
Show resolved
Hide resolved
Comment on lines
195
to
196
| } else if (statusCode == HttpURLConnection.HTTP_FORBIDDEN || statusCode == HttpURLConnection.HTTP_BAD_REQUEST) { | ||
| throw SdkServiceException.builder().message("Could not retrieve token").build(); |
Contributor
There was a problem hiding this comment.
Should we log the status code? Any reason to have this be a different case than just the else clause below?
Contributor
Author
There was a problem hiding this comment.
The status codes mentioned , should not have retries enabled on them. But for the below else case , retries can happen.
| throw SdkServiceException.builder().message("Could not retrieve token").build(); | ||
| } else { | ||
| throw SdkClientException.builder() | ||
| .message("Unexpected Exception during token retrieval with Status Code " + statusCode) |
core/imds/src/main/java/software/amazon/awssdk/imds/internal/RequestMarshaller.java
Outdated
Show resolved
Hide resolved
core/imds/src/main/java/software/amazon/awssdk/imds/internal/RequestMarshaller.java
Outdated
Show resolved
Hide resolved
millems
reviewed
Jul 6, 2022
| } else { | ||
| throw SdkClientException.builder() | ||
| .message("Unexpected Exception during token retrieval with Status Code " + statusCode) | ||
| .message("Instance metadata service returned unexpected status code " + statusCode) |
Contributor
There was a problem hiding this comment.
If the response body isn't present then we'd get unexpected status code 200. Should we special-case the response body not being present with a better error message?
srsaikumarreddy
force-pushed
the
saikred/feature/happy_path
branch
from
bd36583 to
cb67094
Compare
|
SonarCloud Quality Gate failed. |
millems
approved these changes
Jul 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Implemented Happy Path client functionality along with Request Marshaller Class
Motivation and Context
Implemented Happy Path client functionality along with Request Marshaller Class
Modifications
Implemented Happy Path client functionality along with Request Marshaller Class. Wrote test cases to check exception handling behavior
Testing
Ran test cases locally in development environment.
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License