(#12094) Replace name with path in file resources

When the name is used with a file resource, it becomes difficult to test the
resource using rspec-puppet, as the name parameter gets aliased to path. So to
maintain consistency between tests and manifests, this replaces all name
parameters in file resources with the equivalent path parameter.

diff --git a/manifests/init.pp b/manifests/init.pp
index 8042c8be198a2e1c50938899c76151700d63abde..59a56e3f3252f0cf7cdbaf7ce7fa5a68659df271 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,7 +29,7 @@ class apt(
   package { "python-software-properties": }
 
   file { "sources.list":
-    name => "${apt::params::root}/sources.list",
+    path => "${apt::params::root}/sources.list",
     ensure => present,
     owner => root,
     group => root,
@@ -37,7 +37,7 @@ class apt(
   }
 
   file { "sources.list.d":
-    name => "${apt::params::root}/sources.list.d",
+    path => "${apt::params::root}/sources.list.d",
     ensure => directory,
     owner => root,
     group => root,

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 3485b2473d1aa11ac3d55f34133a697427df0bdc..40695af5fa8f84eb4cba4a2ca26ebd84b57818d4 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -9,7 +9,7 @@ define apt::pin(
   include apt::params
 
   file { "${name}.pref":
-    name => "${apt::params::root}/preferences.d/${name}",
+    path => "${apt::params::root}/preferences.d/${name}",
     ensure => file,
     owner => root,
     group => root,

diff --git a/manifests/source.pp b/manifests/source.pp
index 65afefdbe1b10550182b3eb785fa1922a949074e..9f040b7734760dad30f96c969debf9801e9f8b87 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -17,7 +17,7 @@ define apt::source(
 
 
   file { "${name}.list":
-    name => "${apt::params::root}/sources.list.d/${name}.list",
+    path => "${apt::params::root}/sources.list.d/${name}.list",
     ensure => file,
     owner => root,
     group => root,