Skip to content

Commit 8d06f5e

Browse files
committed
Cookstyle fixes
Signed-off-by: Tim Smith <[email protected]>
1 parent e9f0fc0 commit 8d06f5e

File tree

10 files changed

+14
-15
lines changed

10 files changed

+14
-15
lines changed

libraries/default_handler.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def configure_from_source_package(action_name, local_path = nil)
5959
source local_path || new_resource.package_source
6060
timeout new_resource.timeout if new_resource.timeout
6161
provider value_for_platform_family(
62-
'debian' => Chef::Provider::Package::Dpkg,
63-
'rhel' => node['platform_version'].to_i == 5 ? Chef::Provider::Package::Rpm : Chef::Provider::Package::Yum,
64-
'suse' => Chef::Provider::Package::Rpm,
65-
'amazon' => Chef::Provider::Package::Rpm,
62+
'debian' => Chef::Provider::Package::Dpkg,
63+
'rhel' => node['platform_version'].to_i == 5 ? Chef::Provider::Package::Rpm : Chef::Provider::Package::Yum,
64+
'suse' => Chef::Provider::Package::Rpm,
65+
'amazon' => Chef::Provider::Package::Rpm,
6666
'windows' => Chef::Provider::Package::Windows
6767
)
6868
if new_resource.product_name == 'chef'

resources/automate.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
location /installer {
118118
alias /opt/delivery/embedded/service/omnibus-ctl/installer;
119119
}
120-
EOF
120+
EOF
121121
end
122122

123123
ingredient_config 'automate' do

resources/wf_builder.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
#{build_user} ALL=(root) NOPASSWD:/usr/local/bin/delivery-cmd, /bin/ls
288288
Defaults:#{build_user} !requiretty
289289
Defaults:#{build_user} secure_path = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
290-
EOF
290+
EOF
291291
mode '0440'
292292
end
293293

spec/unit/chef_automate_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
location /installer {
138138
alias /opt/delivery/embedded/service/omnibus-ctl/installer;
139139
}
140-
EOF
140+
EOF
141141
)
142142
end
143143

spec/unit/recipes/test_config_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
ip_version "ipv6"
3333
notification_email "[email protected]"
3434
nginx["ssl_protocols"] = "TLSv1 TLSv1.1 TLSv1.2"
35-
EOS
35+
EOS
3636
end
3737

3838
it 'reconfigure chef_ingredient[manage]' do

spec/unit/recipes/test_repo_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
ip_version "ipv6"
3131
notification_email "[email protected]"
3232
nginx["ssl_protocols"] = "TLSv1 TLSv1.1 TLSv1.2"
33-
EOS
33+
EOS
3434
end
3535

3636
it 'uses ingredient_config to notify a reconfigure for chef-server' do
@@ -54,7 +54,7 @@
5454
expect(chef_run).to create_file('/etc/chef-manage/manage.rb').with sensitive: true, content: <<-EOS
5555
disable_sign_up true
5656
support_email_address "[email protected]"
57-
EOS
57+
EOS
5858
end
5959

6060
it 'uses ingredient_config to notify a reconfigure for manage' do

test/fixtures/cookbooks/test/recipes/automatev2.rb

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
chef_automatev2 'automatev2.chefstack.local' do
32
config <<~EOS
43
[global.v1]

test/fixtures/cookbooks/test/recipes/chef_server.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
oc_id['applications'] = {
88
"supermarket"=>{"redirect_uri"=>"https://supermarket.services.com/auth/chef_oauth2/callback"}
99
}
10-
EOS
10+
EOS
1111
addons manage: { config: '' },
1212
"push-jobs-server": { config: '' }
1313
accept_license true

test/fixtures/cookbooks/test/recipes/config.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ip_version "ipv6"
66
notification_email "#{node['chef_admin']}"
77
nginx["ssl_protocols"] = "TLSv1 TLSv1.1 TLSv1.2"
8-
EOS
8+
EOS
99
action :reconfigure
1010
end
1111

test/fixtures/cookbooks/test/recipes/repo.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ip_version "ipv6"
66
notification_email "#{node['chef_admin']}"
77
nginx["ssl_protocols"] = "TLSv1 TLSv1.1 TLSv1.2"
8-
EOS
8+
EOS
99
action :install
1010
end
1111

@@ -22,7 +22,7 @@
2222
config <<-EOS
2323
disable_sign_up true
2424
support_email_address "#{node['chef_admin']}"
25-
EOS
25+
EOS
2626
action :install
2727
accept_license true
2828
end

0 commit comments

Comments
 (0)