Update .sync.yml, run pdk update

genebean · genebean · commit 337d02735c6a · 2021-07-22T15:49:13.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
diff --git a/.pdkignore b/.pdkignore
@@ -25,7 +25,9 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
 /appveyor.yml
+/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
@@ -42,3 +44,4 @@
 /spec/
 /.vscode/
 /.sync.yml
+/.devcontainer/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -1 +1,2 @@
+--fail-on-warnings
 --relative
diff --git a/.sync.yml b/.sync.yml
@@ -6,17 +6,59 @@
 appveyor.yml:
   delete: true
 Gemfile:
-  optional:
+  required:
     ':development':
       - gem: 'github_changelog_generator'
-        version: '1.15.0'
+        version: '~> 1.15'
+      - gem: 'puppet-lint-absolute_classname-check'
+        version: '~> 3.0'
+      - gem: 'puppet-lint-absolute_template_path'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-anchor-check'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-classes_and_types_beginning_with_digits-check'
+        version: '~> 0.1'
+      - gem: 'puppet-lint-empty_string-check'
+        version: '~> 0.2'
+      - gem: 'puppet-lint-file_ensure-check'
+        version: '~> 0.3'
+      - gem: 'puppet-lint-leading_zero-check'
+        version: '~> 0.1'
+      - gem: 'puppet-lint-legacy_facts-check'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-manifest_whitespace-check'
+        version: '~> 0.1'
+      - gem: 'puppet-lint-param-docs'
+        version: '~> 1.6'
+      - gem: 'puppet-lint-resource_reference_syntax'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-spaceship_operator_without_tag-check'
+        version: '~> 0.1'
+      - gem: 'puppet-lint-strict_indent-check'
+        version: '~> 2.0'
+      - gem: 'puppet-lint-top_scope_facts-check'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-topscope-variable-check'
+        version: '~> 1.0'
+      - gem: 'puppet-lint-trailing_comma-check'
+        version: '~> 0.4'
+      - gem: 'puppet-lint-trailing_newline-check'
+        version: '~> 1.1'
+      - gem: 'puppet-lint-undef_in_function-check'
+        version: '~> 0.2'
+      - gem: 'puppet-lint-unquoted_string-check'
+        version: '~> 2.0'
+      - gem: 'puppet-lint-variable_contains_upcase'
+        version: '~> 1.2'
+      - gem: 'puppet-lint-version_comparison-check'
+        version: '~> 0.2'
 Rakefile:
   changelog_user: 'grafana'
   changelog_project: 'puppet-promtail'
   changelog_version_tag_pattern: '%s'
+  linter_fail_on_warnings: true
   requires:
     - 'puppet-strings/tasks'
 spec/spec_helper.rb:
   mock_with: ':rspec'
   coverage_report: true
-
diff --git a/Gemfile b/Gemfile
@@ -17,14 +17,35 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator", '1.15.0',                    require: false
+  gem "json", '= 2.0.4',                                                     require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.1.0',                                                     require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                                                     require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0',             require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',                 require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',               require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',                   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '~> 1.15',                               require: false
+  gem "puppet-lint-absolute_classname-check", '~> 3.0',                      require: false
+  gem "puppet-lint-absolute_template_path", '~> 1.0',                        require: false
+  gem "puppet-lint-anchor-check", '~> 1.0',                                  require: false
+  gem "puppet-lint-classes_and_types_beginning_with_digits-check", '~> 0.1', require: false
+  gem "puppet-lint-empty_string-check", '~> 0.2',                            require: false
+  gem "puppet-lint-file_ensure-check", '~> 0.3',                             require: false
+  gem "puppet-lint-leading_zero-check", '~> 0.1',                            require: false
+  gem "puppet-lint-legacy_facts-check", '~> 1.0',                            require: false
+  gem "puppet-lint-manifest_whitespace-check", '~> 0.1',                     require: false
+  gem "puppet-lint-param-docs", '~> 1.6',                                    require: false
+  gem "puppet-lint-resource_reference_syntax", '~> 1.0',                     require: false
+  gem "puppet-lint-spaceship_operator_without_tag-check", '~> 0.1',          require: false
+  gem "puppet-lint-strict_indent-check", '~> 2.0',                           require: false
+  gem "puppet-lint-top_scope_facts-check", '~> 1.0',                         require: false
+  gem "puppet-lint-topscope-variable-check", '~> 1.0',                       require: false
+  gem "puppet-lint-trailing_comma-check", '~> 0.4',                          require: false
+  gem "puppet-lint-trailing_newline-check", '~> 1.1',                        require: false
+  gem "puppet-lint-undef_in_function-check", '~> 0.2',                       require: false
+  gem "puppet-lint-unquoted_string-check", '~> 2.0',                         require: false
+  gem "puppet-lint-variable_contains_upcase", '~> 1.2',                      require: false
+  gem "puppet-lint-version_comparison-check", '~> 0.2',                      require: false
 end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
