From 6071f7a881d369960f0852d7179de37699b7100f Mon Sep 17 00:00:00 2001 From: chris lawrence Date: Mon, 28 Sep 2020 15:50:59 +0100 Subject: [PATCH] updated " --- site-modules/profile/.gitlab-ci.yml | 13 +++++++----- site-modules/profile/.rubocop.yml | 4 ++++ site-modules/profile/.travis.yml | 12 +++++++---- site-modules/profile/.vscode/extensions.json | 2 +- site-modules/profile/Gemfile | 8 ++++---- site-modules/profile/Rakefile | 15 +++++++------- .../manifests/custom_windows/deploy_iis.pp | 2 +- site-modules/profile/metadata.json | 20 ++++--------------- site-modules/profile/spec/spec_helper.rb | 3 +++ site-modules/role/manifests/monitoring.pp | 2 +- 10 files changed, 42 insertions(+), 39 deletions(-) diff --git a/site-modules/profile/.gitlab-ci.yml b/site-modules/profile/.gitlab-ci.yml index 81e6d76..4868bf7 100644 --- a/site-modules/profile/.gitlab-ci.yml +++ b/site-modules/profile/.gitlab-ci.yml @@ -10,22 +10,25 @@ cache: before_script: - bundle -v - rm Gemfile.lock || true - - gem update --system $RUBYGEMS_VERSION + - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner" + - "# Set `rubygems_version` in the .sync.yml to set a value" + - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set" + - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION' - gem --version - bundle -v - bundle install --without system_tests --path vendor/bundle --jobs $(nproc) -syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6: +syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.7-Puppet ~> 6: stage: syntax - image: ruby:2.5.3 + image: ruby:2.5.7 script: - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop variables: PUPPET_GEM_VERSION: '~> 6' -parallel_spec-Ruby 2.5.3-Puppet ~> 6: +parallel_spec-Ruby 2.5.7-Puppet ~> 6: stage: unit - image: ruby:2.5.3 + image: ruby:2.5.7 script: - bundle exec rake parallel_spec variables: diff --git a/site-modules/profile/.rubocop.yml b/site-modules/profile/.rubocop.yml index bab25db..5307849 100644 --- a/site-modules/profile/.rubocop.yml +++ b/site-modules/profile/.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/site-modules/profile/.travis.yml b/site-modules/profile/.travis.yml index ed27d4d..68d3e96 100644 --- a/site-modules/profile/.travis.yml +++ b/site-modules/profile/.travis.yml @@ -1,18 +1,22 @@ --- +os: linux dist: xenial language: ruby cache: bundler before_install: - bundle -v - rm -f Gemfile.lock - - gem update --system $RUBYGEMS_VERSION + - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner" + - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used" + - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set" + - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION' - gem --version - bundle -v script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - - 2.5.3 + - 2.5.7 stages: - static - spec @@ -20,7 +24,7 @@ stages: - if: tag =~ ^v\d name: deploy -matrix: +jobs: fast_finish: true include: - @@ -32,7 +36,7 @@ matrix: stage: spec - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec - rvm: 2.5.3 + rvm: 2.5.7 stage: spec - env: DEPLOY_TO_FORGE=yes diff --git a/site-modules/profile/.vscode/extensions.json b/site-modules/profile/.vscode/extensions.json index 6177782..2f1e4f7 100644 --- a/site-modules/profile/.vscode/extensions.json +++ b/site-modules/profile/.vscode/extensions.json @@ -1,6 +1,6 @@ { "recommendations": [ - "jpogran.puppet-vscode", + "puppet.puppet-vscode", "rebornix.Ruby" ] } diff --git a/site-modules/profile/Gemfile b/site-modules/profile/Gemfile index 2aeab8e..8007ad0 100644 --- a/site-modules/profile/Gemfile +++ b/site-modules/profile/Gemfile @@ -24,10 +24,10 @@ group :development do gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] - gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] - gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby] + gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/site-modules/profile/Rakefile b/site-modules/profile/Rakefile index 395df54..0a5093b 100644 --- a/site-modules/profile/Rakefile +++ b/site-modules/profile/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any? require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' @@ -50,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", @@ -58,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 @@ -70,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/site-modules/profile/manifests/custom_windows/deploy_iis.pp b/site-modules/profile/manifests/custom_windows/deploy_iis.pp index 9837b40..9d40134 100644 --- a/site-modules/profile/manifests/custom_windows/deploy_iis.pp +++ b/site-modules/profile/manifests/custom_windows/deploy_iis.pp @@ -10,7 +10,7 @@ class profile::custom_windows::deploy_iis ( properties => { ensure => 'present', name => 'Web-Server', - } + } } iis_site {'Default Web Site': diff --git a/site-modules/profile/metadata.json b/site-modules/profile/metadata.json index 4eeef0d..65b1dc6 100644 --- a/site-modules/profile/metadata.json +++ b/site-modules/profile/metadata.json @@ -1,5 +1,5 @@ { - "name": "chlawren-profile", + "name": "profile-profile", "version": "0.1.0", "author": "chris lawrence", "summary": "", @@ -33,18 +33,6 @@ "7" ] }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "9" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "18.04" - ] - }, { "operatingsystem": "windows", "operatingsystemrelease": [ @@ -59,7 +47,7 @@ "version_requirement": ">= 4.10.0 < 7.0.0" } ], - "pdk-version": "1.14.1", - "template-url": "pdk-default#1.14.1", - "template-ref": "1.14.1-0-g0b5b39b" + "pdk-version": "1.18.1", + "template-url": "pdk-default#1.18.1", + "template-ref": "tags/1.18.1-0-g3d2e75c" } diff --git a/site-modules/profile/spec/spec_helper.rb b/site-modules/profile/spec/spec_helper.rb index feb5720..d3778ca 100644 --- a/site-modules/profile/spec/spec_helper.rb +++ b/site-modules/profile/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts' @@ -36,6 +38,7 @@ RSpec.configure do |c| # 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 diff --git a/site-modules/role/manifests/monitoring.pp b/site-modules/role/manifests/monitoring.pp index fcc1eef..8ddfba0 100644 --- a/site-modules/role/manifests/monitoring.pp +++ b/site-modules/role/manifests/monitoring.pp @@ -1,4 +1,4 @@ -class role::metrics { +class role::monitoring { include profile::base include profile::tools::nfs_mount