@@ -131,29 +131,19 @@ def test_compute_nodes_dna_json(
131131 # Generated dna.json and extra.json
132132 compute_node_lt_asset = get_asset_content_with_resource_name (cdk_assets , "LaunchTemplateA7211c84b953696f" )
133133 compute_node_lt = compute_node_lt_asset ["Resources" ]["LaunchTemplateA7211c84b953696f" ]
134- compute_node_cfn_init_files = compute_node_lt ["Metadata" ][ "AWS::CloudFormation::Init" ][ "deployConfigFiles" ][ "files" ]
135- compute_node_dna_json = compute_node_cfn_init_files [ "/tmp/dna.json" ]
136- compute_node_extra_json = compute_node_cfn_init_files [ "/tmp/extra.json" ]
134+ compute_node_dna_json = render_join ( compute_node_lt ['Properties' ][ 'LaunchTemplateData' ][ 'UserData' ][ 'Fn::Base64' ][ 'Fn::Sub' ][ 1 ][ 'DnaJson' ][ 'Fn::Join' ])
135+
136+ compute_node_extra_json = compute_node_lt [ 'Properties' ][ 'LaunchTemplateData' ][ 'UserData' ][ 'Fn::Base64' ][ 'Fn::Sub' ][ 1 ][ 'ExtraJson' ]
137137
138138 # Expected dna.json and extra.json
139139 expected_compute_node_dna_json = load_json_dict (test_datadir / expected_compute_node_dna_json_file_name )
140140 expected_compute_node_extra_json = load_json_dict (test_datadir / expected_compute_node_extra_json_file_name )
141- expected_owner = expected_group = "root"
142- expected_mode = "000644"
143141
144142 # Assertions on dna.json
145- rendered_dna_json_content = render_join (compute_node_dna_json ["content" ]["Fn::Join" ])
146- rendered_dna_json_content_as_json = json .loads (rendered_dna_json_content )
147- assert_that (compute_node_dna_json ["owner" ]).is_equal_to (expected_owner )
148- assert_that (compute_node_dna_json ["group" ]).is_equal_to (expected_group )
149- assert_that (compute_node_dna_json ["mode" ]).is_equal_to (expected_mode )
150- assert_that (rendered_dna_json_content_as_json ).is_equal_to (expected_compute_node_dna_json )
143+ assert_that (json .loads (compute_node_dna_json )).is_equal_to (expected_compute_node_dna_json )
151144
152145 # Assertions on extra.json
153- assert_that (compute_node_extra_json ["owner" ]).is_equal_to (expected_owner )
154- assert_that (compute_node_extra_json ["group" ]).is_equal_to (expected_group )
155- assert_that (compute_node_extra_json ["mode" ]).is_equal_to (expected_mode )
156- assert_that (json .loads (compute_node_extra_json ["content" ])).is_equal_to (expected_compute_node_extra_json )
146+ assert_that (json .loads (compute_node_extra_json )).is_equal_to (expected_compute_node_extra_json )
157147
158148
159149def render_join (elem : dict ):
0 commit comments