Cookstyle corrections

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-environment/spec/unit/recipes/config_spec.rb

@@ -27,7 +27,6 @@
       aws-parallelcluster-environment::raid
       aws-parallelcluster-environment::efs
       aws-parallelcluster-environment::fsx
-      aws-parallelcluster-environment::config_cfn_hup
     )
     @expected_recipes.each do |recipe_name|
       allow_any_instance_of(Chef::Recipe).to receive(:include_recipe).with(recipe_name) do

cookbooks/aws-parallelcluster-environment/spec/unit/resources/cfn_hup_configuration_spec.rb

@@ -18,7 +18,7 @@ def self.configure(chef_run)
 LAUNCH_TEMPLATE_ID = "LAUNCH_TEMPLATE_ID".freeze
 SCRIPT_DIR = "SCRIPT_DIR".freeze
 MONITOR_SHARED_DIR = "MONITOR_SHARED_DIR".freeze
-NODE_BOOTSTRAP_TIMEOUT = "1800"
+NODE_BOOTSTRAP_TIMEOUT = "1800".freeze
 
 describe 'cfn_hup_configuration:configure' do
   for_all_oses do |platform, version|
@@ -29,8 +29,8 @@ def self.configure(chef_run)
             runner = runner(platform: platform, version: version, step_into: ['cfn_hup_configuration']) do |node|
               allow_any_instance_of(Object).to receive(:get_metadata_token).and_return("IMDS_TOKEN")
               allow_any_instance_of(Object).to receive(:get_metadata_with_token)
-                                                 .with("IMDS_TOKEN", URI("http://169.254.169.254/latest/meta-data/iam/security-credentials"))
-                                                 .and_return(INSTANCE_ROLE_NAME)
+                .with("IMDS_TOKEN", URI("http://169.254.169.254/latest/meta-data/iam/security-credentials"))
+                .and_return(INSTANCE_ROLE_NAME)
               node.override["cluster"]["node_type"] = node_type
               node.override["cluster"]["region"] = AWS_REGION
               node.override["cluster"]["aws_domain"] = AWS_DOMAIN
@@ -49,63 +49,63 @@ def self.configure(chef_run)
           %w(/etc/cfn /etc/cfn/hooks.d).each do |dir|
             it "creates the directory #{dir}" do
               is_expected.to create_directory(dir)
-                               .with(owner: 'root')
-                               .with(group: 'root')
-                               .with(mode:  "0700")
-                               .with(recursive: true)
+                .with(owner: 'root')
+                .with(group: 'root')
+                .with(mode:  "0700")
+                .with(recursive: true)
             end
           end
 
           it "creates the file /etc/cfn/cfn-hup.conf" do
             is_expected.to create_template("/etc/cfn/cfn-hup.conf")
-                             .with(source: 'cfn_hup_configuration/cfn-hup.conf.erb')
-                             .with(user: "root")
-                             .with(group: "root")
-                             .with(mode: "0400")
-                             .with(variables: {
-                               stack_id: STACK_ID,
-                               region: AWS_REGION,
-                               cloudformation_url: CLOUDFORMATION_URL,
-                               cfn_init_role: INSTANCE_ROLE_NAME,
-                             })
+              .with(source: 'cfn_hup_configuration/cfn-hup.conf.erb')
+              .with(user: "root")
+              .with(group: "root")
+              .with(mode: "0400")
+              .with(variables: {
+                stack_id: STACK_ID,
+                region: AWS_REGION,
+                cloudformation_url: CLOUDFORMATION_URL,
+                cfn_init_role: INSTANCE_ROLE_NAME,
+             })
           end
 
           it "creates the file /etc/cfn/hooks.d/pcluster-update.conf" do
             is_expected.to create_template("/etc/cfn/hooks.d/pcluster-update.conf")
