Skip to content

Commit 830e176

Browse files
author
Helen Campbell
committed
pdksync_heads/master-0-g34e3266
1 parent b284a0a commit 830e176

23 files changed

+133
-140
lines changed

Diff for: ‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
/Gemfile.lock
1414
/junit/
1515
/log/
16-
/log/
1716
/pkg/
1817
/spec/fixtures/manifests/
1918
/spec/fixtures/modules/
2019
/tmp/
2120
/vendor/
2221
/convert_report.txt
23-
22+
/update_report.txt
23+
.DS_Store

Diff for: ‎.pdkignore

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.*.sw[op]
2+
.metadata
3+
.yardoc
4+
.yardwarns
5+
*.iml
6+
/.bundle/
7+
/.idea/
8+
/.vagrant/
9+
/coverage/
10+
/bin/
11+
/doc/
12+
/Gemfile.local
13+
/Gemfile.lock
14+
/junit/
15+
/log/
16+
/pkg/
17+
/spec/fixtures/manifests/
18+
/spec/fixtures/modules/
19+
/tmp/
20+
/vendor/
21+
/convert_report.txt
22+
/update_report.txt
23+
.DS_Store

Diff for: ‎.rubocop.yml

+12-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ AllCops:
88
Exclude:
99
- bin/*
1010
- ".vendor/**/*"
11-
- Gemfile
12-
- Rakefile
11+
- "**/Gemfile"
12+
- "**/Rakefile"
1313
- pkg/**/*
1414
- spec/fixtures/**/*
1515
- vendor/**/*
16+
- "**/Puppetfile"
17+
- "**/Vagrantfile"
18+
- "**/Guardfile"
1619
Metrics/LineLength:
1720
Description: People have wide screens, use them.
1821
Max: 200
@@ -63,6 +66,13 @@ Style/TrailingCommaInLiteral:
6366
Style/SymbolArray:
6467
Description: Using percent style obscures symbolic intent of array's contents.
6568
EnforcedStyle: brackets
69+
RSpec/MessageSpies:
70+
EnforcedStyle: receive
71+
Style/Documentation:
72+
Exclude:
73+
- lib/puppet/parser/functions/**/*
74+
Style/WordArray:
75+
EnforcedStyle: brackets
6676
Style/CollectionMethods:
6777
Enabled: true
6878
Style/MethodCalledOnDoEndBlock:

Diff for: ‎.travis.yml

+7-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ before_install:
77
- bundle -v
88
- rm -f Gemfile.lock
99
- gem update --system
10-
- gem update bundler
1110
- gem --version
1211
- bundle -v
1312
script:
@@ -16,38 +15,33 @@ bundler_args: --without system_tests
1615
rvm:
1716
- 2.4.1
1817
env:
19-
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
18+
global:
19+
- BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
2020
matrix:
2121
fast_finish: true
2222
include:
2323
-
2424
bundler_args:
2525
dist: trusty
26-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
26+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7
2727
rvm: 2.4.1
2828
script: bundle exec rake beaker
2929
services: docker
3030
sudo: required
3131
-
3232
bundler_args:
3333
dist: trusty
34-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
34+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04
3535
rvm: 2.4.1
3636
script: bundle exec rake beaker
3737
services: docker
3838
sudo: required
3939
-
40-
env: CHECK=rubocop
40+
env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
4141
-
42-
env: CHECK="syntax lint"
42+
env: CHECK=parallel_spec
4343
-
44-
env: CHECK=metadata_lint
45-
-
46-
env: CHECK=release_checks
47-
-
48-
env: CHECK=spec
49-
-
50-
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
44+
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
5145
rvm: 2.1.9
5246
branches:
5347
only:

Diff for: ‎.yardopts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--markup markdown

Diff for: ‎Gemfile

