From 75621b5b6301125318264677ea767aa894a3af8a Mon Sep 17 00:00:00 2001 From: rajat-puppet Date: Mon, 22 Jul 2024 17:31:20 +0530 Subject: [PATCH 1/6] Remove labeller.yml --- .github/workflows/labeller.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/labeller.yml diff --git a/.github/workflows/labeller.yml b/.github/workflows/labeller.yml deleted file mode 100644 index 0d4870d7..00000000 --- a/.github/workflows/labeller.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Labeller - -on: - issues: - types: - - opened - - labeled - - unlabeled - pull_request: - types: - - opened - - labeled - - unlabeled - -jobs: - label: - runs-on: ubuntu-latest - steps: - - - uses: puppetlabs/community-labeller@v1.0.1 - name: Label issues or pull requests - with: - label_name: community - label_color: '5319e7' - org_membership: puppetlabs - fail_if_member: 'true' - token: ${{ secrets.IAC_COMMUNITY_LABELER }} From 2e7987d0c3ab4114ff522a047b4a938ec0674849 Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Tue, 15 Oct 2024 20:18:42 +0530 Subject: [PATCH 2/6] pdksync - (PF-3525) - pdk update for module --- .gitignore | 7 +++++++ .pdkignore | 7 +++++++ .rubocop.yml | 2 +- Gemfile | 21 +++++++++++---------- metadata.json | 4 ++-- spec/spec_helper.rb | 5 +++-- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3f155121..2803e566 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ /spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store @@ -26,3 +27,9 @@ .envrc /inventory.yaml /spec/fixtures/litmus_inventory.yaml +.resource_types +.modules +.task_cache.json +.plan_cache.json +.rerun.json +bolt-debug.log diff --git a/.pdkignore b/.pdkignore index 862847a7..84684be6 100644 --- a/.pdkignore +++ b/.pdkignore @@ -19,6 +19,7 @@ /spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store @@ -26,6 +27,12 @@ .envrc /inventory.yaml /spec/fixtures/litmus_inventory.yaml +.resource_types +.modules +.task_cache.json +.plan_cache.json +.rerun.json +bolt-debug.log /.fixtures.yml /Gemfile /.gitattributes diff --git a/.rubocop.yml b/.rubocop.yml index e6bd5af8..439ea84e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,7 @@ require: AllCops: NewCops: enable DisplayCopNames: true - TargetRubyVersion: '2.7' + TargetRubyVersion: '2.6' Include: - "**/*.rb" Exclude: diff --git a/Gemfile b/Gemfile index d6e99877..5abcd642 100644 --- a/Gemfile +++ b/Gemfile @@ -20,11 +20,11 @@ group :development do gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 1.18', require: false + gem "facterdb", '~> 2.1', require: false gem "metadata-json-lint", '~> 4.0', require: false - gem "puppetlabs_spec_helper", '~> 6.0', require: false - gem "rspec-puppet-facts", '~> 2.0', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false gem "dependency_checker", '~> 1.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false @@ -33,17 +33,18 @@ group :development do gem "rubocop", '~> 1.50.0', require: false gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false - gem "puppet-strings", '~> 4.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "rexml", '>= 3.0.0', '< 3.2.7', require: false gem "ruby-pwsh", require: false end -group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] - gem "serverspec", '~> 2.41', require: false -end -group :release_prep do +group :development, :release_prep do gem "puppet-strings", '~> 4.0', require: false - gem "puppetlabs_spec_helper", '~> 6.0', require: false + gem "puppetlabs_spec_helper", '~> 7.0', require: false +end +group :system_tests do + gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] + gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "serverspec", '~> 2.41', require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index c51c2006..abd95502 100644 --- a/metadata.json +++ b/metadata.json @@ -48,7 +48,7 @@ "tsql", "database" ], - "pdk-version": "3.0.0", + "pdk-version": "3.2.0", "template-url": "https://github.com/puppetlabs/pdk-templates.git#main", - "template-ref": "heads/main-0-g0f7378b" + "template-ref": "tags/3.2.0.4-0-g5d17ec1" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f5ec906d..fec9b602 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,7 +25,8 @@ next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) + require 'deep_merge' + default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end @@ -33,7 +34,7 @@ # read default_facts and merge them over what is provided by facterdb default_facts.each do |fact, value| - add_custom_fact fact, value + add_custom_fact fact, value, merge_facts: true end RSpec.configure do |c| From 0906b8dd6fe483a5942b1c1f40e1bfeb2a8f739b Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Wed, 13 Nov 2024 13:22:06 +0530 Subject: [PATCH 3/6] (CAT-2158) Upgrade rexml to address CVE-2024-49761 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5abcd642..2c483db9 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ group :development do gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "rexml", '>= 3.0.0', '< 3.2.7', require: false + gem "rexml", '>= 3.3.9', require: false gem "ruby-pwsh", require: false end group :development, :release_prep do From ca0282ce32d23fbb2e00b96c54675af21951f10b Mon Sep 17 00:00:00 2001 From: Amit Karsale Date: Mon, 17 Feb 2025 09:15:13 +0530 Subject: [PATCH 4/6] (CAT-2222) Update legacy facts --- lib/facter/sqlserver_features.rb | 2 +- lib/facter/sqlserver_instances.rb | 2 +- lib/puppet/provider/sqlserver.rb | 2 +- spec/defines/config_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/facter/sqlserver_features.rb b/lib/facter/sqlserver_features.rb index 5e66a9dd..a102e1bd 100644 --- a/lib/facter/sqlserver_features.rb +++ b/lib/facter/sqlserver_features.rb @@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'puppet_x/sqlserver/features')) Facter.add(:sqlserver_features) do - confine osfamily: :windows + confine 'os.family': :windows setcode do PuppetX::Sqlserver::Features.features diff --git a/lib/facter/sqlserver_instances.rb b/lib/facter/sqlserver_instances.rb index 37ccea86..7d03db89 100644 --- a/lib/facter/sqlserver_instances.rb +++ b/lib/facter/sqlserver_instances.rb @@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'puppet_x/sqlserver/features')) Facter.add(:sqlserver_instances) do - confine osfamily: :windows + confine 'os.family': :windows setcode do PuppetX::Sqlserver::Features.instances diff --git a/lib/puppet/provider/sqlserver.rb b/lib/puppet/provider/sqlserver.rb index e06c0ae1..2af0ec2d 100644 --- a/lib/puppet/provider/sqlserver.rb +++ b/lib/puppet/provider/sqlserver.rb @@ -6,7 +6,7 @@ require 'tempfile' class Puppet::Provider::Sqlserver < Puppet::Provider # rubocop:disable Style/Documentation - confine operatingsystem: :windows + confine 'os.name': :windows initvars diff --git a/spec/defines/config_spec.rb b/spec/defines/config_spec.rb index cd48f323..d6af527e 100644 --- a/spec/defines/config_spec.rb +++ b/spec/defines/config_spec.rb @@ -5,7 +5,7 @@ RSpec.describe 'sqlserver::config', type: :define do let(:title) { 'MSSQLSERVER' } - let(:facts) { { osfamily: 'windows', platform: 'windows', puppet_vardir: 'C:/ProgramData/PuppetLabs/puppet/var' } } + let(:facts) { { 'os.family': 'windows', platform: 'windows', puppet_vardir: 'C:/ProgramData/PuppetLabs/puppet/var' } } describe 'compile' do let(:params) do From d96aac39f4f5c5e27c1d7a8520a53537d9ca183f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 18 Feb 2025 07:17:50 +0000 Subject: [PATCH 5/6] Release prep v5.0.3 --- CHANGELOG.md | 8 ++++++++ metadata.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e969fa94..e03affdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All 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). +## [v5.0.3](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.3) - 2025-02-18 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.2...v5.0.3) + +### Fixed + +- (CAT-2222) Update legacy facts [#485](https://github.com/puppetlabs/puppetlabs-sqlserver/pull/485) ([amitkarsale](https://github.com/amitkarsale)) + ## [v5.0.2](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.2) - 2024-07-18 [Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.1...v5.0.2) diff --git a/metadata.json b/metadata.json index abd95502..453b7aca 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-sqlserver", - "version": "5.0.2", + "version": "5.0.3", "author": "puppetlabs", "summary": "The `sqlserver` module installs and manages MS SQL Server 2014, 2016, 2017, 2019 and 2022 on Windows systems.", "license": "proprietary", From 4d32badb0f91193c1d2fb4d4e124f0e3b15762b4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 18 Feb 2025 07:22:38 +0000 Subject: [PATCH 6/6] Release prep v5.0.4 --- CHANGELOG.md | 4 ++-- metadata.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e03affdb..afe9bc73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,9 @@ All 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). -## [v5.0.3](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.3) - 2025-02-18 +## [v5.0.4](https://github.com/puppetlabs/puppetlabs-sqlserver/tree/v5.0.4) - 2025-02-18 -[Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.2...v5.0.3) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-sqlserver/compare/v5.0.2...v5.0.4) ### Fixed diff --git a/metadata.json b/metadata.json index 453b7aca..7074d8fc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-sqlserver", - "version": "5.0.3", + "version": "5.0.4", "author": "puppetlabs", "summary": "The `sqlserver` module installs and manages MS SQL Server 2014, 2016, 2017, 2019 and 2022 on Windows systems.", "license": "proprietary",