diff --git a/.fixtures.yml b/.fixtures.yml index 45b59f6..55fb74e 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -9,4 +9,6 @@ fixtures: concat: "puppetlabs/concat" stdlib: "puppetlabs/stdlib" systemd: "puppet/systemd" - yumrepo_core: "puppetlabs/yumrepo_core" + yumrepo_core: + repo: "puppetlabs/yumrepo_core" + ref: "2.1.0" diff --git a/Gemfile b/Gemfile index 53475ca..0d81d80 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,12 @@ group :development do gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 2.1', require: false + gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "metadata-json-lint", '~> 4.0', require: false - gem "rspec-puppet-facts", '~> 4.0', require: false + gem "json-schema", '< 5.1.1', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "dependency_checker", '~> 1.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false @@ -34,7 +37,6 @@ group :development do gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "rexml", '>= 3.0.0', '< 3.2.7', require: false end group :development, :release_prep do gem "puppet-strings", '~> 4.0', require: false diff --git a/manifests/pipeline.pp b/manifests/pipeline.pp index 92e7de8..f1d79f8 100644 --- a/manifests/pipeline.pp +++ b/manifests/pipeline.pp @@ -85,6 +85,7 @@ + $upstream_settings, } ), + notify => Service[$fluentbit::service_name], } } elsif $fluentbit::format == 'yaml' { $clean_name = regsubst($name, "^${pipeline}-", '') @@ -105,6 +106,7 @@ }, } ), + notify => Service[$fluentbit::service_name], } } else { fail('Welp, something fucked up') diff --git a/metadata.json b/metadata.json index 900a91f..460ff82 100644 --- a/metadata.json +++ b/metadata.json @@ -79,6 +79,6 @@ } ], "pdk-version": "3.4.0", - "template-url": "pdk-default#3.4.0", - "template-ref": "tags/3.4.0-0-gd3cc13f" + "template-url": "pdk-default#3.4.0.3", + "template-ref": "tags/3.4.0.3-0-g8fb22fc" } diff --git a/spec/classes/fluentbit_spec.rb b/spec/classes/fluentbit_spec.rb index d5beb6b..94f6d41 100644 --- a/spec/classes/fluentbit_spec.rb +++ b/spec/classes/fluentbit_spec.rb @@ -33,6 +33,10 @@ ) } + it { + is_expected.to contain_file('/etc/fluent-bit/fluent-bit.conf').that_notifies('Service[fluent-bit]') + } + it { is_expected.to contain_file('/etc/fluent-bit/lua-scripts').with( ensure: 'directory', @@ -88,6 +92,10 @@ ensure: 'file', ) } + + it { + is_expected.to contain_file('/etc/fluent-bit/fluent-bit.yaml').that_notifies('Service[fluent-bit]') + } end context 'with package_ensure' do