Merge branch 'puppetlabs:main' into PUP-11597/generate_types_puppetx

Author: natemccurdy

.gemspec

@@ -10,15 +10,18 @@
 # Please see the [packaging
 # repository](https://github.com/puppetlabs/packaging) for information on how
 # to build the Puppet gem package.
+#
+# Make sure these gem requirements are in sync with ext/project_data.yaml and
+# the Gemfile
 
 Gem::Specification.new do |s|
   s.name = "puppet"
-  version = "6.29.0"
+  version = "8.1.0"
   mdata = version.match(/(\d+\.\d+\.\d+)/)
   s.version = mdata ? mdata[1] : version
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1")
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
   s.authors = ["Puppet Labs"]
   s.date = "2012-08-17"
   s.description = "Puppet, an automated configuration management tool"
@@ -31,15 +34,15 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Puppet, an automated configuration management tool"
   s.specification_version = 3
-  s.add_runtime_dependency(%q<facter>, [">= 2.4.0", "< 5"])
-  s.add_runtime_dependency(%q<hiera>, [">= 3.2.1", "< 4"])
+  s.add_runtime_dependency(%q<facter>, [">= 4.3.0", "< 5"])
   s.add_runtime_dependency(%q<semantic_puppet>, "~> 1.0")
-  s.add_runtime_dependency(%q<fast_gettext>, "~> 1.1")
+  s.add_runtime_dependency(%q<fast_gettext>, ">= 2.1", "< 3")
   s.add_runtime_dependency(%q<locale>, "~> 2.1")
   s.add_runtime_dependency(%q<multi_json>, "~> 1.13")
-  s.add_runtime_dependency(%q<httpclient>, "~> 2.8")
-  s.add_runtime_dependency(%q<concurrent-ruby>, "~> 1.0")
+  s.add_runtime_dependency(%q<puppet-resource_api>, "~> 1.5")
+  s.add_runtime_dependency(%q<concurrent-ruby>, ["~> 1.0", "< 1.2.0"])
   s.add_runtime_dependency(%q<deep_merge>, "~> 1.0")
+  s.add_runtime_dependency(%q<scanf>, "~> 1.0")
 
   # loads platform specific gems like ffi, win32 platform gems
   # as additional runtime dependencies

.gitattributes

@@ -0,0 +1,6 @@
+# Disable NL -> CRNL translation on Windows. This is necessary because the files on disk must
+# match the checksums in metadata.json.
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/Modulefile -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp -text

.github/workflows/checks.yaml

@@ -3,19 +3,22 @@ name: Checks
 
 on:
   push:
-    branches: [6.x]
+    branches: [main]
   pull_request:
-    branches: [6.x]
+    branches: [main]
+
+permissions:
+  contents: read
 
 jobs:
   checks:
     name: ${{ matrix.cfg.check }}
     strategy:
       matrix:
         cfg:
-          - {check: rubocop, os: ubuntu-latest, ruby: 2.5}
-          - {check: commits, os: ubuntu-latest, ruby: 2.5}
-          - {check: warnings, os: ubuntu-latest, ruby: 2.5}
+          - {check: rubocop, os: ubuntu-latest, ruby: '3.1'}
+          - {check: commits, os: ubuntu-latest, ruby: '3.1'}
+          - {check: warnings, os: ubuntu-latest, ruby: '3.1'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:
@@ -31,7 +34,7 @@ jobs:
 
       - name: Update rubygems and install gems
         run: |
-          gem update --system 3.3.26 --no-document
+          gem update --system 3.3.26 --silent --no-document
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 

.github/workflows/mend.yaml

@@ -0,0 +1,34 @@
+---
+name: Mend Monitor
+on:
+  push:
+    branches:
+      - main
+jobs:
+  mend_monitor:
+    if: ${{ github.repository_owner == 'puppetlabs' }}
+    runs-on: ubuntu-latest
+    name: Mend Monitor
+    steps:
+      - name: Checkout current PR
+        uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+      - name: Create lock
+        run: bundle lock
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Download Mend
+        run: curl -o wss-unified-agent.jar https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar
+      - name: Run Mend
+        run: java -jar wss-unified-agent.jar
+        env:
+          WS_APIKEY: ${{ secrets.MEND_API_KEY }}
+          WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
+          WS_USERKEY: ${{ secrets.MEND_TOKEN }}
+          WS_PRODUCTNAME: Puppet Agent
+          WS_PROJECTNAME: ${{ github.event.repository.name }}

.github/workflows/rspec_tests.yaml

@@ -3,25 +3,25 @@ name: RSpec tests
 
 on:
   push:
-    branches: [6.x]
+    branches: [main]
   pull_request:
-    branches: [6.x]
+    branches: [main]
+
+permissions:
+  contents: read
 
 jobs:
   rspec_tests:
     name: ${{ matrix.cfg.os }}(ruby ${{ matrix.cfg.ruby }})
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-latest, ruby: 2.3}
-          - {os: ubuntu-latest, ruby: 2.4}
-          - {os: ubuntu-latest, ruby: 2.5}
-          - {os: ubuntu-latest, ruby: 2.6}
-          - {os: ubuntu-latest, ruby: 2.7}
-          - {os: ubuntu-latest, ruby: jruby-9.2.9.0}
-          - {os: windows-2019, ruby: 2.4}
-          - {os: windows-2019, ruby: 2.5}
-          - {os: windows-2019, ruby: 2.6}
+          - {os: ubuntu-latest, ruby: '3.1'}
+          - {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1
+          - {os: ubuntu-22.04, ruby: '3.2'} # openssl 3
+          - {os: ubuntu-latest, ruby: 'jruby-9.4.2.0'}
+          - {os: windows-2019, ruby: '3.1'}
+          - {os: windows-2019, ruby: '3.2'} # openssl 3
 
     runs-on: ${{ matrix.cfg.os }}
     steps:
@@ -35,14 +35,14 @@ jobs:
 
       - name: Update rubygems and install gems
         run: |
-          gem update --system 3.3.26 --no-document
+          gem update --system 3.3.26 --silent --no-document
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 
       - name: Run tests on Windows
         if: runner.os == 'Windows'
         run: |
-          # from: https://github.com/MSP-Greg/ruby/blob/4f1147e6555bbb7f0868bca40c86ca078a7381c3/.github/workflows/mingw.yml
+          # https://github.com/ruby/ruby/pull/2791/files#diff-ff5ff976e81bebd977f0834e60416abbR97-R100
           # Actions uses UTF8, causes test failures, similar to normal OS setup
           $PSDefaultParameterValues['*:Encoding'] = 'utf8'
           [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")