Merge pull request #67 from m0dular/pdk_update

PDK update
puppetlabs · Feb 9, 2023 · 0070842 · 0070842
2 parents 5c58054 + e263d4e
commit 0070842
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 30 deletions.
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
-	]
+	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [],

diff --git a/.sync.yml b/.sync.yml
@@ -42,8 +42,9 @@ Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
-      version: '= 1.15.2'
+      version: '= 1.16.4'
+    - gem: concurrent-ruby
+      version: '= 1.1.10'
     - gem: 'toml-rb'
-    - gem: 'octokit'
-      version:
-       '= 4.21.0'
+    - gem: 'puppet-strings'
+      version: '= 2.9.0'
diff --git a/Gemfile b/Gemfile
@@ -13,24 +13,35 @@ def location_for(place_or_version, fake_version = nil)
   end
 end
 
-ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = ruby_version_segments[0..1].join('.')
-
 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 "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "github_changelog_generator",                              require: false
-  gem "toml-rb",                                                 require: false
-  gem "octokit", '= 4.21.0',                                     require: false
+  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 "json", '= 2.3.0',                               require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                               require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  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 "voxpupuli-puppet-lint-plugins", '~> 3.1',       require: false
+  gem "facterdb", '~> 1.18',                           require: false
+  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false
+  gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
+  gem "rspec-puppet-facts", '~> 2.0',                  require: false
+  gem "codecov", '~> 0.2',                             require: false
+  gem "dependency_checker", '~> 0.2',                  require: false
+  gem "parallel_tests", '~> 3.4',                      require: false
+  gem "pry", '~> 0.10',                                require: false
+  gem "simplecov-console", '~> 0.5',                   require: false
+  gem "puppet-debugger", '~> 1.0',                     require: false
+  gem "rubocop", '= 1.6.1',                            require: false
+  gem "rubocop-performance", '= 1.9.1',                require: false
+  gem "rubocop-rspec", '= 2.0.1',                      require: false
+  gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '= 1.16.4',        require: false
+  gem "concurrent-ruby", '= 1.1.10',                   require: false
+  gem "toml-rb",                                       require: false
+  gem "puppet-strings", '= 2.9.0',                     require: false
 end
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
+  gem "serverspec", '~> 2.41',    require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

diff --git a/functions/hosts_with_pe_profile.pp b/functions/hosts_with_pe_profile.pp
@@ -13,7 +13,7 @@ function influxdb::hosts_with_pe_profile(
   String $profile,
 ) >> Array {
   if $settings::storeconfigs {
-    $hosts = puppetdb_query("resources[certname] {
+  $hosts = puppetdb_query("resources[certname] {
       type = 'Class' and
       title = 'Puppet_enterprise::Profile::${profile}' and
       nodes { deactivated is null and expired is null }

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -75,15 +75,15 @@
   String  $admin_user = 'admin',
   Sensitive[String[1]] $admin_pass = Sensitive('puppetlabs'),
   String  $token_file = $facts['identity']['user'] ? {
-                                      'root'  => '/root/.influxdb_token',
+    'root'  => '/root/.influxdb_token',
     default => "/home/${facts['identity']['user']}/.influxdb_token" #lint:ignore:parameter_documentation
-                                    },
+  },
 ) {
   # We can only manage repos, packages, services, etc on the node we are compiling a catalog for
   unless $host == $facts['networking']['fqdn'] or $host == $facts['networking']['hostname'] or $host == 'localhost' {
     fail(
       @("MSG")
-        Unable to manage InfluxDB installation on host: ${host}.
+                Unable to manage InfluxDB installation on host: ${host}.
         Management of repos, packages and services etc is only possible on the local host (${facts['networking']['fqdn']}).
       | MSG
     )
@@ -143,7 +143,7 @@
       }
     }
 
-    package {'influxdb2':
+    package { 'influxdb2':
       ensure  => $version,
       require => $package_require,
       before  => $package_before,

diff --git a/manifests/profile/toml.pp b/manifests/profile/toml.pp
@@ -3,7 +3,7 @@
 #   include influxdb::profile::toml
 class influxdb::profile::toml (
   String $version = '2.1.1',
-){
+) {
   $service_name = $facts['pe_server_version'] ? {
     undef   => 'puppetserver',
     default => 'pe-puppetserver',

diff --git a/metadata.json b/metadata.json
@@ -53,7 +53,7 @@
       "version_requirement": ">= 6.21.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.3.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g0544f64"
+  "pdk-version": "2.6.1",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#2.7.1",
+  "template-ref": "tags/2.7.1-0-g9a16c87"
 }