upgrade to pdk 3.3.0

- remove `networking:` from default_facts.yml because default fact
  merging is broken since at least PDK 3.0.1
- set librarian-puppet to '>= 5.0' so it doesn't get downgraded by gem
  requirement conflicts
- set pdk to '~> 3.3.0' so we'll get 3.4 when it no longer conflicts
  with the latest librarian-puppet

.gitignore

@@ -17,13 +17,20 @@
 /spec/fixtures/modules/*
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 /update_report.txt
 .DS_Store
 .project
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
 /.pdkignore
 /.tmp/
 /Puppetfile.lock

.sync.yml

@@ -12,8 +12,9 @@ Gemfile:
     ':development':
       - gem: faker
       - gem: librarian-puppet
+        version: '>= 5.0'
       - gem: pdk
-        version: 3.2.0
+        version: '~> 3.3.0'
 spec/default_facts.yml:
   extra_facts:
     ec2_tag_role: nebula::role::aws

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.0',                    require: false
+  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 "rspec-puppet-facts", '~> 3.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
@@ -34,9 +34,10 @@ 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 "faker",                                   require: false
-  gem "librarian-puppet",                        require: false
-  gem "pdk", '3.2.0',                            require: false
+  gem "librarian-puppet", '>= 5.0',              require: false
+  gem "pdk", '~> 3.3.0',                         require: false
 end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false

metadata.json

@@ -49,7 +49,7 @@
       "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
-  "pdk-version": "3.2.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#3.2.0",
-  "template-ref": "tags/3.2.0-0-gb257ef1"
+  "pdk-version": "3.3.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#3.3.0",
+  "template-ref": "tags/3.3.0-0-g5d17ec1"
 }

spec/default_facts.yml

@@ -2,10 +2,6 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-networking:
-  ip: "172.16.254.254"
-  ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
-  mac: "AA:AA:AA:AA:AA:AA"
 is_pe: false
 ec2_tag_role: nebula::role::aws
 datacenter: mydatacenter