diff --git a/.rubocop.yml b/.rubocop.yml index bab25db..5307849 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -40,6 +40,10 @@ 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 diff --git a/.sync.yml b/.sync.yml index 6bbbcc6..6fdfcab 100644 --- a/.sync.yml +++ b/.sync.yml @@ -6,7 +6,7 @@ appveyor.yml: .project: delete: true .gitlab-ci.yml: - delete: true + delete: true spec/default_facts.yml: extra_facts: @@ -18,7 +18,14 @@ spec/default_facts.yml: processors: "count": 8 -.travis.yml: - includes: - - env: PUPPET_GEM_VERSION="= 4.6.1" CHECK=parallel_spec - rvm: 2.1.9 +spec/default_facts.yml: + extra_facts: + pe_postgresql_info: + installed_server_version: 9.6 + pe_server_version: 2018.1.0 + memory: + system: + total: 16.00 GiB + total_bytes: 17179869184 + processors: + count: 8 diff --git a/.travis.yml b/.travis.yml index 68d3e96..e381477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ jobs: stage: deploy branches: only: - - master + - main - /^v\d/ notifications: email: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f699a2..af636f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Minor Release 1.1.0 + +- The reports and resource_events tables are no longer repacked when the tables are partitioned +- Update repack logging to separate files +- Update Puppet VS Code Extension ID +- Update to PDK 1.18.1 + ## Minor Release 1.0.1 - Correct lint issues found on the Forge diff --git a/Rakefile b/Rakefile index cb7ed0c..0a5093b 100644 --- a/Rakefile +++ b/Rakefile @@ -52,7 +52,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any? 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.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB" config.configure_sections = { "Changed" => { "prefix" => "### Changed", @@ -60,11 +60,11 @@ if Bundler.rubygems.find_name('github_changelog_generator').any? }, "Added" => { "prefix" => "### Added", - "labels" => ["feature", "enhancement"], + "labels" => ["enhancement", "feature"], }, "Fixed" => { "prefix" => "### Fixed", - "labels" => ["bugfix"], + "labels" => ["bug", "documentation", "bugfix"], }, } end @@ -72,16 +72,15 @@ else desc 'Generate a Changelog from GitHub' task :changelog do raise <= Gem::Version.new('2.2.2')" + version: '~> 1.15' + condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')" EOM end end diff --git a/metadata.json b/metadata.json index 55c662d..02ed21c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-pe_databases", - "version": "1.0.1", + "version": "1.1.0", "author": "puppetlabs", "summary": "A Puppet Module for Backing Up / Maintaining / Tuning Your Puppet Enterprise Databases", "license": "Apache-2.0", @@ -77,7 +77,7 @@ "version_requirement": ">= 5.5.0" } ], - "pdk-version": "1.17.0", + "pdk-version": "1.18.1", "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "tags/1.17.0-0-gd3a4319" + "template-ref": "heads/master-0-gd610ead" } diff --git a/spec/default_facts.yml b/spec/default_facts.yml index 08ffd1e..05a1b85 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -6,6 +6,8 @@ ipaddress: "172.16.254.254" ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" is_pe: false macaddress: "AA:AA:AA:AA:AA:AA" +pe_postgresql_info: + installed_server_version: 9.6 pe_server_version: 2018.1.0 memory: system: @@ -13,5 +15,3 @@ memory: total_bytes: 17179869184 processors: count: 8 -pe_postgresql_info: - installed_server_version: 9.6 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e92dced..b367fde 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -42,6 +42,7 @@ # set to strictest setting for testing # by default Puppet runs at warning level Puppet.settings[:strict] = :warning + Puppet.settings[:strict_variables] = true end c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] c.after(:suite) do