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

…mpile error in ManagedDeliveryScmController
spinnaker · Sep 15, 2023 · e0e6249 · e0e6249
1 parent bfc5010
commit e0e6249
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 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
@@ -58,6 +58,7 @@ class CommitController extends AbstractCommitController {
           } 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/java/com/netflix/spinnaker/igor/scm/ManagedDeliveryScmController.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/scm/ManagedDeliveryScmController.java
@@ -89,8 +89,8 @@ public ResponseEntity<Map<String, Object>> getDeliveryConfigManifest(
       } else if (e instanceof SpinnakerServerException) {
         if (e instanceof SpinnakerHttpException) {
           SpinnakerHttpException spinnakerHttpException = (SpinnakerHttpException) e;
-          status = HttpStatus.valueOf(re.getResponseCode());
-          errorDetails = re.getResponseBody();
+          status = HttpStatus.valueOf(spinnakerHttpException.getResponseCode());
+          errorDetails = spinnakerHttpException.getResponseBody();
         } else {
           errorDetails = "Error calling downstream system: " + e.getMessage();
         }