@@ -45,16 +66,6 @@ gems['puppet'] = location_for(puppet_version)
 gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
-  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
-  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
-  gems['win32-dir'] =      ['<= 0.4.9', require: false]
-  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
-  gems['win32-process'] =  ['<= 0.7.5', require: false]
-  gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
-end
-
 gems.each do |gem_name, gem_params|
   gem gem_name, *gem_params
 end
diff --git a/Rakefile b/Rakefile
@@ -43,6 +43,7 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.fail_on_warnings = true
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -8,7 +8,7 @@
     'Linux': {
       $config_dir = '/etc/promtail'
     }
-    default: { fail("${facts['kernel']} is not supported")}
+    default: { fail("${facts['kernel']} is not supported") }
   }
 
   file { $config_dir:
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -136,7 +136,7 @@
   Optional[Stdlib::Absolutepath] $password_file_path    = undef,
   Optional[Sensitive[String[1]]] $password_file_content = undef,
   Stdlib::HTTPUrl                $source_url            = 'https://github.com/grafana/loki/releases/download',
-){
+) {
   Class['promtail::install']
   -> Class['promtail::config']
   -> Class['promtail::service']
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -54,12 +54,12 @@
       ensure  => file,
       mode    => '0755',
       require => Archive["${binary_path}.gz"],
-    ;
+      ;
     "${promtail::bin_dir}/promtail":
       ensure  => link,
       target  => $binary_path,
       require => File[$binary_path],
       notify  => Service['promtail'],
-    ;
+      ;
   }
 }
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -17,6 +17,6 @@
         require => Systemd::Unit_file['promtail.service'],
       }
     }
-    default: { fail("${facts['kernel']} is not supported")}
+    default: { fail("${facts['kernel']} is not supported") }
   }
 }
diff --git a/metadata.json b/metadata.json
@@ -73,7 +73,7 @@
       "version_requirement": ">= 6.1.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.0.0",
-  "template-url": "pdk-default#2.0.0",
-  "template-ref": "tags/2.0.0-0-ge838f1d"
+  "pdk-version": "2.1.1",
+  "template-url": "pdk-default#2.1.1",
+  "template-ref": "tags/2.1.1-0-g03daa92"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -48,6 +48,18 @@
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!(0)
   end
+
+  # Filter backtrace noise
+  backtrace_exclusion_patterns = [
+    %r{spec_helper},
+    %r{gems},
+  ]
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
+  elsif c.respond_to?(:backtrace_clean_patterns)
+    c.backtrace_clean_patterns = backtrace_exclusion_patterns
+  end
 end
 
 # Ensures that a module is defined

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`'Linux': {`
`9`	`9`	`$config_dir = '/etc/promtail'`
`10`	`10`	`}`
`11`		`- default: { fail("${facts['kernel']} is not supported")}`
	`11`	`+ default: { fail("${facts['kernel']} is not supported") }`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`file { $config_dir:`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`require => Systemd::Unit_file['promtail.service'],`
`18`	`18`	`}`
`19`	`19`	`}`
`20`		`- default: { fail("${facts['kernel']} is not supported")}`
	`20`	`+ default: { fail("${facts['kernel']} is not supported") }`
`21`	`21`	`}`
`22`	`22`	`}`