diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 168a5cb..08c6abf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,4 +1,3 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the { "name": "VoxBox", "image": "ghcr.io/voxpupuli/voxbox:latest" diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml new file mode 100644 index 0000000..c835e75 --- /dev/null +++ b/.github/workflows/create_tag.yml @@ -0,0 +1,22 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +name: Create Git tag + +on: + workflow_dispatch: + +permissions: {} + +jobs: + create_tag: + uses: 'voxpupuli/gha-puppet/.github/workflows/create_tag.yml@v4' + with: + allowed_owner: 'voxpupuli' + git_name: 'pccibot' + git_email: '12855858+pccibot@users.noreply.github.com' + secrets: + # Configure secrets here: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets + ssh_private_key: ${{ secrets.PCCI_SSH_PRIVATE_KEY }} diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 2e3cc68..b372531 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -17,11 +17,14 @@ permissions: jobs: release_prep: - uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3' + uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v4' with: version: ${{ github.event.inputs.version }} allowed_owner: 'voxpupuli' + git_name: 'pccibot' + git_email: '12855858+pccibot@users.noreply.github.com' secrets: # Configure secrets here: # https://docs.github.com/en/actions/security-guides/encrypted-secrets github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}' + ssh_private_key: '${{ secrets.PCCI_SSH_PRIVATE_KEY }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a8b1b1..9062a93 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,9 @@ name: Release on: push: tags: - - '*' + # https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#onpushbranchestagsbranches-ignoretags-ignore + # https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet + - 'v[0-9]+.[0-9]+.[0-9]+' permissions: contents: write @@ -16,7 +18,7 @@ permissions: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v4 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index 179bafc..fae75b0 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '10.5.0' +modulesync_config_version: '10.7.0' diff --git a/.rubocop.yml b/.rubocop.yml index 53ac189..ea22bff 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ --- +inherit_from: .rubocop_todo.yml + # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 0000000..43c06c7 --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,14 @@ +# This configuration was generated by +# `rubocop --auto-gen-config --no-auto-gen-timestamp` +# using RuboCop version 1.85.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 9 +RSpec/LeakyLocalVariable: + Exclude: + - 'spec/defines/auth_param_spec.rb' + - 'spec/defines/extra_config_section_spec.rb' + - 'spec/defines/refresh_pattern_spec.rb' diff --git a/Gemfile b/Gemfile index 5f69bec..e0c8581 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 13.0', :require => false + gem 'voxpupuli-test', '~> 14.0', :require => false gem 'puppet_metadata', '~> 6.0', :require => false end @@ -18,7 +18,7 @@ group :system_tests do end group :release do - gem 'voxpupuli-release', '~> 5.0', :require => false + gem 'voxpupuli-release', '~> 5.3', :require => false end gem 'rake', :require => false diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index ed614b2..76cc518 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -9,11 +9,11 @@ end let(:etc_dir) do - facts[:kernel] == 'FreeBSD' ? '/usr/local/etc' : '/etc' + (facts[:kernel] == 'FreeBSD') ? '/usr/local/etc' : '/etc' end let(:config_group) do - facts[:os]['family'] == 'Debian' ? 'root' : 'squid' + (facts[:os]['family'] == 'Debian') ? 'root' : 'squid' end context 'with defaults for all parameters' do @@ -44,7 +44,7 @@ { 'module' => 'daemon', 'entries' => '/var/log/squid/access.log squid', - } + }, ) } end @@ -66,7 +66,7 @@ workers: 8, url_rewrite_program: '/some/test/program', url_rewrite_children: 16, - url_rewrite_child_options: 'testoption=a' + url_rewrite_child_options: 'testoption=a', } end @@ -89,7 +89,7 @@ { 'module' => 'daemon', 'entries' => %w[bar baz], - } + }, ) } end @@ -98,7 +98,7 @@ let :params do { config: '/tmp/squid.conf', - logformat: ['squid_test_1 %ts.%03tu %6tr', 'squid_test_2 %ts.%03tu duration=%tr'] + logformat: ['squid_test_1 %ts.%03tu %6tr', 'squid_test_2 %ts.%03tu duration=%tr'], } end @@ -110,7 +110,7 @@ let :params do { config: '/tmp/squid.conf', - access_log: ['daemon:foo', { module: 'syslog', entries: %w[foo bar] }] + access_log: ['daemon:foo', { module: 'syslog', entries: %w[foo bar] }], } end @@ -119,7 +119,7 @@ { 'module' => 'daemon', 'entries' => 'foo', - } + }, ) } @@ -128,7 +128,7 @@ { 'module' => 'syslog', 'entries' => %w[foo bar], - } + }, ) } end @@ -137,7 +137,7 @@ let :params do { config: '/tmp/squid.conf', - buffered_logs: true + buffered_logs: true, } end @@ -148,7 +148,7 @@ let :params do { config: '/tmp/squid.conf', - buffered_logs: false + buffered_logs: false, } end @@ -159,7 +159,7 @@ let :params do { config: '/tmp/squid.conf', - memory_cache_shared: true + memory_cache_shared: true, } end @@ -170,7 +170,7 @@ let :params do { config: '/tmp/squid.conf', - error_directory: '/some/path/file' + error_directory: '/some/path/file', } end @@ -181,7 +181,7 @@ let :params do { config: '/tmp/squid.conf', - err_page_stylesheet: '/some/path/file' + err_page_stylesheet: '/some/path/file', } end @@ -192,7 +192,7 @@ let :params do { config: '/tmp/squid.conf', - memory_cache_shared: 'on' + memory_cache_shared: 'on', } end @@ -203,7 +203,7 @@ let :params do { config: '/tmp/squid.conf', - memory_cache_shared: false + memory_cache_shared: false, } end @@ -214,7 +214,7 @@ let :params do { config: '/tmp/squid.conf', - memory_cache_shared: 'off' + memory_cache_shared: 'off', } end @@ -225,7 +225,7 @@ let :params do { config: '/tmp/squid.conf', - forwarded_for: 'off' + forwarded_for: 'off', } end @@ -236,7 +236,7 @@ let :params do { config: '/tmp/squid.conf', - forwarded_for: 'on' + forwarded_for: 'on', } end @@ -247,7 +247,7 @@ let :params do { config: '/tmp/squid.conf', - forwarded_for: 'delete' + forwarded_for: 'delete', } end @@ -258,7 +258,7 @@ let :params do { config: '/tmp/squid.conf', - forwarded_for: 'transparent' + forwarded_for: 'transparent', } end @@ -269,7 +269,7 @@ let :params do { config: '/tmp/squid.conf', - cache_replacement_policy: 'LRU' + cache_replacement_policy: 'LRU', } end @@ -280,7 +280,7 @@ let :params do { config: '/tmp/squid.conf', - memory_replacement_policy: 'LRU' + memory_replacement_policy: 'LRU', } end @@ -295,9 +295,9 @@ 'myacl' => { 'type' => 'urlregex', 'order' => '07', - 'entries' => ['http://example.org/', 'http://example.com/'] - } - } + 'entries' => ['http://example.org/', 'http://example.com/'], + }, + }, } end @@ -315,14 +315,14 @@ 'myacl' => { 'type' => 'urlregex', 'order' => '07', - 'entries' => ['http://example.org/', 'http://example.com/'] + 'entries' => ['http://example.org/', 'http://example.com/'], }, 'mysecondacl' => { 'type' => 'urlregex', 'order' => '08', - 'entries' => ['http://example2.org/', 'http://example2.com/'] - } - } + 'entries' => ['http://example2.org/', 'http://example2.com/'], + }, + }, } end @@ -343,9 +343,9 @@ 'myrule' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' - } - } + 'order' => '08', + }, + }, } end @@ -363,9 +363,9 @@ 'myacl' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' - } - } + 'order' => '08', + }, + }, } end @@ -383,15 +383,15 @@ 'myrule' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' + 'order' => '08', }, 'secondrule' => { 'action' => 'deny', 'value' => 'this too', 'order' => '09', - 'comment' => 'Deny this and too' - } - } + 'comment' => 'Deny this and too', + }, + }, } end @@ -415,15 +415,15 @@ 'myrule' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' + 'order' => '08', }, 'secondrule' => { 'action' => 'deny', 'value' => 'this too', 'order' => '09', - 'comment' => 'Deny this and too' - } - } + 'comment' => 'Deny this and too', + }, + }, } end @@ -447,9 +447,9 @@ 'myrule' => { 'action' => 'bump', 'value' => 'step1', - 'order' => '08' - } - } + 'order' => '08', + }, + }, } end @@ -467,9 +467,9 @@ 'myrule' => { 'action' => 'allow', 'value' => 'all', - 'order' => '08' - } - } + 'order' => '08', + }, + }, } end @@ -487,9 +487,9 @@ 'myrule' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' - } - } + 'order' => '08', + }, + }, } end @@ -507,14 +507,14 @@ 'myrule' => { 'action' => 'deny', 'value' => 'this and that', - 'order' => '08' + 'order' => '08', }, 'secondrule' => { 'action' => 'deny', 'value' => 'this too', - 'order' => '09' - } - } + 'order' => '09', + }, + }, } end @@ -531,7 +531,7 @@ context 'with http_port parameters set' do let :params do { config: '/tmp/squid.conf', - http_ports: { 2000 => { 'options' => 'special for 2000' } } } + http_ports: { 2000 => { 'options' => 'special for 2000' } }, } end it { is_expected.to contain_concat_fragment('squid_header').with_target('/tmp/squid.conf') } @@ -542,7 +542,7 @@ context 'with https_port parameters set' do let :params do { config: '/tmp/squid.conf', - https_ports: { 2001 => { 'options' => 'special for 2001' } } } + https_ports: { 2001 => { 'options' => 'special for 2001' } }, } end it { is_expected.to contain_concat_fragment('squid_header').with_target('/tmp/squid.conf') } @@ -554,7 +554,7 @@ context 'with http_port parameters set + SELINUX' do let :params do { config: '/tmp/squid.conf', - http_ports: { 2000 => { 'options' => 'special for 2000' } } } + http_ports: { 2000 => { 'options' => 'special for 2000' } }, } end let(:facts) { override_facts(super(), os: { selinux: { enabled: true } }) } @@ -567,7 +567,7 @@ context 'with https_port parameters set' do let :params do { config: '/tmp/squid.conf', - https_ports: { 2001 => { 'options' => 'special for 2001' } } } + https_ports: { 2001 => { 'options' => 'special for 2001' } }, } end let(:facts) { override_facts(super(), os: { selinux: { enabled: true } }) } @@ -580,7 +580,7 @@ context 'with duplicate ports on different ip' do let :params do { config: '/tmp/squid.conf', - http_ports: { 'ipA' => { 'port' => 3128, 'host' => '192.168.1.10' }, 'ipB' => { 'port' => 3128, 'host' => '192.168.1.11' } } } + http_ports: { 'ipA' => { 'port' => 3128, 'host' => '192.168.1.10' }, 'ipB' => { 'port' => 3128, 'host' => '192.168.1.11' } }, } end let(:facts) { override_facts(super(), os: { selinux: { enabled: true } }) } @@ -597,7 +597,7 @@ let :params do { config: '/tmp/squid.conf', cache_dirs: { '/data' => { 'type' => 'special', - 'options' => 'my options for special type' } } } + 'options' => 'my options for special type', } }, } end let(:facts) { override_facts(super(), os: { selinux: { enabled: true } }) } @@ -612,7 +612,7 @@ let :params do { config: '/tmp/squid.conf', - snmp_incoming_address: '4.2.2.2' + snmp_incoming_address: '4.2.2.2', } end @@ -623,7 +623,7 @@ let :params do { config: '/tmp/squid.conf', snmp_ports: { 2000 => { 'options' => 'special for 2000', - 'process_number' => 3 } } } + 'process_number' => 3, } }, } end it { is_expected.to contain_concat_fragment('squid_header').with_target('/tmp/squid.conf') } @@ -636,7 +636,7 @@ let :params do { config: '/tmp/squid.conf', cache_dirs: { '/data' => { 'type' => 'special', - 'options' => 'my options for special type' } } } + 'options' => 'my options for special type', } }, } end it { is_expected.to contain_concat_fragment('squid_header').with_target('/tmp/squid.conf') } @@ -652,16 +652,16 @@ 'order' => '22', 'config_entries' => { 'mail_from' => 'squid@example.com', - 'mail_program' => 'mail' - } + 'mail_program' => 'mail', + }, }, 'other settings' => { 'order' => '42', 'config_entries' => { - 'dns_timeout' => '5 seconds' - } - } - } + 'dns_timeout' => '5 seconds', + }, + }, + }, } end diff --git a/spec/defines/access_log_spec.rb b/spec/defines/access_log_spec.rb index 57187c7..e62dfdf 100644 --- a/spec/defines/access_log_spec.rb +++ b/spec/defines/access_log_spec.rb @@ -31,7 +31,7 @@ 'target' => '/tmp/squid.conf', 'content' => %r{^access_log syslog:foo$}, 'order' => '38-57-syslog', - } + }, ) } @@ -41,7 +41,7 @@ 'target' => '/tmp/squid.conf', 'content' => %r{^access_log syslog:bar$}, 'order' => '38-57-syslog', - } + }, ) } end diff --git a/spec/defines/acl_spec.rb b/spec/defines/acl_spec.rb index 70b6413..c6f6055 100644 --- a/spec/defines/acl_spec.rb +++ b/spec/defines/acl_spec.rb @@ -22,7 +22,7 @@ type: 'urlregex', order: '07', entries: ['http://example.org/', 'http://example.com/'], - comment: 'Example company website' + comment: 'Example company website', } end @@ -39,7 +39,7 @@ type: 'ssl::servername', order: '07', entries: ['.foo.bar'], - comment: 'Example company website' + comment: 'Example company website', } end diff --git a/spec/defines/auth_param_spec.rb b/spec/defines/auth_param_spec.rb index f685c94..749f4d2 100644 --- a/spec/defines/auth_param_spec.rb +++ b/spec/defines/auth_param_spec.rb @@ -20,13 +20,13 @@ entries = ['program /usr/lib64/squid/basic_ncsa_auth /etc/squid/.htpasswd', 'children 5', 'realm Squid Basic Authentication', - 'credentialsttl 5 hours'] + 'credentialsttl 5 hours',] let(:params) do { scheme: 'basic', order: '07', - entries: entries + entries: entries, } end @@ -42,13 +42,13 @@ entries = ['program /usr/lib64/squid/basic_ncsa_auth /etc/squid/.htpasswd', 'children 5', 'realm Squid Digest Authentication', - 'credentialsttl 5 hours'] + 'credentialsttl 5 hours',] let(:params) do { scheme: 'digest', order: '08', - entries: entries + entries: entries, } end @@ -67,7 +67,7 @@ { scheme: 'unknown_scheme', order: '09', - entries: entries + entries: entries, } end diff --git a/spec/defines/cache_dir_spec.rb b/spec/defines/cache_dir_spec.rb index 90c6ada..f53b48f 100644 --- a/spec/defines/cache_dir_spec.rb +++ b/spec/defines/cache_dir_spec.rb @@ -22,7 +22,7 @@ type: 'special', order: '07', process_number: 2, - options: 'my options for special type' + options: 'my options for special type', } end @@ -57,7 +57,7 @@ { type: 'special', order: '07', - options: 'my options for special type' + options: 'my options for special type', } end diff --git a/spec/defines/cache_spec.rb b/spec/defines/cache_spec.rb index 5683ebf..4f6acbd 100644 --- a/spec/defines/cache_spec.rb +++ b/spec/defines/cache_spec.rb @@ -29,7 +29,7 @@ action: 'deny', value: 'this and that', order: '08', - comment: 'Deny this and that' + comment: 'Deny this and that', } end @@ -42,7 +42,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/extra_config_section_spec.rb b/spec/defines/extra_config_section_spec.rb index f8fcdd7..101f35b 100644 --- a/spec/defines/extra_config_section_spec.rb +++ b/spec/defines/extra_config_section_spec.rb @@ -22,8 +22,8 @@ config_entries: { 'ssl_bump' => 'server-first all', 'sslcrtd_program' => '/usr/lib64/squid/ssl_crtd -s /var/lib/ssl_db -M 4MB', - 'sslcrtd_children' => '8 startup=1 idle=1' - } + 'sslcrtd_children' => '8 startup=1 idle=1', + }, } end @@ -48,8 +48,8 @@ config_entries: { 'ssl_bump' => %w[server-first all], 'sslcrtd_program' => ['/usr/lib64/squid/ssl_crtd', '-s', '/var/lib/ssl_db', '-M', '4MB'], - 'sslcrtd_children' => ['8', 'startup=1', 'idle=1'] - } + 'sslcrtd_children' => ['8', 'startup=1', 'idle=1'], + }, } end @@ -71,8 +71,8 @@ config_entries: [{ 'always_direct' => ['deny www.reallyreallybadplace.com', 'allow my-good-dst', - 'allow my-other-good-dst'] - }] + 'allow my-other-good-dst',], + }], } end diff --git a/spec/defines/http_access_spec.rb b/spec/defines/http_access_spec.rb index 30c17da..0d1ce89 100644 --- a/spec/defines/http_access_spec.rb +++ b/spec/defines/http_access_spec.rb @@ -29,7 +29,7 @@ action: 'deny', value: 'this and that', order: '08', - comment: 'Deny this and that' + comment: 'Deny this and that', } end @@ -42,7 +42,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/http_port_spec.rb b/spec/defines/http_port_spec.rb index 500812f..ee18526 100644 --- a/spec/defines/http_port_spec.rb +++ b/spec/defines/http_port_spec.rb @@ -63,7 +63,7 @@ let(:title) { 'host:1650' } let(:params) do { - port: 1650 + port: 1650, } end @@ -88,7 +88,7 @@ let(:title) { 'garbage' } let(:params) do { - host: 'host' + host: 'host', } end @@ -100,7 +100,7 @@ let(:params) do { port: 1700, - host: '127.0.0.1' + host: '127.0.0.1', } end @@ -113,7 +113,7 @@ { port: 2000, options: 'special for 2000', - order: '08' + order: '08', } end @@ -127,7 +127,7 @@ let(:params) do { port: 2100, - host: 'host' + host: 'host', } end @@ -138,7 +138,7 @@ let(:title) { '3000' } let(:params) do { - ssl: true + ssl: true, } end diff --git a/spec/defines/https_port_spec.rb b/spec/defines/https_port_spec.rb index 013a6c2..5e30335 100644 --- a/spec/defines/https_port_spec.rb +++ b/spec/defines/https_port_spec.rb @@ -17,7 +17,7 @@ let(:title) { '4000' } let(:params) do { - options: 'some options' + options: 'some options', } end diff --git a/spec/defines/icp_access_spec.rb b/spec/defines/icp_access_spec.rb index 6b949e5..2a81409 100644 --- a/spec/defines/icp_access_spec.rb +++ b/spec/defines/icp_access_spec.rb @@ -27,7 +27,7 @@ { action: 'deny', value: 'this and that', - order: '08' + order: '08', } end @@ -39,7 +39,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/refresh_pattern_spec.rb b/spec/defines/refresh_pattern_spec.rb index 627e388..9751fdf 100644 --- a/spec/defines/refresh_pattern_spec.rb +++ b/spec/defines/refresh_pattern_spec.rb @@ -23,7 +23,7 @@ max: 10_080, min: 1440, percent: 20, - comment: 'Refresh Patterns' + comment: 'Refresh Patterns', } end @@ -42,7 +42,7 @@ min: 1440, percent: 20, options: 'override-expire ignore-no-cache', - comment: 'Refresh Patterns' + comment: 'Refresh Patterns', } end @@ -61,7 +61,7 @@ max: 0, min: 0, order: '07', - percent: 0 + percent: 0, } end diff --git a/spec/defines/send_hit_spec.rb b/spec/defines/send_hit_spec.rb index 2791002..ecdb832 100644 --- a/spec/defines/send_hit_spec.rb +++ b/spec/defines/send_hit_spec.rb @@ -29,7 +29,7 @@ action: 'deny', value: 'this and that', order: '03', - comment: 'send_hit this and that' + comment: 'send_hit this and that', } end @@ -42,7 +42,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/snmp_access_spec.rb b/spec/defines/snmp_access_spec.rb index 32a55eb..2f6192b 100644 --- a/spec/defines/snmp_access_spec.rb +++ b/spec/defines/snmp_access_spec.rb @@ -29,7 +29,7 @@ action: 'deny', value: 'this and that', order: '08', - comment: 'Deny this and that' + comment: 'Deny this and that', } end @@ -42,7 +42,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/snmp_port_spec.rb b/spec/defines/snmp_port_spec.rb index 55f47bb..25a8c7e 100644 --- a/spec/defines/snmp_port_spec.rb +++ b/spec/defines/snmp_port_spec.rb @@ -30,7 +30,7 @@ port: 2000, options: 'special for 2000', order: '08', - process_number: 3 + process_number: 3, } end diff --git a/spec/defines/ssl_bump_spec.rb b/spec/defines/ssl_bump_spec.rb index b01f77a..cfea913 100644 --- a/spec/defines/ssl_bump_spec.rb +++ b/spec/defines/ssl_bump_spec.rb @@ -27,7 +27,7 @@ { action: 'peek', value: 'step1', - order: '08' + order: '08', } end @@ -39,7 +39,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end diff --git a/spec/defines/sslproxy_cert_error_spec.rb b/spec/defines/sslproxy_cert_error_spec.rb index cbc8a2a..c39846f 100644 --- a/spec/defines/sslproxy_cert_error_spec.rb +++ b/spec/defines/sslproxy_cert_error_spec.rb @@ -27,7 +27,7 @@ { action: 'deny', value: 'this and that', - order: '08' + order: '08', } end @@ -39,7 +39,7 @@ context 'with unknown action' do let(:params) do { - action: 'unknown_action' + action: 'unknown_action', } end