Merge branch 'master' into patch-1

Author: jhongturney

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/main.yml

@@ -1,25 +1,6 @@
 name: CI
 on: [push, pull_request, workflow_dispatch]
 jobs:
-  puppet-3-8-7:
-    env:
-      PUPPET_VERSIONS: "3.8.7"
-      PUPPET_VERSION: "3.8.7"
-      RUBOCOP_TEST: false
-      RSPEC_TEST: true
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby-version: ["2.0", "2.1"]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-      - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}
-      - name: Tests
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-
   puppet-4-10-10:
     env:
       PUPPET_VERSIONS: "4.10.10"
@@ -30,31 +11,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.1", "2.2", "2.3"]
+        ruby-version: ["2.6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
 
-  puppet-5-5-8:
+  puppet-5-5-22:
     env:
-      PUPPET_VERSIONS: "5.5.8"
-      PUPPET_VERSION: "5.5.8"
+      PUPPET_VERSIONS: "5.5.22"
+      PUPPET_VERSION: "5.5.22"
       RUBOCOP_TEST: false
       RSPEC_TEST: true
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.4", "2.5", "2.6"]
+        ruby-version: ["2.6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-stretch
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
 
@@ -68,20 +49,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.5", "2.6"]
+        ruby-version: ["2.6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-stretch
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-      - name: Rubocop and Coverage
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-        if: matrix.ruby-version == '2.6'
-        env:
-          RUBOCOP_TEST: true
-          ENFORCE_COVERAGE: true
 
   puppet-7-3-0:
     env:
@@ -93,13 +68,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # 2.7 and 3.0 fail at the moment
-        # ruby-version: ["2.5", "2.6", "2.7", "3.0"]
-        ruby-version: ["2.5", "2.6"]
+        ruby-version: ["2.6"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-buster
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: Release
+on:
+  push:
+    tags:
+      - '*.*.*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+      - run: bundle install
+
+      - name: Publish to GPR
+        env:
+          GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          if [ ${{ github.ref_type }} == "tag" ]; then
+            gem push --verbose \
+              --key github \
+              --host https://rubygems.pkg.github.com/${{ github.repository_owner }} \
+              *.gem
+          fi
+      - name: Upload gem as action artifact
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
+        if: ${{ always() }}
+        with:
+          path: ./*.gem

.rubocop.yml

@@ -57,6 +57,8 @@ Style/Documentation:
   Enabled: false
 
 # To fix later
+Style/FormatStringToken:
+  Enabled: false
 Style/PercentLiteralDelimiters:
   Enabled: false
 Style/VariableNumber:
@@ -73,7 +75,13 @@ Style/EmptyMethod:
   Enabled: false
 Style/SymbolArray:
   Enabled: false
-Style/IndentHeredoc:
+Style/YodaCondition:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/ExtraSpacing:
+  Enabled: false
+Performance/Caller:
   Enabled: false
-Style/ExtraSpacing:
+Style/WordArray:
   Enabled: false

.travis.yml

@@ -8,6 +8,8 @@ RUN sed -i'' -e 's/CipherString = DEFAULT@SECLEVEL=2/CipherString = DEFAULT@SECL
 RUN sed -i'' -e 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf
 
 FROM scratch AS app
+ARG PUPPET_VERSION
+ENV PUPPET_VERSION="${PUPPET_VERSION}"
 COPY --from=ruby / /
 WORKDIR /app
 ENV LANG="C.UTF-8"

Dockerfile

@@ -1,12 +1,4 @@
 [
-  {
-    "minimum_version": "3.0.0",
-    "maximum_version": "3.99.99",
-    "additional_gems": [
-      { "name": "safe_yaml", "version": "~> 1.0.4" },
-      { "name": "puppetdb-terminus", "version": "3.2.4" }
-    ]
-  },
   {
     "minimum_version": "4.0.0",
     "maximum_version": "4.99.99",

config/puppet-versions.json

@@ -74,7 +74,7 @@ def convert_to_data_type(datatype, value)
           return value if datatype == 'string'
           return parse_json(value) if datatype == 'json'
           return nil if datatype == 'nil'
-          if datatype == 'fixnum' || datatype == 'integer'
+          if ['fixnum', 'integer'].include? datatype
             return Regexp.last_match(1).to_i if value =~ /^(-?\d+)$/
             raise ArgumentError, "Illegal integer '#{value}'"
           end

lib/octocatalog-diff/api/v1/override.rb

@@ -262,7 +262,7 @@ def filter_and_cleanup(catalog_resources)
           # Process each attribute in the resource
           resource.each do |k, v|
             # Title was pre-processed
-            next if k == 'title' || k == 'type'
+            next if ['title', 'type'].include? k
 
             # Handle parameters
             if k == 'parameters'
@@ -272,7 +272,7 @@ def filter_and_cleanup(catalog_resources)
               # The order of tags is unimportant. Sort this array to avoid false diffs if order changes.
               # Also if tags is empty, don't add.
               hsh[k] = v.sort if v.is_a?(Array) && v.any?
-            elsif k == 'file' || k == 'line'
+            elsif ['file', 'line'].include? k
               # We don't care, for the purposes of catalog-diff, from which manifest and line this resource originated.
               # However, we may report this to the user, so we will keep it in here for now.
               hsh[k] = v
@@ -354,7 +354,7 @@ def attr_match_rule?(rule, attrib, old_val, new_val)
           elsif operator == '=->'
             # String equality test only of the old value
             matcher = ->(x, _y) { x == value }
-          elsif operator == '=~>' || operator == '=&>'
+          elsif ['=~>', '=&>'].include? operator
             begin
               my_regex = Regexp.new(value, Regexp::IGNORECASE)
             rescue RegexpError => exc

lib/octocatalog-diff/catalog-diff/differ.rb

@@ -457,7 +457,7 @@ def self.class_name_for_diffy(class_name)
         def self.stringify_for_diffy(obj)
           return JSON.pretty_generate(obj) if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [Hash, Array])
           return '""' if obj.is_a?(String) && obj == ''
-          return obj if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [String, Fixnum, Integer, Float])
+          return obj if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [String, Integer, Float])
           "#{class_name_for_diffy(obj.class)}: #{obj.inspect}"
         end