[stack-deploy] Add propagate at launch tag handling

* It'll add `PropagateAtLaunch=True` for all instances of ASG tags we are adding. * I do at this point not think we need to make this configurable.
mbj · Nov 20, 2023 · 93f7b59 · 93f7b59
1 parent 2d16113
commit 93f7b59
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/aws-secrets/test/stack-9.4-dependencies.txt b/aws-secrets/test/stack-9.4-dependencies.txt
@@ -163,7 +163,7 @@ socks 0.6.1
 source-constraints 0.0.5
 split 0.2.3.5
 splitmix 0.1.0.5
-stack-deploy 0.0.8
+stack-deploy 0.0.9
 stm 2.5.1.0
 stratosphere 1.0.0
 stratosphere-ecs 1.0.0

diff --git a/aws-secrets/test/stack-9.6-dependencies.txt b/aws-secrets/test/stack-9.6-dependencies.txt
@@ -168,7 +168,7 @@ socks 0.6.1
 source-constraints 0.0.5
 split 0.2.4
 splitmix 0.1.0.5
-stack-deploy 0.0.8
+stack-deploy 0.0.9
 stm 2.5.1.0
 stratosphere 1.0.0
 stratosphere-ecs 1.0.0

diff --git a/aws-temporary-ingress-rule/test/stack-9.4-dependencies.txt b/aws-temporary-ingress-rule/test/stack-9.4-dependencies.txt
@@ -178,7 +178,7 @@ socks 0.6.1
 source-constraints 0.0.5
 split 0.2.3.5
 splitmix 0.1.0.5
-stack-deploy 0.0.8
+stack-deploy 0.0.9
 stm 2.5.1.0
 stratosphere 1.0.0
 stratosphere-ecs 1.0.0

diff --git a/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt b/aws-temporary-ingress-rule/test/stack-9.6-dependencies.txt
@@ -183,7 +183,7 @@ socks 0.6.1
 source-constraints 0.0.5
 split 0.2.4
 splitmix 0.1.0.5
-stack-deploy 0.0.8
+stack-deploy 0.0.9
 stm 2.5.1.0
 stratosphere 1.0.0
 stratosphere-ecs 1.0.0

diff --git a/stack-deploy/package.yaml b/stack-deploy/package.yaml
@@ -1,7 +1,7 @@
 _common/package: !include "../common/package.yaml"
 
 name:        stack-deploy
-version:     0.0.8
+version:     0.0.9
 synopsis:    Utilities around cloudformation templates
 license:     BSD3
 

diff --git a/stack-deploy/src/StackDeploy/InstanceSpec.hs b/stack-deploy/src/StackDeploy/InstanceSpec.hs
@@ -127,11 +127,24 @@ addResourcePropertiesTags tags Stratosphere.ResourceProperties{..}
   , ..
   }
   where
+    addPropagateAtLaunch value =
+      if awsType == "AWS::AutoScaling::AutoScalingGroup"
+        then mergeArrayObject value (JSON.Object [("PropagateAtLaunch", JSON.toJSON True)])
+        else value
+
     newProperties =
       if supportsTags
-        then KeyMap.unionWith merge [("Tags", JSON.toJSON tags)] properties
+        then KeyMap.unionWith mergeArray [("Tags", addPropagateAtLaunch $ JSON.toJSON tags)] properties
         else properties
 
-    merge leftValue rightValue = case (leftValue, rightValue) of
+    mergeArrayObject leftValue rightValue = case leftValue of
+      JSON.Array leftItems -> JSON.Array $ mergeObject rightValue <$> leftItems
+      other                -> error $ "invalid array merge:" <> show (other, rightValue)
+
+    mergeObject leftValue rightValue = case (leftValue, rightValue) of
+      (JSON.Object leftMap, JSON.Object rightMap) -> JSON.Object $ leftMap <> rightMap
+      other                                       -> error $ "invalid object merge:" <> show other
+
+    mergeArray leftValue rightValue = case (leftValue, rightValue) of
       (JSON.Array leftItems, JSON.Array rightItems) -> JSON.Array $ leftItems <> rightItems
-      other                                         -> error $ "non tag array merge:" <> show other
+      other                                         -> error $ "invalid array merge:" <> show other
diff --git a/stack-deploy/stack-deploy.cabal b/stack-deploy/stack-deploy.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           stack-deploy
-version:        0.0.8
+version:        0.0.9
 synopsis:       Utilities around cloudformation templates
 homepage:       https://github.com/mbj/mhs#readme
 bug-reports:    https://github.com/mbj/mhs/issues

diff --git a/stack-deploy/test/stack-9.6-dependencies.txt b/stack-deploy/test/stack-9.6-dependencies.txt
@@ -165,7 +165,7 @@ socks 0.6.1
 source-constraints 0.0.5
 split 0.2.4
 splitmix 0.1.0.5
-stack-deploy 0.0.8
+stack-deploy 0.0.9
 stm 2.5.1.0
 stratosphere 1.0.0
 stratosphere-ecs 1.0.0