From 9d862b51dda9e8892d2772929c9fff98b4d027a7 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 22 Jun 2020 16:16:38 +0100
Subject: [PATCH] Add parameters to stack documentation generator

---
 cloudbender/stack.py               | 12 ++++++++----
 cloudbender/templates/stack-doc.md | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cloudbender/stack.py b/cloudbender/stack.py
index 0889307..15e3de6 100644
--- a/cloudbender/stack.py
+++ b/cloudbender/stack.py
@@ -357,7 +357,7 @@ class Stack(object):
         my_template = pkg_resources.read_text(templates, template)
         jenv = JinjaEnv()
         template = jenv.from_string(my_template)
-        data = {'stackname': "/".join([self.rel_path, self.stackname]), 'timestamp': datetime.now(tzutc()), 'outputs': self.outputs, 'parameters': self.parameters}
+        data = {'stackname': "/".join([self.rel_path, self.stackname]), 'timestamp': datetime.strftime(datetime.now(tzutc()), "%d/%m/%y %H:%M"), 'outputs': self.outputs, 'parameters': self.parameters}
 
         with open(output_file, 'w') as output_contents:
             output_contents.write(template.render(**data))
@@ -388,6 +388,9 @@ class Stack(object):
 
         if 'Parameters' in self.cfn_data:
             data['parameters'] = self.cfn_data['Parameters']
+            set_parameters = self.resolve_parameters()
+            for p in set_parameters:
+                data['parameters'][p]['value'] = set_parameters[p]
 
         if 'Outputs' in self.cfn_data:
             data['outputs'] = self.cfn_data['Outputs']
@@ -459,7 +462,10 @@ class Stack(object):
             if _errors:
                 raise ParameterNotFound('Cannot find value for parameters: {0}'.format(_errors))
 
-            logger.info('{} {} Parameters:\n{}'.format(self.region, self.stackname, pprint.pformat(_found, indent=2)))
+            logger.info('{} {} set parameters:\n{}'.format(self.region, self.stackname, pprint.pformat(_found, indent=2)))
+
+        # Return dict of explicitly set parameters
+        return _found
 
     @exec_hooks
     def create(self):
@@ -467,7 +473,6 @@ class Stack(object):
 
         # Prepare parameters
         self.resolve_parameters()
-        self.read_template_file()
 
         logger.info('Creating {0} {1}'.format(self.region, self.stackname))
         self.aws_stackid = self.connection_manager.call(
@@ -492,7 +497,6 @@ class Stack(object):
 
         # Prepare parameters
         self.resolve_parameters()
-        self.read_template_file()
 
         logger.info('Updating {0} {1}'.format(self.region, self.stackname))
         try:
diff --git a/cloudbender/templates/stack-doc.md b/cloudbender/templates/stack-doc.md
index cf52823..b7d5d0c 100644
--- a/cloudbender/templates/stack-doc.md
+++ b/cloudbender/templates/stack-doc.md
@@ -11,8 +11,8 @@
 
 {% if parameters %}
 ## Parameters
-| Parameter | Type | Default | Format | Description |
-|-----------|------|---------|--------|-------------|
+| Parameter | Type | Default | Format | Description | set value @ {{ timestamp }} |
+|-----------|------|---------|--------|-------------|-------------------------|
 {% for p in parameters.keys() %}
 {% if parameters[p]['AllowedValues'] or parameters[p]['AllowedPattern'] %}
 {% set format = '`%s%s`' % (parameters[p]['AllowedValues'], parameters[p]['AllowedPattern']) %}
@@ -22,14 +22,14 @@
 {% else %}
 {% set def = parameters[p]['Default'] %}
 {% endif %}
-| {{ p }} | {{ parameters[p]['Type'] | lower }} | {{ def }} | {{ format }} | {{ parameters[p]['Description'] }} |
+| {{ p }} | {{ parameters[p]['Type'] | lower }} | {{ def }} | {{ format }} | {{ parameters[p]['Description'] }} | {{ parameters[p]['value'] }} |
 {% endfor %}
 {% endif %}
 
 {% if outputs %}
 ## Outputs
-| Output | Description | Value as of {{ timestamp }} |
-|--------|-------------|-----------------------------|
+| Output | Description | Value @ {{ timestamp }} |
+|--------|-------------|-------------------------|
 {% for p in outputs.keys() | sort%}
 | {{ p }} | {{ outputs[p]['Description'] }} | {{ outputs[p]['last_value'] }} |
 {% endfor %}