- Added resource group name to ACM botostack names.

src/paco/stack/botostack.py

@@ -71,7 +71,10 @@ def get_status(self):
 
     def get_name(self):
         "Name of the Stack in AWS"
-        name = '-'.join([ self.grp_ctx.get_aws_name(), self.resource.name ])
+        ref_parts = self.resource.paco_ref_parts.split('.')
+        if ref_parts[-2] == 'resources':
+            group_name = ref_parts[-3]
+        name = '-'.join([ self.grp_ctx.get_aws_name(), group_name, self.resource.name ])
         if self.stack_suffix != None:
             name = name + '-' + self.stack_suffix
         new_name = self.create_stack_name(name)

src/paco/stack/botostacks/acm.py

@@ -46,6 +46,8 @@ def provision(self):
         cert_arn = acm_client.get_certificate_arn()
         if cert_arn == None:
             action = 'Create'
+        elif self.paco_ctx.nocache == True:
+            action = 'Update'
         else:
             action = 'Cache'
         self.paco_ctx.log_action_col(

src/paco/stack/stack.py

@@ -512,8 +512,6 @@ def gen_cache_id(self):
     def is_stack_cached(self):
         "Return True if the stack cache id is the same as a previously applied cache id"
         if self.paco_ctx.nocache or self.do_not_cache:
-            #return False
-            # XXX: Make this work
             if self.dependency_group == True:
                 self.get_status()
                 if self.status == StackStatus.DOES_NOT_EXIST: