refactor(clouddriver) : InstanceService - Eliminated the usages of RetrofitError exception handling and replaced it with SpinnakerRetrofitErrorHandler #4580
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
Pranav-b-7
force-pushed
the
instance-service-eliminate-RetrofitError
branch
3 times, most recently
from
6da5ea7 to
e1be772
Compare
Pranav-b-7
changed the title
dbyron-sf
force-pushed
the
instance-service-eliminate-RetrofitError
branch
from
d69e28b to
662abe2
Compare
dbyron-sf
reviewed
Nov 2, 2023
| @@ -121,6 +122,7 @@ class JarDiffsTask implements DiffTask { | |||
| RestAdapter restAdapter = new RestAdapter.Builder() | |||
| .setEndpoint(address) | |||
| .setClient(new OkClient(okHttpClient)) | |||
| .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) | |||
There was a problem hiding this comment.
I'm surprised spotless doesn't complain about this.
Suggested change
| .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) | |
| .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) |
There was a problem hiding this comment.
Code formatted as per the suggestion.
dbyron-sf
reviewed
Nov 2, 2023
...ouddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/AbstractQuipTask.groovy
Outdated
Show resolved
Hide resolved
dbyron-sf
reviewed
Nov 2, 2023
| @@ -103,7 +113,7 @@ class JarDiffsTaskSpec extends Specification { | |||
| Response jarsResponse = new Response('http://foo.com', 200, 'OK', [], new TypedString(sourceJarsResponse)) | |||
|
|
|||
| when: | |||
| 1 * instanceService.getJars() >> {throw new RetrofitError(null, null, null, null, null, null, null)} | |||
| 1 * instanceService.getJars() >> {throw new SpinnakerServerException(request)} | |||
There was a problem hiding this comment.
It would be a smaller change to wrap the RetrofitError in a SpinnakerServerException since that's what SpinnakerRetrofitErrorHandler does. The exception handling here is simple enough that it probably doesn't matter.
There was a problem hiding this comment.
Modified the test cases to wrap the Spinnaker*Exception with RetrofitError
Pranav-b-7
force-pushed
the
instance-service-eliminate-RetrofitError
branch
3 times, most recently
from
3cd6705 to
5d2d11e
Compare
dbyron-sf
reviewed
Nov 3, 2023
...driver/src/test/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/TriggerQuipTaskSpec.groovy
Outdated
Show resolved
Hide resolved
…ofitError in the catch blocks and added SpinnakerRetrofitErrorHandler in the retrofit config which handles the RetrofitError and throws a customised Spinnaker*Exception
…with the existing formatting
…r to wrap up the customised Spinnaker*Exception
…itError to more specific Retrofit network error
Pranav-b-7
force-pushed
the
instance-service-eliminate-RetrofitError
branch
from
ad810fa to
104a510
Compare
dbyron-sf
reviewed
Nov 5, 2023
| import java.nio.charset.Charset | ||
| import com.fasterxml.jackson.databind.ObjectMapper | ||
| import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus | ||
| import com.netflix.spinnaker.orca.api.pipeline.TaskResult | ||
| import com.netflix.spinnaker.orca.clouddriver.InstanceService | ||
| import com.netflix.spinnaker.orca.pipeline.model.PipelineExecutionImpl | ||
| import com.netflix.spinnaker.orca.pipeline.model.StageExecutionImpl | ||
| import retrofit.RetrofitError |
There was a problem hiding this comment.
Surprised spotless doesn't re-order the imports. Can you reconfigure intellij to match what was here before and minimize the diffs please?
There was a problem hiding this comment.
Reordered the import statement
There was a problem hiding this comment.
Would have been good to re-order the other two as well.
dbyron-sf
approved these changes
Nov 5, 2023
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.
As part of this PR , the target is to eliminate the usage of RetrofitError in InstanceService retrofit client under module orca-clouddriver.
Replaced the exception handling logic with the handleError method under SpinnakerRetrofitErrorHandler class.