+7-55
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ group :development do
2828
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
2929
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
3030
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
31+
gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
3132
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
3233
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
3334
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
3435
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
35-
gem "puppet-blacksmith", '~> 3.4', require: false
36+
gem "puppet-blacksmith", '~> 3.4', require: false, platforms: [:ruby]
3637
end
3738
group :system_tests do
3839
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
@@ -49,73 +50,24 @@ puppet_type = gem_type(puppet_version)
4950
facter_version = ENV['FACTER_GEM_VERSION']
5051
hiera_version = ENV['HIERA_GEM_VERSION']
5152

52-
def puppet_older_than?(version)
53-
puppet_version = ENV['PUPPET_GEM_VERSION']
54-
!puppet_version.nil? &&
55-
Gem::Version.correct?(puppet_version) &&
56-
Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup))
57-
end
58-
5953
gems = {}
6054

6155
gems['puppet'] = location_for(puppet_version)
6256

6357
# If facter or hiera versions have been specified via the environment
64-
# variables, use those versions. If not, and if the puppet version is < 3.5.0,
65-
# use known good versions of both for puppet < 3.5.0.
66-
if facter_version
67-
gems['facter'] = location_for(facter_version)
68-
elsif puppet_type == :gem && puppet_older_than?('3.5.0')
69-
gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false]
70-
end
71-
72-
if hiera_version
73-
gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION'])
74-
elsif puppet_type == :gem && puppet_older_than?('3.5.0')
75-
gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false]
76-
end
58+
# variables
7759

78-
if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0'))
79-
# For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows
80-
if puppet_type == :gem
81-
gems['ffi'] = ['1.9.0', require: false]
82-
gems['minitar'] = ['0.5.4', require: false]
83-
gems['win32-eventlog'] = ['0.5.3', '<= 0.6.5', require: false]
84-
gems['win32-process'] = ['0.6.5', '<= 0.7.5', require: false]
85-
gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false]
86-
gems['win32-service'] = ['0.7.2', '<= 0.8.8', require: false]
87-
else
88-
gems['ffi'] = ['~> 1.9.0', require: false]
89-
gems['minitar'] = ['~> 0.5.4', require: false]
90-
gems['win32-eventlog'] = ['~> 0.5', '<= 0.6.5', require: false]
91-
gems['win32-process'] = ['~> 0.6', '<= 0.7.5', require: false]
92-
gems['win32-security'] = ['~> 0.1', '<= 0.2.5', require: false]
93-
gems['win32-service'] = ['~> 0.7', '<= 0.8.8', require: false]
94-
end
95-
96-
gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false]
97-
98-
if RUBY_VERSION.start_with?('1.')
99-
gems['win32console'] = ['1.3.2', require: false]
100-
# sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x
101-
gems['sys-admin'] = ['1.5.6', require: false]
102-
end
60+
gems['facter'] = location_for(facter_version) if facter_version
61+
gems['hiera'] = location_for(hiera_version) if hiera_version
10362

104-
# Puppet < 3.7.0 requires these.
105-
# Puppet >= 3.5.0 gem includes these as requirements.
106-
# The following versions are tested to work with 3.0.0 <= puppet < 3.7.0.
107-
gems['win32-api'] = ['1.4.8', require: false]
108-
gems['win32-taskscheduler'] = ['0.2.2', require: false]
109-
gems['windows-api'] = ['0.4.3', require: false]
110-
gems['windows-pr'] = ['1.2.3', require: false]
111-
elsif Gem.win_platform?
63+
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
11264
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
11365
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
11466
gems['win32-dir'] = ['<= 0.4.9', require: false]
11567
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
11668
gems['win32-process'] = ['<= 0.7.5', require: false]
11769
gems['win32-security'] = ['<= 0.2.5', require: false]
118-
gems['win32-service'] = ['<= 0.8.8', require: false]
70+
gems['win32-service'] = ['0.8.8', require: false]
11971
end
12072

12173
gems.each do |gem_name, gem_params|

Diff for: ‎Rakefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
require 'puppetlabs_spec_helper/rake_tasks'
22
require 'puppet-syntax/tasks/puppet-syntax'
3-
require 'puppet_blacksmith/rake_tasks'
3+
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
4+
5+
PuppetLint.configuration.send('disable_relative')
6+

