Skip to content

Commit 12db4ae

Browse files
xenon8Darren Gipsonfanny-jiangnielstholenaarrtrieu
authored
upgrade to Puppet 8 and PDK version to 3.4 (#823)
* add parameter data types, fix whitespacing, remove legacy facts, remove legacy :: referencing. Changes for Puppet 8 * update linting rules * added missing data types, removed optional when we defaulting things. prettied the code. * add default extensions * optional param should not be optional if using default. prettied things * now that we support Puppet 8, we should support stdlib v9. add linting no check for empty strings * upgrade pdk version to 3.4 * controlling versions of io-console (as 0.8 is built for Ruby 3.3) and bcrypt_pbkdf 1.1 fails to install with Ruby 3.2.5 * update the reference to concat to support later versions of stdlib * update to new stdlib function * fixes requested by code review * remove deprecated function, moving to is_a * version comparison is working with a int not a string * making optional following code review * revert versioncmp changes made by pdk validate * removing linting check for use of versioning as we use integers for versionning not strings * update module dependencies to support Puppet 8 * fixed class documentation and made params optional * fix all optional references to undef calls. fix warnings about no class docs due to space between class declaration and docs * fix for unless command * fix pdk validation warnings * made sitename required * making url required. * correcting default on min collection interval * making check name required. * making host required * making port required * fix gemfile for ruby < 3.1 and puppet 7; bump bundler to v2.4.13 in CI * update deps * exclude EOL versions from CI * update gemfile.lock and .gitignore * Convert unless command into HereDoc command, fix issue where MSI path is not passed correctly. * Update to change log and version * fix config * update ci specs * use ruby 2.6+ puppet 6.5+ in ci * remove gemfile.lock before installing bundler * clean up circleci, update gemfile.lock * rm .vscode * use ruby 2.7+ puppet 6.5+ in ci * update Gemfile.lock * debug bundler version * add linux deps for ci * config.yml cleanup * review suggestions * update gemfile.lock and target ruby version for rubocop * merge changes from pr * elastic search now uses tls_verify rather than ssl_verify. Breaking, as this no longer supports a String. * update change log inline with change suggested for tls_verify * update gem following vuln check * added back in missing comma * fix tls/ssl verify in tests * update kitchen tests * update kitchen ruby version * update env/Gemfile * update env/Gemfile * try using ruby v3.1 * add more unit test specs and bump versions * bump kitchen ubuntu and ruby versions * use ubuntu2204 for kitchen tests * workaround for tmp directory mounted noexec issue * use recursive chmod * disable ruby v3.4 unit test specs * remove puppetserver and bump module deps * remove puppetserver and bump module deps for kitchen tests * use ruby v3.3 for gemfile.lock test * bump rexml and use serverspec as kitchen verifier * remove chmod /tmp * revert kitchen changes -- being handled in PR #4 * add links to docs * fix bug with $ not being escaped. Updated Change log with latest changes * remove custom metrics * update to support sitename and url being required * removed test for passing simple string with tags. It must be an array as per definition. * fix issues for robocop * add missing params section to http_check test * add note about default value. * updating defaults inline with class defaults. * fix tests to match default values * fix tcp checks given required params * correct test to provide correct datatype. corrected array to match datatype requirements * fixing incorrect change to test * updating test to match default * removing test, as check does not work however following test does check tags exists with correct value. * fix regex check * attempting to correctly reference the hash within the array of instances * remove puppet 6 unit test specs * bump windows orb * The ganglia feature has been removed and not supported in Agent 6+ * tcp check's skip_event setting is no longer supported, so we have removed it from the module * tcp check's collect response time is a boolean not a integer * puppet_litmus v1 does not support ruby 3 * adding in default fact to fix unit test * correct fact syntax * move to non deprecated function for ensure_packages * removed deprecated function validate_legacy. Improved error message * using a different syntax for fact to match rest of file * fix(http-check): Allow multiple instances to be passed * fix tests * fix tests * remove agent 5 * fix rubocop target ruby version * remote --autocorrect from .rubocop * add facter and kitchen-puppet gems to kitchen gemfile, disable centos stream kitchen tests * temporarily disable rocky 9 kitchen tests * fix ubuntu kitchen tests * clean up doc as per markdown rules. add note about breaking change for disk class * disable rubocop Style/HashSyntax for reporting events * fix: Corrected type of service_enable param * update to release notes * fix kitchen tests * clean up integrations manifests * clean up integrations specs * clean up more manifests * update rocky image * cleanup * update deprecated ensure_packages function * fail installation for agent 5 * updated change log to state removal of SSL settings from Redis integration * update with note about postgres * add back multi-instances fix * address linter warnings * align spaces * add back redis ssl * remove comment following revert of redis change * fix postgres and elastic * update docs, cleanups * fix changelog, readme * update readme * make note of breaking changes in readme * Apply suggestions from code review Co-authored-by: Rosa Trieu <[email protected]> * fix suppress_errors * update changelog, readme, metadata --------- Co-authored-by: Darren Gipson <[email protected]> Co-authored-by: Fanny Jiang <[email protected]> Co-authored-by: Niels Tholenaar <[email protected]> Co-authored-by: Rosa Trieu <[email protected]>
1 parent 9472fc7 commit 12db4ae

File tree

153 files changed

+3587
-5026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+3587
-5026
lines changed

.circleci/config.yml

+195-348
Large diffs are not rendered by default.

.fixtures.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
fixtures:
22
repositories:
33
stdlib:
4-
repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
5-
ref: "4.25.0"
4+
repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
5+
ref: "v9.7.0" # Puppet >= 7.0.0 < 9.0.0
66
concat:
7-
repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
8-
ref: "4.1.1"
7+
repo: "https://github.com/puppetlabs/puppetlabs-concat.git"
8+
ref: "v9.1.0" # Puppet >= 7.0.0 < 9.0.0
99
apt:
10-
repo: "git://github.com/puppetlabs/puppetlabs-apt.git"
11-
ref: "4.5.0"
12-
puppetserver_gem:
13-
repo: "git://github.com/puppetlabs/puppetlabs-puppetserver_gem.git"
14-
ref: "1.0.0"
10+
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
11+
ref: "v10.0.1" # Puppet >= 7.0.0 < 9.0.0
1512
forge_modules:
1613
yumrepo_core:
1714
repo: "puppetlabs/yumrepo_core"
18-
ref: "1.2.0"
15+
ref: "2.1.0"
1916
powershell:
2017
repo: "puppetlabs/powershell"
21-
ref: "4.1.0"
18+
ref: "6.0.2"
2219
zypprepo:
2320
repo: "puppet/zypprepo"
24-
ref: "3.1.0"
21+
ref: "5.0.0"
2522
symlinks:
2623
custom_datadog: "#{source_dir}/spec/custom_fixtures/custom_datadog"
2724
datadog_agent: "#{source_dir}"

.gitignore

+11-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
/junit/
1515
/log/
1616
/pkg/
17+
/spec/fixtures/manifests/
18+
/spec/fixtures/modules/*
1719
/tmp/
1820
/vendor/
21+
/.vendor/
1922
/convert_report.txt
2023
/update_report.txt
2124
spec/fixtures
@@ -32,4 +35,11 @@ environments/**/.vagrant
3235
/inventory.yaml
3336

3437
.kitchen
35-
.vscode
38+
39+
/spec/fixtures/litmus_inventory.yaml
40+
.resource_types
41+
.modules
42+
.task_cache.json
43+
.plan_cache.json
44+
.rerun.json
45+
bolt-debug.log

.pdkignore

+15-3
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,42 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
28-
/appveyor.yml
29+
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log
2936
/.fixtures.yml
3037
/Gemfile
3138
/.gitattributes
39+
/.github/
3240
/.gitignore
3341
/.gitlab-ci.yml
42+
3443
/.pdkignore
44+
/.puppet-lint.rc
3545
/Rakefile
3646
/rakelib/
3747
/.rspec
3848
/.rubocop.yml
3949
/.travis.yml
50+
/..yml
4051
/.yardopts
4152
/spec/
42-
/.vscode/
53+
/.sync.yml
54+
/.devcontainer/
4355
/.github/
4456
/.circleci/
4557
/.pre-commit-config.yaml

.puppet-lint.rc

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
--fail-on-warnings
12
--relative
3+
--no-80chars-check
24
--no-140chars-check
3-
--fail-on-warnings
5+
--no-class_inherits_from_params_class-check
6+
--no-autoloader_layout-check
7+
--no-parameter_documentation-check
8+
--no-single_quote_string_with_variables-check
9+
--no-params_empty_string_assignment-check
10+
--no-lookup_in_parameter-check
11+
--no-version_comparison-check
12+
--no-top_scope_facts-check
13+
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp

.rspec

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--color
2+
--format documentation

.rubocop

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--ignore-unrecognized-cops

0 commit comments

Comments
 (0)