Upgrade puppetlabs-firewall to 2.8.1
> puppet module upgrade --modulepath 'modules' --version=2.8.1 'puppetlabs-firewall' Fixes kubernetes iptables rule parsing errors https://github.com/puppetlabs/puppetlabs-firewall/blob/main/CHANGELOG.mdmaster
parent
5d29272303
commit
157346f2db
@ -0,0 +1,6 @@
|
||||
FROM puppet/pdk:latest
|
||||
|
||||
# [Optional] Uncomment this section to install additional packages.
|
||||
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
# && apt-get -y install --no-install-recommends <your-package-list-here>
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
|
||||
// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
|
||||
{
|
||||
"name": "Puppet Development Kit (Community)",
|
||||
"dockerFile": "Dockerfile",
|
||||
|
||||
// Set *default* container specific settings.json values on container create.
|
||||
"settings": {
|
||||
"terminal.integrated.shell.linux": "/bin/bash"
|
||||
},
|
||||
|
||||
// Add the IDs of extensions you want installed when the container is created.
|
||||
"extensions": [
|
||||
"puppet.puppet-vscode",
|
||||
"rebornix.Ruby"
|
||||
]
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
// "forwardPorts": [],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
// "postCreateCommand": "pdk --version",
|
||||
}
|
||||
@ -0,0 +1,194 @@
|
||||
name: "nightly"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
|
||||
jobs:
|
||||
setup_matrix:
|
||||
name: "Setup Test Matrix"
|
||||
runs-on: ubuntu-20.04
|
||||
outputs:
|
||||
matrix: ${{ steps.get-matrix.outputs.matrix }}
|
||||
|
||||
steps:
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
|
||||
- name: "Honeycomb: Start first step"
|
||||
run: |
|
||||
echo STEP_ID=setup-environment >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: ruby/setup-ruby@v1
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
bundler-cache: true
|
||||
|
||||
- name: Print bundle environment
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Setup Environment time"
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
|
||||
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Setup Acceptance Test Matrix
|
||||
id: get-matrix
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
|
||||
else
|
||||
echo "::set-output name=matrix::{}"
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record Setup Test Matrix time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
|
||||
|
||||
Acceptance:
|
||||
needs:
|
||||
- setup_matrix
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
|
||||
|
||||
env:
|
||||
BUILDEVENT_FILE: '../buildevents.txt'
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
|
||||
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
|
||||
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
|
||||
|
||||
- name: "Honeycomb: start first step"
|
||||
run: |
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
bundler-cache: true
|
||||
|
||||
- name: Print bundle environment
|
||||
run: |
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Setup Environment time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Provision test environment
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
echo ::group::=== INVENTORY ===
|
||||
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Install agent
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
|
||||
|
||||
- name: Install module
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
|
||||
|
||||
- name: "Honeycomb: Record deployment times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
echo ::group::honeycomb step
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Run acceptance tests
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
|
||||
|
||||
- name: "Honeycomb: Record acceptance testing times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Remove test environment
|
||||
if: ${{ always() }}
|
||||
continue-on-error: true
|
||||
run: |
|
||||
if [ -f inventory.yaml ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record removal times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
|
||||
|
||||
slack-workflow-status:
|
||||
if: always()
|
||||
name: Post Workflow Status To Slack
|
||||
needs:
|
||||
- Acceptance
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Slack Workflow Notification
|
||||
uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
|
||||
with:
|
||||
# Required Input
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
|
||||
# Optional Input
|
||||
channel: '#team-ia-bots'
|
||||
name: 'GABot'
|
||||
@ -0,0 +1,175 @@
|
||||
name: "PR Testing"
|
||||
|
||||
on: [pull_request]
|
||||
|
||||
env:
|
||||
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
|
||||
HONEYCOMB_DATASET: litmus tests
|
||||
|
||||
jobs:
|
||||
setup_matrix:
|
||||
name: "Setup Test Matrix"
|
||||
runs-on: ubuntu-20.04
|
||||
outputs:
|
||||
matrix: ${{ steps.get-matrix.outputs.matrix }}
|
||||
|
||||
steps:
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
|
||||
- name: "Honeycomb: Start first step"
|
||||
run: |
|
||||
echo STEP_ID=setup-environment >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: ruby/setup-ruby@v1
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
bundler-cache: true
|
||||
|
||||
- name: Print bundle environment
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Setup Environment time"
|
||||
if: ${{ github.repository_owner == 'puppetlabs' }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
|
||||
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Setup Acceptance Test Matrix
|
||||
id: get-matrix
|
||||
run: |
|
||||
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
|
||||
else
|
||||
echo "::set-output name=matrix::{}"
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record Setup Test Matrix time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
|
||||
|
||||
Acceptance:
|
||||
needs:
|
||||
- setup_matrix
|
||||
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
|
||||
|
||||
env:
|
||||
BUILDEVENT_FILE: '../buildevents.txt'
|
||||
|
||||
steps:
|
||||
- run: |
|
||||
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
|
||||
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
|
||||
|
||||
- name: "Honeycomb: Start recording"
|
||||
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
|
||||
with:
|
||||
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
|
||||
dataset: ${{ env.HONEYCOMB_DATASET }}
|
||||
job-status: ${{ job.status }}
|
||||
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
|
||||
|
||||
- name: "Honeycomb: start first step"
|
||||
run: |
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Checkout Source
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Activate Ruby 2.7
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: "2.7"
|
||||
bundler-cache: true
|
||||
|
||||
- name: Print bundle environment
|
||||
run: |
|
||||
echo ::group::bundler environment
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
|
||||
echo ::endgroup::
|
||||
|
||||
- name: "Honeycomb: Record Setup Environment time"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Provision test environment
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
echo ::group::=== INVENTORY ===
|
||||
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Install agent
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
|
||||
|
||||
- name: Install module
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
|
||||
|
||||
- name: "Honeycomb: Record deployment times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
echo ::group::honeycomb step
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
echo ::endgroup::
|
||||
|
||||
- name: Run acceptance tests
|
||||
run: |
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
|
||||
|
||||
- name: "Honeycomb: Record acceptance testing times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
|
||||
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
|
||||
echo STEP_START=$(date +%s) >> $GITHUB_ENV
|
||||
|
||||
- name: Remove test environment
|
||||
if: ${{ always() }}
|
||||
continue-on-error: true
|
||||
run: |
|
||||
if [ -f inventory.yaml ]; then
|
||||
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
|
||||
echo ::group::=== REQUEST ===
|
||||
cat request.json || true
|
||||
echo
|
||||
echo ::endgroup::
|
||||
fi
|
||||
|
||||
- name: "Honeycomb: Record removal times"
|
||||
if: ${{ always() }}
|
||||
run: |
|
||||
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
|
||||
@ -0,0 +1,18 @@
|
||||
FROM gitpod/workspace-full
|
||||
RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \
|
||||
wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \
|
||||
sudo dpkg -i puppet6-release-bionic.deb && \
|
||||
sudo dpkg -i puppet-tools-release-bionic.deb && \
|
||||
sudo apt-get update && \
|
||||
sudo apt-get install -y pdk zsh puppet-agent && \
|
||||
sudo apt-get clean && \
|
||||
sudo rm -rf /var/lib/apt/lists/*
|
||||
RUN sudo usermod -s $(which zsh) gitpod && \
|
||||
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
|
||||
echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \
|
||||
echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"' >> /home/gitpod/.zshrc && \
|
||||
sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \
|
||||
mkdir -p /home/gitpod/.config/puppet && \
|
||||
/opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml
|
||||
RUN rm -f puppet6-release-bionic.deb puppet-tools-release-bionic.deb
|
||||
ENTRYPOINT /usr/bin/zsh
|
||||
@ -0,0 +1,9 @@
|
||||
image:
|
||||
file: .gitpod.Dockerfile
|
||||
|
||||
tasks:
|
||||
- init: pdk bundle install
|
||||
|
||||
vscode:
|
||||
extensions:
|
||||
- puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
|
||||
@ -0,0 +1,31 @@
|
||||
---
|
||||
default_set: 'centos-64-x64'
|
||||
sets:
|
||||
'centos-59-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'centos-59-x64'
|
||||
'centos-64-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'centos-64-x64'
|
||||
'fedora-18-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'fedora-18-x64'
|
||||
'debian-607-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'debian-607-x64'
|
||||
'debian-70rc1-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'debian-70rc1-x64'
|
||||
'ubuntu-server-10044-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'ubuntu-server-10044-x64'
|
||||
'ubuntu-server-12042-x64':
|
||||
nodes:
|
||||
"main.foo.vm":
|
||||
prefab: 'ubuntu-server-12042-x64'
|
||||
@ -0,0 +1,2 @@
|
||||
# Setting ownership to the modules team
|
||||
* @puppetlabs/modules
|
||||
@ -1,76 +0,0 @@
|
||||
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||
|
||||
def location_for(place_or_version, fake_version = nil)
|
||||
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
|
||||
file_url_regex = %r{\Afile:\/\/(?<path>.*)}
|
||||
|
||||
if place_or_version && (git_url = place_or_version.match(git_url_regex))
|
||||
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
|
||||
elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
|
||||
['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
|
||||
else
|
||||
[place_or_version, { require: false }]
|
||||
end
|
||||
end
|
||||
|
||||
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
|
||||
minor_version = ruby_version_segments[0..1].join('.')
|
||||
|
||||
group :development do
|
||||
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
|
||||
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
|
||||
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
|
||||
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
|
||||
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
|
||||
gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
|
||||
gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
|
||||
gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
|
||||
end
|
||||
group :system_tests do
|
||||
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
|
||||
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
|
||||
end
|
||||
|
||||
puppet_version = ENV['PUPPET_GEM_VERSION']
|
||||
facter_version = ENV['FACTER_GEM_VERSION']
|
||||
hiera_version = ENV['HIERA_GEM_VERSION']
|
||||
|
||||
gems = {}
|
||||
|
||||
gems['puppet'] = location_for(puppet_version)
|
||||
|
||||
# If facter or hiera versions have been specified via the environment
|
||||
# variables
|
||||
|
||||
gems['facter'] = location_for(facter_version) if facter_version
|
||||
gems['hiera'] = location_for(hiera_version) if hiera_version
|
||||
|
||||
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
|
||||
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
|
||||
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
|
||||
gems['win32-dir'] = ['<= 0.4.9', require: false]
|
||||
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
|
||||
gems['win32-process'] = ['<= 0.7.5', require: false]
|
||||
gems['win32-security'] = ['<= 0.2.5', require: false]
|
||||
gems['win32-service'] = ['0.8.8', require: false]
|
||||
end
|
||||
|
||||
gems.each do |gem_name, gem_params|
|
||||
gem gem_name, *gem_params
|
||||
end
|
||||
|
||||
# Evaluate Gemfile.local and ~/.gemfile if they exist
|
||||
extra_gemfiles = [
|
||||
"#{__FILE__}.local",
|
||||
File.join(Dir.home, '.gemfile'),
|
||||
]
|
||||
|
||||
extra_gemfiles.each do |gemfile|
|
||||
if File.file?(gemfile) && File.readable?(gemfile)
|
||||
eval(File.read(gemfile), binding)
|
||||
end
|
||||
end
|
||||
# vim: syntax=ruby
|
||||
@ -1,6 +0,0 @@
|
||||
## Maintenance
|
||||
|
||||
Maintainers:
|
||||
- Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
|
||||
|
||||
Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `firewall`.
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,76 +0,0 @@
|
||||
require 'puppetlabs_spec_helper/rake_tasks'
|
||||
require 'puppet-syntax/tasks/puppet-syntax'
|
||||
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
|
||||
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
|
||||
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
|
||||
|
||||
def changelog_user
|
||||
return unless Rake.application.top_level_tasks.include? "changelog"
|
||||
returnVal = nil || JSON.load(File.read('metadata.json'))['author']
|
||||
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
|
||||
puts "GitHubChangelogGenerator user:#{returnVal}"
|
||||
returnVal
|
||||
end
|
||||
|
||||
def changelog_project
|
||||
return unless Rake.application.top_level_tasks.include? "changelog"
|
||||
returnVal = nil || JSON.load(File.read('metadata.json'))['name']
|
||||
raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
|
||||
puts "GitHubChangelogGenerator project:#{returnVal}"
|
||||
returnVal
|
||||
end
|
||||
|
||||
def changelog_future_release
|
||||
return unless Rake.application.top_level_tasks.include? "changelog"
|
||||
returnVal = JSON.load(File.read('metadata.json'))['version']
|
||||
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
|
||||
puts "GitHubChangelogGenerator future_release:#{returnVal}"
|
||||
returnVal
|
||||
end
|
||||
|
||||
PuppetLint.configuration.send('disable_relative')
|
||||
|
||||
if Bundler.rubygems.find_name('github_changelog_generator').any?
|
||||
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
||||
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
|
||||
config.user = "#{changelog_user}"
|
||||
config.project = "#{changelog_project}"
|
||||
config.future_release = "#{changelog_future_release}"
|
||||
config.exclude_labels = ['maintenance']
|
||||
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
|
||||
config.add_pr_wo_labels = true
|
||||
config.issues = false
|
||||
config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
|
||||
config.configure_sections = {
|
||||
"Changed" => {
|
||||
"prefix" => "### Changed",
|
||||
"labels" => ["backwards-incompatible"],
|
||||
},
|
||||
"Added" => {
|
||||
"prefix" => "### Added",
|
||||
"labels" => ["feature", "enhancement"],
|
||||
},
|
||||
"Fixed" => {
|
||||
"prefix" => "### Fixed",
|
||||
"labels" => ["bugfix"],
|
||||
},
|
||||
}
|
||||
end
|
||||
else
|
||||
desc 'Generate a Changelog from GitHub'
|
||||
task :changelog do
|
||||
raise <<EOM
|
||||
The changelog tasks depends on unreleased features of the github_changelog_generator gem.
|
||||
Please manually add it to your .sync.yml for now, and run `pdk update`:
|
||||
---
|
||||
Gemfile:
|
||||
optional:
|
||||
':development':
|
||||
- gem: 'github_changelog_generator'
|
||||
git: 'https://github.com/skywinder/github-changelog-generator'
|
||||
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
|
||||
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
|
||||
EOM
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
{
|
||||
"CHANGELOG.md": "cb6c848763ede8fb8c501be56abc7b40",
|
||||
"CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4",
|
||||
"Gemfile": "3864447c01e8ca140685b2f085f2d262",
|
||||
"HISTORY.md": "78554cf4cff5c350fbf7c87cfe18e812",
|
||||
"LICENSE": "3b83ef96387f14655fc854ddc3c6bd57",
|
||||
"MAINTAINERS.md": "04aaaf05e794f325fd498880858fbd0f",
|
||||
"NOTICE": "16e399d242da32229321f743a0b27d8c",
|
||||
"README.markdown": "6ad59e0d04eabd191778dccad288b4b6",
|
||||
"Rakefile": "5d8e4cae0fbd65b3b3e3ca59e759182b",
|
||||
"lib/facter/ip6tables_version.rb": "4ea8934f4329ab0133f803f801b61db6",
|
||||
"lib/facter/iptables_persistent_version.rb": "6c634cb505e167ad088946e042450bff",
|
||||
"lib/facter/iptables_version.rb": "146e4e8b3655df1b77988e835ac3ba44",
|
||||
"lib/puppet/provider/firewall/ip6tables.rb": "ab6284070585007668d05abb4b8e179c",
|
||||
"lib/puppet/provider/firewall/iptables.rb": "02dc34698877d31475bd281718796579",
|
||||
"lib/puppet/provider/firewall.rb": "d94d0ca1ac01e546fb9e0ff591f09aaf",
|
||||
"lib/puppet/provider/firewallchain/iptables_chain.rb": "292a7126bb9ead563ee3e1c635aeff67",
|
||||
"lib/puppet/type/firewall.rb": "cd167451737b8fc156abf89a24b6ca7c",
|
||||
"lib/puppet/type/firewallchain.rb": "96c7597a988c59dd358c2998e4ed8ab2",
|
||||
"lib/puppet/util/firewall.rb": "556272947eb178b0edd6df855629c301",
|
||||
"lib/puppet/util/ipcidr.rb": "45fcb84e1cc295c432737e46e6a02a98",
|
||||
"locales/config.yaml": "92a513534d781a27f58da8e200b87b49",
|
||||
"manifests/init.pp": "69c22e13d3c82568f5acc5249f0c21b5",
|
||||
"manifests/linux/archlinux.pp": "692a236965597cfba264a2e361aa3522",
|
||||
"manifests/linux/debian.pp": "687dd3e1d08bb1ec28be119c73e095dd",
|
||||
"manifests/linux/gentoo.pp": "225a291a80afacc8d5f01a21825c0c5a",
|
||||
"manifests/linux/redhat.pp": "a3eecd996dec9c352daf71836107ad89",
|
||||
"manifests/linux.pp": "391cfe691e648bcb3ce0aa97c84c6076",
|
||||
"manifests/params.pp": "894542ad50db0bb2378964090492289d",
|
||||
"metadata.json": "bfa99736f5f007b5d9050bade73766f4",
|
||||
"spec/acceptance/bytecode_spec.rb": "ea195558d5add8256b53f155647fd3f6",
|
||||
"spec/acceptance/change_source_spec.rb": "fbe2df21ec95bc0d3ce47c5550cfab00",
|
||||
"spec/acceptance/class_spec.rb": "6a4f8fc845b2ec5124c7ce0733943065",
|
||||
"spec/acceptance/connlimit_spec.rb": "d83757e4ee5f5ad867bcb5b92b7e8da3",
|
||||
"spec/acceptance/connmark_spec.rb": "63fd07132fb6081cacc81ba9fe43e3fa",
|
||||
"spec/acceptance/firewall_bridging_spec.rb": "1175abff7112aac80c9f1cbedb9254c3",
|
||||
"spec/acceptance/firewall_clusterip_spec.rb": "3f0031074e4a8f9ebde62d271ec68dda",
|
||||
"spec/acceptance/firewall_dscp_spec.rb": "39ff30237976b17ffb44c0592dcb8665",
|
||||
"spec/acceptance/firewall_gid_spec.rb": "9975e8be6147d3ec463d19138ce1f17f",
|
||||
"spec/acceptance/firewall_iptmodules_spec.rb": "ca0dca3a818b1e8abe01485ac0e75683",
|
||||
"spec/acceptance/firewall_mss_spec.rb": "3588a6bcadecd45b5bee49ea4978ac6f",
|
||||
"spec/acceptance/firewall_spec.rb": "811e725908f7ef38ac9aa8409d18c392",
|
||||
"spec/acceptance/firewall_tee_spec.rb": "29867df95e3673b1c2bcfe7ca13b7b9b",
|
||||
"spec/acceptance/firewall_time_spec.rb": "8617912ec2bd1194b91003e2fcce13d1",
|
||||
"spec/acceptance/firewall_uid_spec.rb": "ab334d700b8c6b507baf7094a561303a",
|
||||
"spec/acceptance/firewallchain_spec.rb": "62bf213945c854de341182db0ea27c90",
|
||||
"spec/acceptance/hashlimit_spec.rb": "49128462e5310265291b1538fd95a5db",
|
||||
"spec/acceptance/invert_spec.rb": "77718842cefb6366202ca25b3b0cf86c",
|
||||
"spec/acceptance/ip6_fragment_spec.rb": "db0155bccef5cc7957140f191766576a",
|
||||
"spec/acceptance/isfragment_spec.rb": "8c75b500412ccbb64284ea15c0b19803",
|
||||
"spec/acceptance/match_mark_spec.rb": "a7027fbac841de492b26789b2d986f98",
|
||||
"spec/acceptance/nflog_spec.rb": "96a3d9bdf12920da77732fe62fe178df",
|
||||
"spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd",
|
||||
"spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39",
|
||||
"spec/acceptance/nodesets/default.yml": "b42da5a1ea0c964567ba7495574b8808",
|
||||
"spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae",
|
||||
"spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df",
|
||||
"spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58",
|
||||
"spec/acceptance/nodesets/new/aio/debian-8-64mda.yml": "3cb5b076f8ff1ce0123f7002d1132aa1",
|
||||
"spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml": "2da8ffed4efeb44fb78b686a06195116",
|
||||
"spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml": "200ba1439bddf26dd611b5f315e3b955",
|
||||
"spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml": "41256594850e488f033ec30327139162",
|
||||
"spec/acceptance/nodesets/new/aio/ubuntu-1604-64mda.yml": "9c79b040697c25f1170feaf3ea3d9700",
|
||||
"spec/acceptance/nodesets/new/pe/centos-5-64mda.yml": "192e4434be158fb238b8088f5d9adce0",
|
||||
"spec/acceptance/nodesets/new/pe/centos-6-64mda.yml": "13947041961996723a56bfa35289919a",
|
||||
"spec/acceptance/nodesets/new/pe/centos-7-64mda.yml": "5ff3e38e023c75ce2ace69a5ccadbf33",
|
||||
"spec/acceptance/nodesets/new/pe/debian-6-64mda.yml": "ff79b672c5a532409c492ad0d45dc0ad",
|
||||
"spec/acceptance/nodesets/new/pe/debian-7-64mda.yml": "63fefd7c9395781748a8b63d08dfd86c",
|
||||
"spec/acceptance/nodesets/new/pe/debian-8-64mda.yml": "ed8e721a3d96556d92a9a1806171987b",
|
||||
"spec/acceptance/nodesets/new/pe/oracle-5-64mda.yml": "64adf2da3fff9a6cf4b28c638f568a43",
|
||||
"spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml": "3e0fbe6f9516023816c85884f0fdc839",
|
||||
"spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml": "b5f568cf11baafdf98f0127220527219",
|
||||
"spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml": "3c07dc9d83607f0f04a6903a77f5825d",
|
||||
"spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml": "886858b5f4ddcd484da013eca85d996e",
|
||||
"spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml": "199c73bd7860987d5af932164b5603e7",
|
||||
"spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml": "4d23f6b5aa75033ddd9077588ee605a9",
|
||||
"spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml": "342a75a0f2a8e45b7f317d34a35fdb77",
|
||||
"spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml": "5952c337b5dfd11ddbc28cd7936630db",
|
||||
"spec/acceptance/nodesets/new/pe/sles-10-64mda.yml": "6b71985abd427432bdb2f9e8b76087fe",
|
||||
"spec/acceptance/nodesets/new/pe/sles-11-64mda.yml": "5ed55d2324395308cab72ec6e0545967",
|
||||
"spec/acceptance/nodesets/new/pe/sles-12-64mda.yml": "bc2fc9c59161c30b69fe907d65a138dc",
|
||||
"spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml": "07bef5f739c27a6a62945adbd2e8813e",
|
||||
"spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml": "c689063fd68a3c3ba3c47ced3016fa0e",
|
||||
"spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml": "d0f11e054810e240ba4efdf3d08de815",
|
||||
"spec/acceptance/nodesets/new/pe/ubuntu-1604-64mda.yml": "c66b70cd33f4e338ddfb54ff46f35c8e",
|
||||
"spec/acceptance/params_spec.rb": "f60f1a7fc8a3220452f8be9a8f75dff5",
|
||||
"spec/acceptance/purge_spec.rb": "dbed2bd663e16c7ec342f8c6043cf27f",
|
||||
"spec/acceptance/resource_cmd_spec.rb": "42646dfe47ea26f6d7c503c1d59b9820",
|
||||
"spec/acceptance/rules_spec.rb": "9178056223e997f9209c6e0d545efbb7",
|
||||
"spec/acceptance/socket_spec.rb": "faa8314766a5f45b722542aad70119e0",
|
||||
"spec/acceptance/standard_usage_spec.rb": "4a4fadac8e277d1380d481d07041ff08",
|
||||
"spec/default_facts.yml": "d4442f09ee2f33f2d55f078d0ee2634f",
|
||||
"spec/fixtures/ip6tables/conversion_hash.rb": "ac76867b62fd635a85dcc7a565324491",
|
||||
"spec/fixtures/iptables/conversion_hash.rb": "6fd7863c8b2b57b100a57e3f9fa6f6e2",
|
||||
"spec/spec_helper.rb": "5976c9433c30e42380aa21cbf108c388",
|
||||
"spec/spec_helper_acceptance.rb": "126f3d90ff51283b902e8d017cd0016d",
|
||||
"spec/spec_helper_local.rb": "3fd478f37f68db2879ca92bf1237202b",
|
||||
"spec/unit/classes/firewall_linux_archlinux_spec.rb": "fd9ffeddd563b1030597e8289f5ba81f",
|
||||
"spec/unit/classes/firewall_linux_debian_spec.rb": "d08f4b8df0ee201ba81dba58cae4ce2b",
|
||||
"spec/unit/classes/firewall_linux_redhat_spec.rb": "af2f3b4b98d7b098e42f36f4543beac6",
|
||||
"spec/unit/classes/firewall_linux_spec.rb": "f005992268d40b739e7cafa3b0f703e4",
|
||||
"spec/unit/classes/firewall_spec.rb": "9f843d1b925a806f5480e9a882da1477",
|
||||
"spec/unit/documentation/readme_spec.rb": "ebe547b0051099281904dad3c5413de8",
|
||||
"spec/unit/facter/iptables_persistent_version_spec.rb": "b5c32d4e2fa97cba4b20008924a2a45b",
|
||||
"spec/unit/facter/iptables_spec.rb": "ee1ee01c6fcacdc23f9a85a3b147ee98",
|
||||
"spec/unit/puppet/provider/ip6tables_spec.rb": "ceee1675b92d9b391d23379064d6a343",
|
||||
"spec/unit/puppet/provider/iptables_chain_spec.rb": "0fca1374172197039fcdf5e50531257a",
|
||||
"spec/unit/puppet/provider/iptables_spec.rb": "879515cd209fe4ba45bbf776fcc224a0",
|
||||
"spec/unit/puppet/type/firewall_spec.rb": "b8cf31b88d7b4f692e8fc4dca8b31be4",
|
||||
"spec/unit/puppet/type/firewallchain_spec.rb": "67b78ef4df1e4868adb87b2cb7e19e20",
|
||||
"spec/unit/puppet/util/firewall_spec.rb": "4480171573cff443782a9f2e39ec64d7",
|
||||
"spec/unit/puppet/util/ipcidr_spec.rb": "c6c8097b4779aae250e38d8d8492ca32"
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
--- {}
|
||||
@ -0,0 +1,21 @@
|
||||
---
|
||||
version: 5
|
||||
|
||||
defaults: # Used for any hierarchy level that omits these keys.
|
||||
datadir: data # This path is relative to hiera.yaml's directory.
|
||||
data_hash: yaml_data # Use the built-in YAML backend.
|
||||
|
||||
hierarchy:
|
||||
- name: "osfamily/major release"
|
||||
paths:
|
||||
# Used to distinguish between Debian and Ubuntu
|
||||
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
|
||||
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
|
||||
# Used for Solaris
|
||||
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
|
||||
- name: "osfamily"
|
||||
paths:
|
||||
- "os/%{facts.os.name}.yaml"
|
||||
- "os/%{facts.os.family}.yaml"
|
||||
- name: 'common'
|
||||
path: 'common.yaml'
|
||||