Merge pull request #539 from remind101/diff

Diff improvements

Author: ejholmes

stacker/actions/diff.py

@@ -8,7 +8,12 @@
 from . import build
 from .. import exceptions
 from ..util import parse_cloudformation_template
-from ..status import NotSubmittedStatus, NotUpdatedStatus, COMPLETE
+from ..status import (
+    NotSubmittedStatus,
+    NotUpdatedStatus,
+    COMPLETE,
+    INTERRUPTED,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -198,16 +203,21 @@ def _print_new_stack(self, stack, parameters):
 
     def _diff_stack(self, stack, **kwargs):
         """Handles the diffing a stack in CloudFormation vs our config"""
+        if self.cancel.wait(0):
+            return INTERRUPTED
+
         if not build.should_submit(stack):
             return NotSubmittedStatus()
 
         if not build.should_update(stack):
             return NotUpdatedStatus()
 
+        provider_stack = self.provider.get_stack(stack.fqn)
+
         # get the current stack template & params from AWS
         try:
             [old_template, old_params] = self.provider.get_stack_info(
-                stack.fqn)
+                provider_stack)
         except exceptions.StackDoesNotExist:
             old_template = None
             old_params = {}
@@ -241,6 +251,9 @@ def _diff_stack(self, stack, **kwargs):
             )
             print_stack_changes(stack.name, new_stack, old_stack, new_params,
                                 old_params)
+
+        self.provider.set_outputs(stack.fqn, provider_stack)
+
         return COMPLETE
 
     def _generate_plan(self):

stacker/providers/aws/default.py

@@ -900,12 +900,12 @@ def set_outputs(self, stack_name, stack):
         self._outputs[stack_name] = get_output_dict(stack)
         return
 
-    def get_stack_info(self, stack_name):
+    def get_stack_info(self, stack):
         """ Get the template and parameters of the stack currently in AWS
 
         Returns [ template, parameters ]
         """
-        stack = self.get_stack(stack_name)
+        stack_name = stack['StackId']
 
         try:
             template = self.cloudformation.get_template(