Diff for: ‎lib/facter/iptables_persistent_version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Facter.add(:iptables_persistent_version) do
2-
confine operatingsystem: %w[Debian Ubuntu]
2+
confine operatingsystem: ['Debian', 'Ubuntu']
33
setcode do
44
# Throw away STDERR because dpkg >= 1.16.7 will make some noise if the
55
# package isn't currently installed.

Diff for: ‎lib/puppet/provider/firewall/iptables.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ def self.rule_to_hash(line, table, counter)
637637

638638
# If the jump parameter is set to one of: ACCEPT, REJECT or DROP then
639639
# we should set the action parameter instead.
640-
if %w[ACCEPT REJECT DROP].include?(hash[:jump])
640+
if ['ACCEPT', 'REJECT', 'DROP'].include?(hash[:jump])
641641
hash[:action] = hash[:jump].downcase
642642
hash.delete(:jump)
643643
end

Diff for: ‎lib/puppet/type/firewall.rb

+6-9
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ def should_to_s(value)
489489
PUPPETCODE
490490
end
491491

492-
if %w[accept reject drop].include?(value.downcase)
492+
if ['accept', 'reject', 'drop'].include?(value.downcase)
493493
raise ArgumentError, <<-PUPPETCODE
494494
Jump destination should not be one of ACCEPT, REJECT or DROP. Use
495495
the action property instead.
@@ -522,7 +522,7 @@ def should_to_s(value)
522522
PUPPETCODE
523523
end
524524

525-
if %w[accept reject drop].include?(value.downcase)
525+
if ['accept', 'reject', 'drop'].include?(value.downcase)
526526
raise ArgumentError, <<-PUPPETCODE
527527
Goto destination should not be one of ACCEPT, REJECT or DROP. Use
528528
the action property instead.
@@ -1059,10 +1059,7 @@ def insync?(is)
10591059
PUPPETCODE
10601060
# iptables uses the cisco DSCP classes as the basis for this flag. Values may be found here:
10611061
# 'http://www.cisco.com/c/en/us/support/docs/quality-of-service-qos/qos-packet-marking/10103-dscpvalues.html'
1062-
valid_codes = %w[
1063-
af11 af12 af13 af21 af22 af23 af31 af32 af33 af41
1064-
af42 af43 cs1 cs2 cs3 cs4 cs5 cs6 cs7 ef
1065-
]
1062+
valid_codes = ['af11', 'af12', 'af13', 'af21', 'af22', 'af23', 'af31', 'af32', 'af33', 'af41', 'af42', 'af43', 'cs1', 'cs2', 'cs3', 'cs4', 'cs5', 'cs6', 'cs7', 'ef']
10661063
munge do |value|
10671064
unless valid_codes.include? value.downcase
10681065
raise ArgumentError, "#{value} is not a valid DSCP Class"
@@ -1720,7 +1717,7 @@ def should_to_s(value)
17201717
unless protocol.nil?
17211718
table = value(:table)
17221719
[value(:chain), value(:jump)].each do |chain|
1723-
reqs << "#{chain}:#{table}:#{protocol}" unless chain.nil? || (%w[INPUT OUTPUT FORWARD].include?(chain) && table == :filter)
1720+
reqs << "#{chain}:#{table}:#{protocol}" unless chain.nil? || (['INPUT', 'OUTPUT', 'FORWARD'].include?(chain) && table == :filter)
17241721
end
17251722
end
17261723

@@ -1732,7 +1729,7 @@ def should_to_s(value)
17321729
autorequire(:package) do
17331730
case value(:provider)
17341731
when :iptables, :ip6tables
1735-
%w[iptables iptables-persistent iptables-services]
1732+
['iptables', 'iptables-persistent', 'iptables-services']
17361733
else
17371734
[]
17381735
end
@@ -1741,7 +1738,7 @@ def should_to_s(value)
17411738
autorequire(:service) do
17421739
case value(:provider)
17431740
when :iptables, :ip6tables
1744-
%w[firewalld iptables ip6tables iptables-persistent netfilter-persistent]
1741+
['firewalld', 'iptables', 'ip6tables', 'iptables-persistent', 'netfilter-persistent']
17451742
else
17461743
[]
17471744
end