-                             .with(source: 'cfn_hup_configuration/cfn-hook-update.conf.erb')
-                             .with(user: "root")
-                             .with(group: "root")
-                             .with(mode: "0400")
-                             .with(variables: {
-                               stack_id: STACK_ID,
-                               region: AWS_REGION,
-                               cloudformation_url: CLOUDFORMATION_URL,
-                               cfn_init_role: INSTANCE_ROLE_NAME,
-                               launch_template_resource_id: LAUNCH_TEMPLATE_ID,
-                               update_hook_script_dir: SCRIPT_DIR,
-                               node_bootstrap_timeout: NODE_BOOTSTRAP_TIMEOUT,
-                             })
+              .with(source: 'cfn_hup_configuration/cfn-hook-update.conf.erb')
+              .with(user: "root")
+              .with(group: "root")
+              .with(mode: "0400")
+              .with(variables: {
+                stack_id: STACK_ID,
+                region: AWS_REGION,
+                cloudformation_url: CLOUDFORMATION_URL,
+                cfn_init_role: INSTANCE_ROLE_NAME,
+                launch_template_resource_id: LAUNCH_TEMPLATE_ID,
+                update_hook_script_dir: SCRIPT_DIR,
+                node_bootstrap_timeout: NODE_BOOTSTRAP_TIMEOUT,
+             })
           end
 
           if %(ComputeFleet).include?(node_type)
             it "creates the file #{SCRIPT_DIR}/cfn-hup-update-action.sh" do
               is_expected.to create_template("#{SCRIPT_DIR}/cfn-hup-update-action.sh")
-                               .with(source: "cfn_hup_configuration/#{node_type}/cfn-hup-update-action.sh.erb")
-                               .with(user: "root")
-                               .with(group: "root")
-                               .with(mode: "0700")
-                               .with(variables: {
-                                 monitor_shared_dir: "#{MONITOR_SHARED_DIR}/dna",
-                                 launch_template_resource_id: LAUNCH_TEMPLATE_ID,
+                .with(source: "cfn_hup_configuration/#{node_type}/cfn-hup-update-action.sh.erb")
+                .with(user: "root")
+                .with(group: "root")
+                .with(mode: "0700")
+                .with(variables: {
+                   monitor_shared_dir: "#{MONITOR_SHARED_DIR}/dna",
+                   launch_template_resource_id: LAUNCH_TEMPLATE_ID,
                                })
             end
           elsif node_type == 'HeadNode'
             it "creates #{SCRIPT_DIR}/share_compute_fleet_dna.py" do
               is_expected.to create_if_missing_cookbook_file("#{SCRIPT_DIR}/share_compute_fleet_dna.py")
-                               .with(source: 'cfn_hup_configuration/share_compute_fleet_dna.py')
-                               .with(user: 'root')
-                               .with(group: 'root')
-                               .with(mode: '0700')
+                .with(source: 'cfn_hup_configuration/share_compute_fleet_dna.py')
+                .with(user: 'root')
+                .with(group: 'root')
+                .with(mode: '0700')
             end
 
             it "creates the directory #{MONITOR_SHARED_DIR}/dna" do

cookbooks/aws-parallelcluster-platform/spec/unit/resources/fetch_dna_files_spec.rb

@@ -35,7 +35,7 @@ def self.cleanup(chef_run)
             node.override['cluster']['region'] = region
             node.override['kitchen'] = true
           end
-            ConvergeFetchDnaFiles.share(runner, extra_chef_attribute_location: "#{kitchen_instance_types_data_path}")
+          ConvergeFetchDnaFiles.share(runner, extra_chef_attribute_location: "#{kitchen_instance_types_data_path}")
         end
         cached(:node) { chef_run.node }
 
@@ -46,7 +46,7 @@ def self.cleanup(chef_run)
         # end
 
         it 'runs share_compute_fleet_dna.py to get dna files' do
-          is_expected.to run_execute('Share dna.json with ComputeFleet').with(
+          is_expected.to run_execute('Run share_compute_fleet_dna.py to get user_data.sh and share dna.json with ComputeFleet').with(
             command: "#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/share_compute_fleet_dna.py" \
               " --region #{node['cluster']['region']}"
           )

cookbooks/aws-parallelcluster-slurm/recipes/update/update_head_node.rb

@@ -284,4 +284,4 @@ def update_nodes_in_queue(strategy, queues)
 
 fetch_dna_files 'Cleanup' do
   action :cleanup
-end
+end