refactor(JenkinsClient): make changes to jenkinsclient to use Spinnak… #1130

Luthan95 · 2023-05-22T09:32:08Z

…er custom exception instead of RetrofitError using SpinnakerRetrofitErrorHandler

Make Jekinsclient use of spinnakerCustomexception by setting SpinnakerRetrofitErrorHandler as ErrorHandler, so avoid direct use of RetrofitError

dbyron-sf · 2023-09-14T23:19:00Z

@Mergifyio update

mergify · 2023-09-14T23:19:03Z

update

✅ Branch has been successfully updated

igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.java

igor-web/src/main/groovy/com/netflix/spinnaker/igor/build/BuildController.groovy

igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.java

…er custom exception instead of RetrofitError using SpinnakerRetrofitErrorHandler

…e conditions

…eadable by removing redundant code

… were missed in previous commit

…from ScmDetails.getGitDetails() as no need to catch and rethrow

since it has a retryable property

…OfProject The jenkinsClient inside JenkinsService comes from JenkinsConfig, wihch, as of spinnaker#1130, uses SpinnakerRetrofitErrorHandler. Therefore, the getBuilds calls inside the try/catch block inside processBuildsOfProject throws a SpinnakerServerException. spinnaker#1130 updated the 'should continue processing other builds from a master even if one or more build fetches fail' test to throw a SpinnakerServerException with a RetrofitError as its cause instead of a RuntimeException with a RetrofitError as its cause. With spinnaker/kork#1110, the SpinnakerServerException no longer has a RetrofitError as its cause. It has the "mock root cause" exception as its cause. But, because spinnaker/kork#1110 adds a url attribute to SpinnakerServerException, the cause is no longer necessary for including a url in the "Error communicating with jenkins" log message, and this commit updates the logic accordingly.

* chore(dependencies): Autobump korkVersion * fix(web): fix exception handling in JenkinsBuildMonitor.processBuildsOfProject The jenkinsClient inside JenkinsService comes from JenkinsConfig, wihch, as of #1130, uses SpinnakerRetrofitErrorHandler. Therefore, the getBuilds calls inside the try/catch block inside processBuildsOfProject throws a SpinnakerServerException. #1130 updated the 'should continue processing other builds from a master even if one or more build fetches fail' test to throw a SpinnakerServerException with a RetrofitError as its cause instead of a RuntimeException with a RetrofitError as its cause. With spinnaker/kork#1110, the SpinnakerServerException no longer has a RetrofitError as its cause. It has the "mock root cause" exception as its cause. But, because spinnaker/kork#1110 adds a url attribute to SpinnakerServerException, the cause is no longer necessary for including a url in the "Error communicating with jenkins" log message, and this commit updates the logic accordingly. * refactor(web/test): clean up exception mocking in JenkinsBuildMonitorSpec remove unused runtimeException and rename retrofitEx since it's no longer a retrofitEx --------- Co-authored-by: root <root@2f91e8016c3c> Co-authored-by: David Byron <dbyron@salesforce.com>

SheetalAtre force-pushed the jenkinsclient_replace_with_custom_exceptions branch 3 times, most recently from 20a4d6c to 61f1883 Compare August 30, 2023 08:39

dbyron-sf reviewed Sep 14, 2023

View reviewed changes