Merge pull request #21 from ncerny/nc/fix-lints

Fix lint failures.
chef-cookbooks · Apr 14, 2017 · f547529 · f547529
2 parents 76e690f + 626d03a
commit f547529
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 14 deletions.
diff --git a/Berksfile b/Berksfile
@@ -5,6 +5,5 @@ metadata
 group :test do
   cookbook 'chef-services',
            '>= 4.0.0',
-           git: 'https://github.com/stephenlauck/chef-services.git',
-           branch: 'ad/simplify_pkgs'
+           git: 'https://github.com/stephenlauck/chef-services.git'
 end
diff --git a/metadata.rb b/metadata.rb
@@ -1,4 +1,3 @@
-# rubocop:disable LineLength
 name 'chef_stack'
 maintainer 'Chef Software Inc'
 maintainer_email '[email protected]'

diff --git a/resources/automate.rb b/resources/automate.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_automate'
 default_action :create
@@ -72,7 +71,7 @@
     '/var/opt/delivery/license/delivery.license' => new_resource.license,
     "/etc/delivery/#{new_resource.chef_user}.pem" => new_resource.chef_user_pem,
     '/etc/chef/validation.pem' => new_resource.validation_pem,
-    '/etc/delivery/builder_key' => new_resource.builder_pem
+    '/etc/delivery/builder_key' => new_resource.builder_pem,
   }.each do |file, src|
     chef_file file do
       source src

diff --git a/resources/backend.rb b/resources/backend.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_backend'
 default_action :create

diff --git a/resources/chef_org.rb b/resources/chef_org.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_org'
 default_action :create

diff --git a/resources/chef_user.rb b/resources/chef_user.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_user'
 default_action :create

diff --git a/resources/client.rb b/resources/client.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 # rubocop:disable ParenthesesAsGroupedExpression
 
 resource_name 'chef_client'

diff --git a/resources/server.rb b/resources/server.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_server'
 default_action :create

diff --git a/resources/supermarket.rb b/resources/supermarket.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'chef_supermarket'
 default_action :create

diff --git a/resources/wf_builder.rb b/resources/wf_builder.rb
@@ -15,7 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# rubocop:disable LineLength
 
 resource_name 'workflow_builder'
 default_action :create
@@ -62,7 +61,7 @@
   [
     new_resource.chef_fqdn,
     new_resource.automate_fqdn,
-    new_resource.supermarket_fqdn
+    new_resource.supermarket_fqdn,
   ].each do |server|
     execute "fetch ssl cert for #{server}" do
       command "knife ssl fetch -s https://#{server} -c #{Chef::Config['config_file']}"
@@ -243,7 +242,7 @@
           os: node['os'],
           platform_family: node['platform_family'],
           platform: node['platform'],
-          platform_version: node['platform_version']
+          platform_version: node['platform_version'],
         }
 
         runner = Mixlib::ShellOut.new("delivery api post runners \