Merge pull request #246 from glennsarti/update-puppet-lint

Update puppet lint - 2.3.5

Author: jpogran

server/Rakefile

@@ -41,15 +41,18 @@ task :gem_revendor do
     {
       :directory => 'puppet-lint',
       :github_repo => 'https://github.com/rodjek/puppet-lint.git',
-      :github_ref => '2.3.3',
+      :github_ref => '2.3.5',
     }
   ]
 
   # Clean out the vendor directory first
   puts "Clearing the vendor directory..."
   vendor_dir = File.join(File.dirname(__FILE__),'vendor')
-  FileUtils.rm_rf(vendor_dir) if Dir.exists?(vendor_dir)
-  Dir.mkdir(vendor_dir)
+  gem_list.each do |vendor|
+    gem_dir = File.join(vendor_dir,vendor[:directory])
+    FileUtils.rm_rf(gem_dir) if Dir.exists?(gem_dir)
+  end
+  Dir.mkdir(vendor_dir) unless Dir.exists?(vendor_dir)
 
   gem_list.each do |vendor|
     puts "Vendoring #{vendor[:directory]}..."
@@ -82,7 +85,7 @@ Gem List
 --------
 
 HEREDOC
-  gem_list.each { |vendor| readme += "* #{vendor[:directory]} (#{vendor[:github_repo]} ref #{vendor[:github_ref]})"}
+  gem_list.each { |vendor| readme += "* #{vendor[:directory]} (#{vendor[:github_repo]} ref #{vendor[:github_ref]})\n"}
   File.open(File.join(vendor_dir,'README.md'), 'wb') { |file| file.write(readme + "\n") }
 end
 

server/spec/languageserver/fixtures/manifest_with_lint_errors.pp

@@ -0,0 +1,50 @@
+#
+class example_manifest_with_multiple_lint_errors
+{
+
+  # --------------------------------------------------------------------
+  # Set cipher suites order as secure as possible (Enables Perfect Forward Secrecy)
+  # Remediation list per CIS IIS 8 Benchmark v1.4.0 - 08-24-2015 (minus 3DES)
+  # Removed DHE per ITSec on 4/6/16
+  # TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 and TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+  # --------------------------------------------------------------------
+  $cipherSuitesOrder = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256, \
+                        TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256, \
+                        TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256, \
+                        TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256, \
+                        TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384_P384, \
+                        TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_P256"
+
+  registry::value { 'Cipher Suites':
+    key   => 'HKLM\\SOFTWARE\\Policies\\Microsoft\\Cryptography\\Configuration\\SSL\\00010002',
+    type  => string,
+    value => 'Functions',
+    data  => $cipherSuitesOrder,
+  }
+
+   # --------------------------------------------------------------------
+  # Disable IP Source Routing - Microsoft Security Bulletin MS06-032
+  # --------------------------------------------------------------------
+  registry::value { 'DisableIPSourceRouting0':
+    key   => 'HKLM\\System\\CurrentControlSet\\Services\\Tcpip\\Parameters',
+    type  => 'dword',
+    value => 'DisableIPSourceRouting',
+    data  => 2,
+  }
+
+  # --------------------------------------------------------------------
+  # Disable IPv6 Source Routing - Microsoft Security Bulletin MS06-032
+  # --------------------------------------------------------------------
+  registry_value { 'HKLM\System\CurrentControlSet\Services\Tcpip6\Parameters\DisableIPSourceRouting':
+    ensure => present,
+  	type   => dword,
+    data   => 2,
+    notify => Reboot['after_run'],
+  }
+
+  #Reboot Computer
+  reboot { 'after_run':
+    apply => finished,
+  }
+
+}

server/spec/languageserver/integration/puppet-languageserver/document_validator_spec.rb

@@ -146,6 +146,18 @@
       end
     end
 
