fix(6430): Adding missing block device mappings for new launch templa…

…tes (backport #5370) (#5372)

* fix(6430): Adding missing block device mappings for new launch templates (#5370)

spinnaker/spinnaker#6430

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 07186a0)

# Conflicts:
#	clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/services/LaunchTemplateService.java

* chore(ci): fix badly formatted merge

* chore(ci): fix merge fix (#5387)

Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>
Co-authored-by: Cameron Motevasselani <cameron@armory.io>

clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/services/LaunchTemplateService.java

@@ -332,6 +332,11 @@ private RequestLaunchTemplateData buildLaunchTemplateData(
             .withGroups(asgConfig.getSecurityGroups())
             .withDeviceIndex(0));
 
+    // block device mappings
+    if (asgConfig.getBlockDevices() != null && !asgConfig.getBlockDevices().isEmpty()) {
+      request.setBlockDeviceMappings(buildDeviceMapping(asgConfig.getBlockDevices()));
+    }
+
     return request;
   }