@@ -366,8 +366,26 @@ def _add_imagebuilder_distribution_configuration(self, ami_tags, build_tags, lam
366
366
367
367
return distribution_configuration_resource
368
368
369
+ def _add_imagebuilder_user_data_override (self ):
370
+ disable_user_data = (
371
+ self .config .dev_settings .disable_user_data
372
+ if self .config .dev_settings and self .config .dev_settings .disable_user_data
373
+ else False
374
+ )
375
+ additional_instance_configuration_property = None
376
+ if not disable_user_data :
377
+ imagebuilder_user_data = os .path .join (imagebuilder_utils .get_resources_directory (), "imagebuilder" , "user_data.sh" )
378
+ with open (imagebuilder_user_data , "r" , encoding = "utf-8" ) as user_data_file :
379
+ user_data_content = user_data_file .read ()
380
+
381
+ additional_instance_configuration_property = imagebuilder .CfnImageRecipe .AdditionalInstanceConfigurationProperty (
382
+ user_data_override = Fn .base64 (user_data_content )
383
+ )
384
+ return additional_instance_configuration_property
385
+
369
386
def _add_imagebuilder_image_recipe (self , build_tags , components , lambda_cleanup_policy_statements ):
370
387
# ImageBuilderImageRecipe
388
+
371
389
image_recipe_resource = imagebuilder .CfnImageRecipe (
372
390
self ,
373
391
"ImageRecipe" ,
@@ -376,9 +394,7 @@ def _add_imagebuilder_image_recipe(self, build_tags, components, lambda_cleanup_
376
394
tags = build_tags ,
377
395
parent_image = self .config .build .parent_image ,
378
396
components = components ,
379
- additional_instance_configuration = imagebuilder .CfnImageRecipe .AdditionalInstanceConfigurationProperty (
380
- user_data_override = self ._add_imgaebuilder_user_data_override ()
381
- ),
397
+ additional_instance_configuration = self ._add_imagebuilder_user_data_override (),
382
398
block_device_mappings = [
383
399
imagebuilder .CfnImageRecipe .InstanceBlockDeviceMappingProperty (
384
400
device_name = self ._get_root_device_name (),
@@ -401,12 +417,6 @@ def _add_imagebuilder_image_recipe(self, build_tags, components, lambda_cleanup_
401
417
402
418
return image_recipe_resource
403
419
404
- def _add_imgaebuilder_user_data_override (self ):
405
- imagebuilder_user_data = os .path .join (imagebuilder_utils .get_resources_directory (), "imagebuilder" , "user_data.sh" )
406
- with open (imagebuilder_user_data , "r" , encoding = "utf-8" ) as user_data_file :
407
- user_data_content = user_data_file .read ()
408
-
409
- return Fn .base64 (Fn .sub (user_data_content ))
410
420
411
421
def _add_imagebuilder_components (self , build_tags , lambda_cleanup_policy_statements ):
412
422
imagebuilder_resources_dir = os .path .join (imagebuilder_utils .get_resources_directory (), "imagebuilder" )
0 commit comments