+    describe "Given a complete manifest with linting errors" do
+      let(:manifest_fixture) { File.join($fixtures_dir,'manifest_with_lint_errors.pp') }
+      let(:manifest_lf) { File.open(manifest_fixture, 'r') { |file| file.read } }
+      let(:manifest_crlf) { File.open(manifest_fixture, 'r') { |file| file.read }.gsub("\n","\r\n") }
+
+      it "should return same errors for both LF and CRLF line endings" do
+        lint_error_lf = subject.validate(manifest_lf, nil)
+        lint_error_crlf = subject.validate(manifest_crlf, nil)
+        expect(lint_error_crlf).to eq(lint_error_lf)
+      end
+   end
+
     describe "Given a complete manifest with a single linting error" do
       let(:manifest) { "
         user { 'Bob':

server/spec/languageserver/spec_helper.rb

@@ -7,13 +7,13 @@
 $LOAD_PATH.unshift(File.join(root,'vendor','puppet-lint','lib'))
 
 require 'puppet-languageserver'
-fixtures_dir = File.join(File.dirname(__FILE__),'fixtures')
+$fixtures_dir = File.join(File.dirname(__FILE__),'fixtures')
 
 # Currently there is no way to re-initialize the puppet loader so for the moment
 # all tests must run off the single puppet config settings instead of per example setting
 server_options = PuppetLanguageServer::CommandLineParser.parse([])
-server_options[:puppet_settings] = ['--vardir',File.join(fixtures_dir,'cache'),
-                                    '--confdir',File.join(fixtures_dir,'confdir')]
+server_options[:puppet_settings] = ['--vardir',File.join($fixtures_dir,'cache'),
+                                    '--confdir',File.join($fixtures_dir,'confdir')]
 PuppetLanguageServer::init_puppet(server_options)
 
 def wait_for_puppet_loading

server/vendor/README.md

@@ -11,4 +11,5 @@ Note - To improve the packaging size, test files etc. were stripped from the Gem
 Gem List
 --------
 
-* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.3)
+* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.5)
+

server/vendor/puppet-lint/.rubocop_todo.yml

@@ -60,7 +60,7 @@ Metrics/LineLength:
 # Offense count: 65
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 94
+  Max: 105
 
 # Offense count: 18
 Metrics/PerceivedComplexity:

server/vendor/puppet-lint/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Change Log
 
