Skip to content

Commit de8125c

Browse files
AriaXLiAriaXLi
committed
(maint) Disable puppet-lint/disable_puppet_url_without_modules
Currentlty, the puppet_url_without_modules assumes all puppet:/// URLs are using the modules mount. pe_packages is a custom mount and does not use the modules mount.
1 parent 8e1edf3 commit de8125c

12 files changed

+27
-22
lines changed

‎REFERENCE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Base URL of the location of a mirror for Solaris packages. Currently, solaris pa
239239
only be made available by using puppetlabs-pe_repo. This means the mirror must be of a
240240
PE master package serve.
241241

242-
Default value: `'puppet:///modules/pe_packages'`
242+
Default value: `'puppet:///pe_packages'`
243243

244244
##### <a name="-puppet_agent--aix_source"></a>`aix_source`
245245

@@ -249,7 +249,7 @@ Base URL of the location of a mirror for AIX packages. Currently, AIX packages c
249249
only be made available by using puppetlabs-pe_repo. This means the mirror must be of a
250250
PE master package serve.
251251

252-
Default value: `'puppet:///modules/pe_packages'`
252+
Default value: `'puppet:///pe_packages'`
253253

254254
##### <a name="-puppet_agent--use_alternate_sources"></a>`use_alternate_sources`
255255

‎Rakefile

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_
88
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
99
require 'voxpupuli/acceptance/rake'
1010

11+
# puppet_url_without modules check in puppet-lint assumes any puppet:/// URL is
12+
# using the module mount. pe_packages is a custom mount and doesn't need
13+
# modules.
14+
PuppetLint.configuration.send('disable_puppet_url_without_modules')
15+
1116
def changelog_user
1217
return unless Rake.application.top_level_tasks.include? "changelog"
1318
returnVal = nil || JSON.load(File.read('metadata.json'))['author']

‎manifests/init.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
String $apt_source = 'https://apt.puppet.com',
118118
String $mac_source = 'https://downloads.puppet.com',
119119
String $windows_source = 'https://downloads.puppet.com',
120-
String $solaris_source = 'puppet:///modules/pe_packages',
121-
String $aix_source = 'puppet:///modules/pe_packages',
120+
String $solaris_source = 'puppet:///pe_packages',
121+
String $aix_source = 'puppet:///pe_packages',
122122
Boolean $use_alternate_sources = false,
123123
Optional $alternate_pe_source = undef,
124124
Optional[Stdlib::Absolutepath] $install_dir = undef,

‎manifests/osfamily/darwin.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
} elsif $puppet_agent::source {
1919
$source = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2020
} else {
21-
$source = "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
21+
$source = "puppet:///pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2222
}
2323
} else {
2424
$source = "${puppet_agent::mac_source}/mac/${puppet_agent::collection}/${productversion_major}/${puppet_agent::arch}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"

‎manifests/osfamily/solaris.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
owner => 0,
5454
group => 0,
5555
mode => '0644',
56-
source => "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/solaris-noask",
56+
source => "puppet:///pe_packages/${pe_server_version}/${facts['platform_tag']}/solaris-noask",
5757
}
5858
}
5959
'11': {

‎manifests/osfamily/suse.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
} elsif $puppet_agent::alternate_pe_source {
2727
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}"
2828
} else {
29-
$source = "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.sles11.${puppet_agent::arch}.rpm"
29+
$source = "puppet:///pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.sles11.${puppet_agent::arch}.rpm"
3030
}
3131

3232
# Nuke the repo if it exists to ensure zypper doesn't remain broken

‎manifests/osfamily/windows.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
if $puppet_agent::alternate_pe_source {
1919
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${tag}/${puppet_agent::package_name}-${puppet_agent::arch}.msi"
2020
} else {
21-
$source = "puppet:///modules/pe_packages/${pe_server_version}/${tag}/${puppet_agent::package_name}-${puppet_agent::arch}.msi"
21+
$source = "puppet:///pe_packages/${pe_server_version}/${tag}/${puppet_agent::package_name}-${puppet_agent::arch}.msi"
2222
}
2323
} else {
2424
if $puppet_agent::collection == 'PC1' {

‎spec/classes/puppet_agent_osfamily_aix_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
shared_examples 'aix' do |aixver, pkg_aixver, powerver|
2525
let(:rpmname) { "puppet-agent-#{params[:package_version]}-1.aix#{pkg_aixver}.ppc.rpm" }
2626
let(:tag) { "aix-#{pkg_aixver}-power" }
27-
let(:source) { "puppet:///modules/pe_packages/2000.0.0/#{tag}/#{rpmname}" }
27+
let(:source) { "puppet:///pe_packages/2000.0.0/#{tag}/#{rpmname}" }
2828
let(:facts) do
2929
common_facts.merge({
3030
architecture: "PowerPC_POWER#{powerver}",

‎spec/classes/puppet_agent_osfamily_darwin_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '10.13', }, }, }, platform_tag: 'osx-10.13-x86_64', serverversion: '5.10.200')
9595
end
9696

97-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx10.13.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-10.13-x86_64/puppet-agent-5.10.200-1.osx10.13.dmg') }
97+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx10.13.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-10.13-x86_64/puppet-agent-5.10.200-1.osx10.13.dmg') }
9898
end
9999

