fix(scm): restore original behavior in GitHubCommitController, fix co…

…mpile error in ManagedDeliveryScmController
spinnaker · Sep 15, 2023 · 289916b · 289916b
1 parent a0f473f
commit 289916b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/CommitController.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/CommitController.groovy
@@ -53,11 +53,12 @@ class CommitController extends AbstractCommitController {
         try {
             commitsResponse = master.gitHubClient.getCompareCommits(projectKey, repositorySlug, requestParams.to, requestParams.from)
         } catch (SpinnakerServerException e) {
-          if(e instanceof  SpinnakerNetworkException) {
+          if (e instanceof SpinnakerNetworkException) {
             throw new NotFoundException("Could not find the server ${master.baseUrl}")
-          } else if(e instanceof SpinnakerHttpException && ((SpinnakerHttpException)e).getResponseCode() == 404) {
+          } else if (e instanceof SpinnakerHttpException && ((SpinnakerHttpException)e).getResponseCode() == 404) {
             return getNotFoundCommitsResponse(projectKey, repositorySlug, requestParams.to, requestParams.from, master.baseUrl)
           }
+          log.error("Unhandled error response, acting like commit response was not found", e)
         }
 
         commitsResponse.commits.each {

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/client/GitHubMaster.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/client/GitHubMaster.groovy
@@ -46,7 +46,7 @@ class GitHubMaster extends AbstractScmMaster {
         .map({ r -> r.path })
         .collect(Collectors.toList())
     }  catch (SpinnakerServerException e) {
-      if (e instanceof  SpinnakerNetworkException) {
+      if (e instanceof SpinnakerNetworkException) {
         throw new NotFoundException("Could not find the server ${baseUrl}")
       }
       log.error(

diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/scm/ManagedDeliveryScmController.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/scm/ManagedDeliveryScmController.java
@@ -88,9 +88,9 @@ public ResponseEntity<Map<String, Object>> getDeliveryConfigManifest(
         status = HttpStatus.BAD_REQUEST;
       } else if (e instanceof SpinnakerServerException) {
         if (e instanceof SpinnakerHttpException) {
-          SpinnakerHttpException re = (SpinnakerHttpException) e;
-          status = HttpStatus.valueOf(re.getResponseCode());
-          errorDetails = re.getResponseBody();
+          SpinnakerHttpException spinnakerHttpException = (SpinnakerHttpException) e;
+          status = HttpStatus.valueOf(spinnakerHttpException.getResponseCode());
+          errorDetails = spinnakerHttpException.getResponseBody();
         } else {
           errorDetails = "Error calling downstream system: " + e.getMessage();
         }