Diff for: ‎lib/puppet/type/firewallchain.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
autorequire(:package) do
159159
case value(:provider)
160160
when :iptables_chain
161-
%w[iptables iptables-persistent iptables-services]
161+
['iptables', 'iptables-persistent', 'iptables-services']
162162
else
163163
[]
164164
end
@@ -167,7 +167,7 @@
167167
autorequire(:service) do
168168
case value(:provider)
169169
when :iptables, :ip6tables
170-
%w[firewalld iptables ip6tables iptables-persistent netfilter-persistent]
170+
['firewalld', 'iptables', 'ip6tables', 'iptables-persistent', 'netfilter-persistent']
171171
else
172172
[]
173173
end

Diff for: ‎lib/puppet/util/firewall.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def persist_iptables(proto)
196196
end
197197

198198
# RHEL 7 and newer also use systemd to persist iptable rules
199-
if os_key == 'RedHat' && %w[RedHat CentOS Scientific SL SLC Ascendos CloudLinux PSBM OracleLinux OVS OEL XenServer VirtuozzoLinux]
199+
if os_key == 'RedHat' && ['RedHat', 'CentOS', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'XenServer', 'VirtuozzoLinux']
200200
.include?(Facter.value(:operatingsystem)) && Facter.value(:operatingsystemrelease).to_i >= 7
201201
os_key = 'Fedora'
202202
end
@@ -205,24 +205,24 @@ def persist_iptables(proto)
205205
when :RedHat
206206
case proto.to_sym
207207
when :IPv4
208-
%w[/sbin/service iptables save]
208+
['/sbin/service', 'iptables', 'save']
209209
when :IPv6
210-
%w[/sbin/service ip6tables save]
210+
['/sbin/service', 'ip6tables', 'save']
211211
end
212212
when :Fedora
213213
case proto.to_sym
214214
when :IPv4
215-
%w[/usr/libexec/iptables/iptables.init save]
215+
['/usr/libexec/iptables/iptables.init', 'save']
216216
when :IPv6
217-
%w[/usr/libexec/iptables/ip6tables.init save]
217+
['/usr/libexec/iptables/ip6tables.init', 'save']
218218
end
219219
when :Debian
220220
case proto.to_sym
221221
when :IPv4, :IPv6
222222
if persist_ver && Puppet::Util::Package.versioncmp(persist_ver, '1.0') > 0
223-
%w[/usr/sbin/service netfilter-persistent save]
223+
['/usr/sbin/service', 'netfilter-persistent', 'save']
224224
else
225-
%w[/usr/sbin/service iptables-persistent save]
225+
['/usr/sbin/service', 'iptables-persistent', 'save']
226226
end
227227
end
228228
when :Debian_manual

Diff for: ‎metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"version_requirement": ">= 4.7.0 < 6.0.0"
8181
}
8282
],
83-
"template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
84-
"template-ref": "1.3.2-0-g07678c8"
83+
"template-url": "https://github.com/puppetlabs/pdk-templates",
84+
"template-ref": "heads/master-0-g34e3266",
85+
"pdk-version": "1.5.0"
8586
}

Diff for: ‎spec/acceptance/firewall_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ class { '::firewall': }
522522
end
523523
end
524524

525-
%w[dst_type src_type].each do |type|
525+
['dst_type', 'src_type'].each do |type|
526526
describe type.to_s do
527527
context 'when MULTICAST' do
528528
pp26 = <<-PUPPETCODE
@@ -1534,7 +1534,7 @@ class { '::firewall': }
15341534
end
15351535
end
15361536

1537-
%w[dst_type src_type].each do |type|
1537+
['dst_type', 'src_type'].each do |type|
15381538
describe type.to_s do
15391539
context 'when MULTICAST' do
15401540
pp65 = <<-PUPPETCODE

0 commit comments

Comments
 (0)