diff --git a/.gitignore b/.gitignore index aed055393..d8cdf58e4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ /spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store @@ -24,6 +25,12 @@ .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 diff --git a/.sync.yml b/.sync.yml index 33731e097..31442d5c4 100644 --- a/.sync.yml +++ b/.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 diff --git a/Gemfile b/Gemfile index 49a4b27ef..7865e9dee 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.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 diff --git a/metadata.json b/metadata.json index 9a07bba8e..8effbd299 100644 --- a/metadata.json +++ b/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" } diff --git a/spec/default_facts.yml b/spec/default_facts.yml index 0b623bd7e..1dc85cdc0 100644 --- a/spec/default_facts.yml +++ b/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