+## [2.3.5](https://github.com/rodjek/puppet-lint/tree/2.3.5) (2018-03-27)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.4...2.3.5)
+
+**Fixed bugs:**
+
+- v2.3.4 breakage - 'wrong number of arguments' when using Rake task [\#812](https://github.com/rodjek/puppet-lint/issues/812)
+
+**Merged pull requests:**
+
+- Make PuppetLint::OptParser.build argument optional [\#813](https://github.com/rodjek/puppet-lint/pull/813) ([rodjek](https://github.com/rodjek))
+
+## [2.3.4](https://github.com/rodjek/puppet-lint/tree/2.3.4) (2018-03-26)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.3...2.3.4)
+
+**Implemented enhancements:**
+
+- Allow ignoring default configurations files on the command line [\#787](https://github.com/rodjek/puppet-lint/issues/787)
+- Implement --list-checks feature, to list the names of all available checks from the cli. [\#804](https://github.com/rodjek/puppet-lint/pull/804) ([xraystyle](https://github.com/xraystyle))
+- Option to disable loading default configurations files [\#789](https://github.com/rodjek/puppet-lint/pull/789) ([dioni21](https://github.com/dioni21))
+- Allow passing ignore\_paths from cli [\#783](https://github.com/rodjek/puppet-lint/pull/783) ([keymone](https://github.com/keymone))
+
+**Fixed bugs:**
+
+- Bad value for range [\#801](https://github.com/rodjek/puppet-lint/issues/801)
+- puppet-lint doesn't handle CRLFs very well [\#778](https://github.com/rodjek/puppet-lint/issues/778)
+- Configuration's ignore\_paths is not respected [\#774](https://github.com/rodjek/puppet-lint/issues/774)
+- Error when including class and missing a colon [\#507](https://github.com/rodjek/puppet-lint/issues/507)
+
+**Merged pull requests:**
+
+- Handle single colon in resource name syntax error [\#809](https://github.com/rodjek/puppet-lint/pull/809) ([rodjek](https://github.com/rodjek))
+- \(\#778\) Don't include line ending in single line comment token values [\#782](https://github.com/rodjek/puppet-lint/pull/782) ([rodjek](https://github.com/rodjek))
+- Fix setting ignore\_paths in Rake task [\#777](https://github.com/rodjek/puppet-lint/pull/777) ([alzabo](https://github.com/alzabo))
+- Add support for passing backslash separated paths to puppet-lint [\#769](https://github.com/rodjek/puppet-lint/pull/769) ([rodjek](https://github.com/rodjek))
+
 ## [2.3.3](https://github.com/rodjek/puppet-lint/tree/2.3.3) (2017-09-28)
 [Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.2...2.3.3)
 

server/vendor/puppet-lint/README.md

@@ -5,7 +5,7 @@ Status](https://secure.travis-ci.org/rodjek/puppet-lint.png)](http://travis-ci.o
 [![Inline docs](http://inch-ci.org/github/rodjek/puppet-lint.png?branch=master)](http://inch-ci.org/github/rodjek/puppet-lint)
 
 Puppet Lint tests Puppet code against the recommended [Puppet language style
-guide](http://docs.puppet.com/puppet/latest/style_guide.html). Puppet Lint validates only code style; it does not validate syntax. To test syntax, use Puppet's `puppet parser validate` command.
+guide](http://puppet.com/docs/puppet/latest/style_guide.html). Puppet Lint validates only code style; it does not validate syntax. To test syntax, use Puppet's `puppet parser validate` command.
 
 ## Compatibility warning
 
@@ -45,6 +45,10 @@ puppet-lint --fix /modules
 
 Puppet Lint options allow you to modify which checks to run. You can disable any of the checks temporarily or permanently, or you can limit testing to specific checks.
 
+#### List all available checks
+
+To list all available checks along with basic usage documentation, use the `--list-checks` option.
+
 #### Run specific checks
 
 To run only specific checks, use the `--only-checks` option, with a comma-separated list of arguments specifying which checks to make:
@@ -65,7 +69,7 @@ You can disable specific Lint checks on the command line, disable them permanent
 
 #### Disable checks on the command line
 
-To disable any of the checks when running the `puppet-lint` command, add a `--no-<check name>-check` flag to the command. For example, to skip the 140-character check, run:
+To disable any of the checks when running the `puppet-lint` command, add a `--no-<check_name>-check` flag to the command. For example, to skip the 140-character check, run:
 
 ```
 puppet-lint --no-140chars-check modules/

server/vendor/puppet-lint/Rakefile

@@ -12,7 +12,8 @@ begin
   GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
     version = PuppetLint::VERSION
     config.future_release = version.to_s
-    config.exclude_labels = %w[duplicate question invalid wontfix release-pr]
+    config.exclude_labels = %w[duplicate question invalid wontfix release-pr documentation]
+    config.enhancement_labels = %w[feature]
   end
 rescue LoadError
   $stderr.puts 'Changelog generation requires Ruby 2.0 or higher'
@@ -23,6 +24,14 @@ begin
 
   RuboCop::RakeTask.new(:rubocop) do |task|
     task.options = %w[-D -E]
+    task.patterns = [
+      'lib/**/*.rb',
+      'spec/**/*.rb',
+      'bin/*',
+      '*.gemspec',
+      'Gemfile',
+      'Rakefile',
+    ]
   end
 rescue LoadError
   $stderr.puts 'Rubocop is not available for this version of Ruby.'

server/vendor/puppet-lint/lib/puppet-lint.rb

@@ -13,6 +13,15 @@
 class PuppetLint::NoCodeError < StandardError; end
 class PuppetLint::NoFix < StandardError; end
 
+# Parser Syntax Errors
+class PuppetLint::SyntaxError < StandardError
+  attr_reader :token
+
+  def initialize(token)
+    @token = token
+  end
+end
+
 # Public: The public interface to puppet-lint.
 class PuppetLint
   # Public: Gets/Sets the String manifest code to be checked.
@@ -75,7 +84,7 @@ def file=(path)
     return unless File.exist?(path)
 
     @path = path
-    File.open(path, 'r:UTF-8') do |f|
+    File.open(path, 'rb:UTF-8') do |f|
       @code = f.read
     end