Skip to content

Commit

Permalink
Manage gemfile. Manage lint rules explicitly.
Browse files Browse the repository at this point in the history
  • Loading branch information
gibbs committed Jul 11, 2022
1 parent f425e59 commit 8cf319a
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 17 deletions.
41 changes: 40 additions & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,54 @@ appveyor.yml:
- /[Bb]ackup*/
- /provision.yaml
Gemfile:
unmanaged: true
unmanaged: false
optional:
':development':
- gem: 'github_changelog_generator'
version: '~> 1.15'
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
- gem: 'puppet-lint-file_ensure-check'
require: false
- gem: 'puppet-lint-manifest_whitespace-check'
require: false
- gem: 'puppet-lint-trailing_comma-check'
require: false
- gem: 'puppet-lint-optional_default-check'
require: false
spec/spec_helper.rb:
coverage_report: true
spec_overrides:
- 'RSpec.configure do |c|'
- ' c.facter_implementation = :rspec'
- 'end'
.puppet-lint.rc:
enabled_lint_checks:
- 140chars
- 2sp_soft_tabs
- arrow_alignment
- class_inherits_from_params_class
- double_quoted_strings
- duplicate_params
- file_ensure
- file_mode
- hard_tabs
- leading_zero
- manifest_whitespace_opening_brace_after
- nested_classes_or_defines
- only_variable_string
- optional_default
- parameter_documentation
- parameter_order
- parameter_types
- quoted_booleans
- right_to_left_relationship
- slash_comments
- star_comments
# - strict_indent
- trailing_comma
- trailing_whitespace
- unquoted_file_mode
- variable_contains_dash
- variable_is_lowercase
- variable_scope
- variables_not_enclosed
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,17 @@ group :development do
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "github_changelog_generator", '~> 1.15', require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
gem "puppet-lint-file_ensure-check", require: false
gem "puppet-lint-manifest_whitespace-check", require: false
gem "puppet-lint-trailing_comma-check", require: false
gem "puppet-lint-optional_default-check", require: false
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
3 changes: 1 addition & 2 deletions manifests/audisp.pp
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@
Stdlib::Filemode $plugin_dir_mode = '0750',
Variant[String[1], Integer] $plugin_dir_owner = 0,
Variant[String[1], Integer] $plugin_dir_group = 0,
Optional[Hash[String, Auditd::Plugins]] $plugins = {},
Hash[String, Auditd::Plugins] $plugins = {},
) inherits auditd {

if $package_manage {
package { $package_name:
ensure => $package_ensure,
Expand Down
5 changes: 2 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
Stdlib::Filemode $plugin_dir_mode = '0750',
Variant[String[1], Integer] $plugin_dir_owner = 0,
Variant[String[1], Integer] $plugin_dir_group = 0,
Optional[Hash[String, Auditd::Plugins]] $plugins = {},
Hash[String, Auditd::Plugins] $plugins = {},
Stdlib::Absolutepath $rules_dir = '/etc/audit/rules.d',
Stdlib::Filemode $rules_dir_mode = '0750',
Variant[String[1], Integer] $rules_dir_owner = 0,
Expand All @@ -138,9 +138,8 @@
Stdlib::Filemode $rules_file_mode = '0600',
Variant[String[1], Integer] $rules_file_owner = 0,
Variant[String[1], Integer] $rules_file_group = 0,
Optional[Hash[String, Auditd::Rules]] $rules = {},
Hash[String, Auditd::Rules] $rules = {},
) {

contain auditd::package
contain auditd::config
contain auditd::service
Expand Down
17 changes: 8 additions & 9 deletions manifests/plugin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@
#
define auditd::plugin (
Variant[Stdlib::Absolutepath, String] $path,
Enum['yes', 'no'] $active = 'yes',
Enum['in', 'out'] $direction = 'out',
Enum['builtin', 'always'] $type = 'always',
Optional[String] $args = undef,
Enum['binary', 'string'] $format = 'string',
Enum['yes', 'no'] $active = 'yes',
Enum['in', 'out'] $direction = 'out',
Enum['builtin', 'always'] $type = 'always',
Optional[String] $args = undef,
Enum['binary', 'string'] $format = 'string',
Enum['auditd', 'audisp'] $plugin_type = 'auditd',
Stdlib::Filemode $mode = '0600',
Variant[String, Integer] $owner = 0,
Variant[String, Integer] $group = 0,
Stdlib::Filemode $mode = '0600',
Variant[String, Integer] $owner = 0,
Variant[String, Integer] $group = 0,
) {

$plugin_path = ($plugin_type == 'audisp') ? {
true => $auditd::audisp::plugin_dir,
default => $auditd::plugin_dir,
Expand Down
3 changes: 1 addition & 2 deletions manifests/rule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
String $content = '',
Integer[1, 100] $order = 10,
) {

$rule_content = ($content == '') ? {
$rule_content = ($content == undef or $content == '') ? {
true => sprintf("%s\n\n", $name),
default => sprintf("# %s\n%s\n\n", $name, $content),
}
Expand Down
2 changes: 2 additions & 0 deletions pdk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
ignore: []

0 comments on commit 8cf319a

Please sign in to comment.