-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #338 from wazuh/release-4.0.4
Release 4.0.4
- Loading branch information
Showing
43 changed files
with
539 additions
and
292 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| fixtures: | ||
| forge_modules: | ||
| stdlib: | ||
| repo: "puppetlabs/stdlib" | ||
| ref: "4.13.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| .git/ | ||
| .*.sw[op] | ||
| .metadata | ||
| .yardoc | ||
| .yardwarns | ||
| *.iml | ||
| /.bundle/ | ||
| /.idea/ | ||
| /.vagrant/ | ||
| /coverage/ | ||
| /bin/ | ||
| /doc/ | ||
| /Gemfile.local | ||
| /Gemfile.lock | ||
| /junit/ | ||
| /log/ | ||
| /pkg/ | ||
| /spec/fixtures/manifests/ | ||
| /spec/fixtures/modules/ | ||
| /tmp/ | ||
| /vendor/ | ||
| /convert_report.txt | ||
| /update_report.txt | ||
| .DS_Store | ||
| .project | ||
| .envrc | ||
| /inventory.yaml | ||
| /appveyor.yml | ||
| /.fixtures.yml | ||
| /Gemfile | ||
| /.gitattributes | ||
| /.gitignore | ||
| /.gitlab-ci.yml | ||
| /.pdkignore | ||
| /Rakefile | ||
| /rakelib/ | ||
| /.rspec | ||
| /.rubocop.yml | ||
| /.travis.yml | ||
| /.yardopts | ||
| /spec/ | ||
| /.vscode/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| --- | ||
| require: | ||
| - rubocop-rspec | ||
| - rubocop-i18n | ||
| AllCops: | ||
| DisplayCopNames: true | ||
| TargetRubyVersion: '2.1' | ||
| Include: | ||
| - "./**/*.rb" | ||
| Exclude: | ||
| - bin/* | ||
| - ".vendor/**/*" | ||
| - "**/Gemfile" | ||
| - "**/Rakefile" | ||
| - pkg/**/* | ||
| - spec/fixtures/**/* | ||
| - vendor/**/* | ||
| - "**/Puppetfile" | ||
| - "**/Vagrantfile" | ||
| - "**/Guardfile" | ||
| Metrics/LineLength: | ||
| Description: People have wide screens, use them. | ||
| Max: 200 | ||
| GetText: | ||
| Enabled: false | ||
| GetText/DecorateString: | ||
| Description: We don't want to decorate test output. | ||
| Exclude: | ||
| - spec/**/* | ||
| Enabled: false | ||
| RSpec/BeforeAfterAll: | ||
| Description: Beware of using after(:all) as it may cause state to leak between tests. | ||
| A necessary evil in acceptance testing. | ||
| Exclude: | ||
| - spec/acceptance/**/*.rb | ||
| RSpec/HookArgument: | ||
| Description: Prefer explicit :each argument, matching existing module's style | ||
| EnforcedStyle: each | ||
| Style/BlockDelimiters: | ||
| Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to | ||
| be consistent then. | ||
| EnforcedStyle: braces_for_chaining | ||
| Style/BracesAroundHashParameters: | ||
| Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0. | ||
| See https://github.com/rubocop-hq/rubocop/pull/7643 | ||
| Enabled: true | ||
| Style/ClassAndModuleChildren: | ||
| Description: Compact style reduces the required amount of indentation. | ||
| EnforcedStyle: compact | ||
| Style/EmptyElse: | ||
| Description: Enforce against empty else clauses, but allow `nil` for clarity. | ||
| EnforcedStyle: empty | ||
| Style/FormatString: | ||
| Description: Following the main puppet project's style, prefer the % format format. | ||
| EnforcedStyle: percent | ||
| Style/FormatStringToken: | ||
| Description: Following the main puppet project's style, prefer the simpler template | ||
| tokens over annotated ones. | ||
| EnforcedStyle: template | ||
| Style/Lambda: | ||
| Description: Prefer the keyword for easier discoverability. | ||
| EnforcedStyle: literal | ||
| Style/RegexpLiteral: | ||
| Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168 | ||
| EnforcedStyle: percent_r | ||
| Style/TernaryParentheses: | ||
| Description: Checks for use of parentheses around ternary conditions. Enforce parentheses | ||
| on complex expressions for better readability, but seriously consider breaking | ||
| it up. | ||
| EnforcedStyle: require_parentheses_when_complex | ||
| Style/TrailingCommaInArguments: | ||
| Description: Prefer always trailing comma on multiline argument lists. This makes | ||
| diffs, and re-ordering nicer. | ||
| EnforcedStyleForMultiline: comma | ||
| Style/TrailingCommaInLiteral: | ||
| Description: Prefer always trailing comma on multiline literals. This makes diffs, | ||
| and re-ordering nicer. | ||
| EnforcedStyleForMultiline: comma | ||
| Style/SymbolArray: | ||
| Description: Using percent style obscures symbolic intent of array's contents. | ||
| EnforcedStyle: brackets | ||
| RSpec/MessageSpies: | ||
| EnforcedStyle: receive | ||
| Style/Documentation: | ||
| Exclude: | ||
| - lib/puppet/parser/functions/**/* | ||
| - spec/**/* | ||
| Style/WordArray: | ||
| EnforcedStyle: brackets | ||
| Style/CollectionMethods: | ||
| Enabled: true | ||
| Style/MethodCalledOnDoEndBlock: | ||
| Enabled: true | ||
| Style/StringMethods: | ||
| Enabled: true | ||
| GetText/DecorateFunctionMessage: | ||
| Enabled: false | ||
| GetText/DecorateStringFormattingUsingInterpolation: | ||
| Enabled: false | ||
| GetText/DecorateStringFormattingUsingPercent: | ||
| Enabled: false | ||
| Layout/EndOfLine: | ||
| Enabled: false | ||
| Layout/IndentHeredoc: | ||
| Enabled: false | ||
| Metrics/AbcSize: | ||
| Enabled: false | ||
| Metrics/BlockLength: | ||
| Enabled: false | ||
| Metrics/ClassLength: | ||
| Enabled: false | ||
| Metrics/CyclomaticComplexity: | ||
| Enabled: false | ||
| Metrics/MethodLength: | ||
| Enabled: false | ||
| Metrics/ModuleLength: | ||
| Enabled: false | ||
| Metrics/ParameterLists: | ||
| Enabled: false | ||
| Metrics/PerceivedComplexity: | ||
| Enabled: false | ||
| RSpec/DescribeClass: | ||
| Enabled: false | ||
| RSpec/ExampleLength: | ||
| Enabled: false | ||
| RSpec/MessageExpectation: | ||
| Enabled: false | ||
| RSpec/MultipleExpectations: | ||
| Enabled: false | ||
| RSpec/NestedGroups: | ||
| Enabled: false | ||
| Style/AsciiComments: | ||
| Enabled: false | ||
| Style/IfUnlessModifier: | ||
| Enabled: false | ||
| Style/SymbolProc: | ||
| Enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| WAZUH-PUPPET_VERSION="v4.0.3" | ||
| REVISION="40003" | ||
| WAZUH-PUPPET_VERSION="v4.0.4" | ||
| REVISION="40004" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| --- | ||
| --- {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,29 @@ | ||
| describe package('wazuh-agent') do | ||
| it { is_expected.to be_installed } | ||
| its('version') { is_expected.to eq '4.0.3-1' } | ||
| end | ||
| control 'wazuh-agent' do | ||
| title 'Wazuh agent tests' | ||
| describe 'Checks Wazuh agent correct version, services and daemon ownership' | ||
|
|
||
| describe service('wazuh-agent') do | ||
| it { is_expected.to be_installed } | ||
| it { is_expected.to be_enabled } | ||
| it { is_expected.to be_running } | ||
| end | ||
| describe package('wazuh-agent') do | ||
| it { is_expected.to be_installed } | ||
| its('version') { is_expected.to eq '4.0.4-1' } | ||
| end | ||
|
|
||
| # Verifying daemons | ||
| describe service('wazuh-agent') do | ||
| it { is_expected.to be_installed } | ||
| it { is_expected.to be_enabled } | ||
| it { is_expected.to be_running } | ||
| end | ||
|
|
||
| wazuh_daemons = { | ||
| # 'ossec-agentd' => 'ossec', | ||
| 'ossec-execd' => 'root', | ||
| # 'ossec-syscheckd' => 'root', | ||
| # 'wazuh-modulesd' => 'root', | ||
| } | ||
| # Verifying daemons | ||
| wazuh_daemons = { | ||
| # 'ossec-agentd' => 'ossec', | ||
| 'ossec-execd' => 'root', | ||
| # 'ossec-syscheckd' => 'root', | ||
| # 'wazuh-modulesd' => 'root', | ||
| } | ||
|
|
||
| wazuh_daemons.each do |key, value| | ||
| describe processes(key) do | ||
| its('users') { is_expected.to eq [value] } | ||
| wazuh_daemons.each do |key, value| | ||
| describe processes(key) do | ||
| its('users') { is_expected.to eq [value] } | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.