puppet-lint-fileserver-check 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f29951ef181d127ebc193fec7eed34353148bec0
-  data.tar.gz: 617f106be6a01288f8d802c5e394d4eab9eab128
+  metadata.gz: e2385520863deb2af2d03950b89a4bf0bbad4b7b
+  data.tar.gz: 07a8c1a4be44ac43e7a8ef42b3ae2e4ccdc6a5b4
 SHA512:
-  metadata.gz: 0f532ff5320204e0817e359f62ef1c4a89e27926a8126aa3fc748baf5490a78f60a4cbc5a8846c3f1a2fce27a1a9313d6647dc2e96f73edc0c1e9a0f60fa9d1e
-  data.tar.gz: 1d41a86a47f7fbf9cc480c9a6a36b6ef558fdda66ab0b9a931359c5b1cb6c6c56d881c3cf3926013f7291f1b93c9a0df109d15d17323cf56245f8baf26060345
+  metadata.gz: d9027849b1313dcfe8cd84fdffa0bf4e8848f4dbc5f9759b2c2b69d0710357fe0ec11018c4a79c6d7ae53bfff46ae7d75f142bb48ed444e5775b96ced62b5c11
+  data.tar.gz: 93895b28f5e155e1448ec564f26754c79e0af066e5684b590600eb01ab6ce83d1210657628c667b03e09cbc32ef48e128d76d36596119c96b76bc3d18e9d6d2f

data/lib/puppet-lint/plugins/check-fileserver.rb

@@ -16,7 +16,8 @@ PuppetLint.new_check(:fileserver) do
   end
 
   def fix(problem)
-    if problem[:resource][:type].value == 'file'
+    if problem[:resource][:type].value == 'file' or
+        problem[:resource][:type].value == 'concat::fragment'
       if problem[:token].type == :SSTRING
         problem[:token].prev_code_token.prev_code_token.value = 'content'
         problem[:token].value.sub!(%r{^puppet:///modules/(.*)}, "file('\\1')")

data/spec/puppet-lint/plugins/check_fileserver_spec.rb

@@ -72,6 +72,25 @@ describe 'fileserver' do
       end
     end
 
+    context 'when using fileserver in concat::fragment' do
+      let(:code) {
+        <<-EOS
+        concat::fragment { 'foo':
+          ensure => present,
+          source => 'puppet:///modules/foo/bar',
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should create a warning' do
+        expect(problems).to contain_warning(msg).on_line(3).in_column(21)
+      end
+    end
+
     context 'when using fileserver not in file resource' do
       let(:code) {
         <<-EOS
@@ -216,6 +235,37 @@ describe 'fileserver' do
       end
     end
 
+
+    context 'when using fileserver in concat::fragment' do
+      let(:code) {
+        <<-EOS
+        concat::fragment { 'foo':
+          ensure => present,
+          source => 'puppet:///modules/foo/bar',
+        }
+        EOS
+      }
+
+      it 'should detect a single problem' do
+        expect(problems).to have(1).problem
+      end
+
+      it 'should fix the problem' do
+        expect(problems).to contain_fixed(msg).on_line(3).in_column(21)
+      end
+
+      it 'should fix the code' do
+        expect(manifest).to eq(
+          <<-EOS
+        concat::fragment { 'foo':
+          ensure => present,
+          content => file('foo/bar'),
+        }
+        EOS
+        )
+      end
+    end
+
     context 'code using a variable' do
       let(:code) {
         <<-EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-fileserver-check
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Mickaël Canévet