100100
describe 'when using package_version auto with macOS 11 (two numbers version productversion)' do
@@ -107,7 +107,7 @@
107107
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11.2', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
108108
end
109109

110-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
110+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
111111
end
112112

113113
describe 'when using package_version auto with macOS 11 (one number version productversion)' do
@@ -120,6 +120,6 @@
120120
override_facts(facts, aio_agent_version: '1.10.99', is_pe: true, os: { macosx: { version: { major: '11', }, }, }, platform_tag: 'osx-11-x86_64', serverversion: '5.10.200')
121121
end
122122

123-
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///modules/pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
123+
it { is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-5.10.200-1.osx11.dmg').with_source('puppet:///pe_packages/2000.0.0/osx-11-x86_64/puppet-agent-5.10.200-1.osx11.dmg') }
124124
end
125125
end

‎spec/classes/puppet_agent_osfamily_solaris_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def install_script(ver, arch)
138138
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p")
139139
.with({
140140
'ensure' => 'file',
141-
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-11-i386/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p",
141+
'source' => "puppet:///pe_packages/#{pe_version}/solaris-11-i386/puppet-agent@#{sol11_package_version},5.11-1.i386.p5p",
142142
})
143143
end
144144

@@ -194,7 +194,7 @@ def install_script(ver, arch)
194194
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p")
195195
.with({
196196
'ensure' => 'file',
197-
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-11-sparc/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p",
197+
'source' => "puppet:///pe_packages/#{pe_version}/solaris-11-sparc/puppet-agent@#{sol11_package_version},5.11-1.sparc.p5p",
198198
})
199199
end
200200

@@ -271,11 +271,11 @@ def install_script(ver, arch)
271271
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg.gz")
272272
.with({
273273
'ensure' => 'file',
274-
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-10-i386/puppet-agent-#{package_version}-1.i386.pkg.gz"
274+
'source' => "puppet:///pe_packages/#{pe_version}/solaris-10-i386/puppet-agent-#{package_version}-1.i386.pkg.gz"
275275
})
276276
end
277277

278-
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///modules/pe_packages/#{pe_version}/solaris-10-i386/solaris-noask") }
278+
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///pe_packages/#{pe_version}/solaris-10-i386/solaris-noask") }
279279
it do
280280
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.i386.pkg.gz").with_command("gzip -d /opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg.gz")
281281
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.i386.pkg.gz").with_creates("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.i386.pkg")
@@ -319,11 +319,11 @@ def install_script(ver, arch)
319319
is_expected.to contain_file("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg.gz")
320320
.with({
321321
'ensure' => 'file',
322-
'source' => "puppet:///modules/pe_packages/#{pe_version}/solaris-10-sparc/puppet-agent-#{package_version}-1.sparc.pkg.gz"
322+
'source' => "puppet:///pe_packages/#{pe_version}/solaris-10-sparc/puppet-agent-#{package_version}-1.sparc.pkg.gz"
323323
})
324324
end
325325

326-
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///modules/pe_packages/#{pe_version}/solaris-10-sparc/solaris-noask") }
326+
it { is_expected.to contain_file('/opt/puppetlabs/packages/solaris-noask').with_source("puppet:///pe_packages/#{pe_version}/solaris-10-sparc/solaris-noask") }
327327
it do
328328
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.sparc.pkg.gz").with_command("gzip -d /opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg.gz")
329329
is_expected.to contain_exec("unzip puppet-agent-#{package_version}-1.sparc.pkg.gz").with_creates("/opt/puppetlabs/packages/puppet-agent-#{package_version}-1.sparc.pkg")

‎spec/classes/puppet_agent_osfamily_suse_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
it {
374374
is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-1.10.100-1.sles11.x86_64.rpm')
375375
.with(
376-
source: 'puppet:///modules/pe_packages/2000.0.0/sles-11-x86_64/puppet-agent-1.10.100-1.sles11.x86_64.rpm',
376+
source: 'puppet:///pe_packages/2000.0.0/sles-11-x86_64/puppet-agent-1.10.100-1.sles11.x86_64.rpm',
377377
)
378378
}
379379
it {

‎spec/classes/puppet_agent_osfamily_windows_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
5454
it {
5555
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
56-
'source' => "puppet:///modules/pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
56+
'source' => "puppet:///pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
5757
)
5858
}
5959
end
@@ -91,7 +91,7 @@
9191
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
9292
it {
9393
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
94-
'source' => "puppet:///modules/pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
94+
'source' => "puppet:///pe_packages/#{pe_version}/windows-#{tag}/puppet-agent-#{arch}.msi",
9595
)
9696
}
9797
end
@@ -131,7 +131,7 @@
131131
it { is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages") }
132132
it do
133133
is_expected.to contain_file("#{appdata}\\Puppetlabs\\packages\\puppet-agent-#{arch}.msi").with(
134-
'source' => "puppet:///modules/pe_packages/#{pe_version}/windowsfips-#{tag}/puppet-agent-#{arch}.msi",
134+
'source' => "puppet:///pe_packages/#{pe_version}/windowsfips-#{tag}/puppet-agent-#{arch}.msi",
135135
)
136136
end
137137
end

0 commit comments

Comments
 (0)