Merge pull request #394 from puppetlabs/CAT-2281-Remove_puppet_7_test_infrastructure

jordanbreen28 · web-flow · commit 465e853a0ca2 · 2025-04-11T10:53:27.000+01:00
(CAT-2281) Remove puppet 7 infrastructure
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
         runs_on:
           - 'ubuntu-latest'
@@ -38,11 +37,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
         include:
-          - ruby_version: '2.7'
-            puppet_version: '~> 7.0'
           - ruby_version: '3.2'
             puppet_version: '~> 8.0'
         runs_on:
@@ -63,7 +59,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
     name: "Build Editor Service (Ruby ${{ matrix.ruby_version }})"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/create-test-matrix.ps1 b/.github/workflows/create-test-matrix.ps1
@@ -10,7 +10,7 @@ $OSList =@('ubuntu-20.04', 'windows-2019')
 #  - https://github.com/puppetlabs/puppet/pull/8577#issuecomment-823820255
 #  - https://www.msys2.org/news/#2021-01-31-aslr-enabled-by-default
 $RubyPuppet = @(
-  @{ ruby = '2.7'; puppet_gem_version = '~> 7.0' }
+  @{ ruby = '3.1'; puppet_gem_version = '~> 8.0' }
 )
 
 $OSList | ForEach-Object {
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
         runs_on:
           - 'ubuntu-latest'
@@ -31,11 +30,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
         include:
-          - ruby_version: '2.7'
-            puppet_version: '~> 7.0'
           - ruby_version: '3.2'
             puppet_version: '~> 8.0'
         runs_on:
@@ -56,7 +52,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.2'
     name: "Build Editor Service (Ruby ${{ matrix.ruby_version }})"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: "Setup ruby"
         uses: "ruby/setup-ruby@v1"
         with:
-          ruby-version: "2.7"
+          ruby-version: "3.1"
           bundler-cache: "true"
 
       - name: "Bundle environment"
diff --git a/.github/workflows/release_prep.yml b/.github/workflows/release_prep.yml
@@ -30,7 +30,7 @@ jobs:
       - name: "setup ruby"
         uses: "ruby/setup-ruby@v1"
         with:
-          ruby-version: "2.7"
+          ruby-version: "3.1"
           bundler-cache: "true"
 
       - name: "bundle environment"
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -16,7 +16,7 @@ AllCops:
     - Rakefile
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: '2.7'
+  TargetRubyVersion: '3.1'
 # Disabled
 Style/ClassAndModuleChildren:
   Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-04-24 11:01:50 UTC using RuboCop version 1.50.2.
+# on 2025-04-09 15:40:01 UTC using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -78,6 +78,7 @@ Metrics/PerceivedComplexity:
   Max: 32
 
 # Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -119,6 +120,20 @@ Style/HashEachMethods:
     - 'lib/puppet-languageserver-sidecar/puppet_strings_helper.rb'
     - 'lib/puppet-languageserver/manifest/folding_provider.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/HashExcept:
+  Exclude:
+    - 'lib/puppet-languageserver/puppet_lexer_helper.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/puppet_editor_services/protocol/json_rpc.rb'
+
 # Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
diff --git a/README.md b/README.md
@@ -8,15 +8,15 @@ A ruby based implementation of a [Language Server](https://github.com/Microsoft/
 
 ## Requirements
 
-* Puppet 7 or above
+* Puppet 8 or above
 
-* Ruby 2.7 or above
+* Ruby 3.1 or above
 
 ## Setting up editor services for development
 
-* Ensure a modern ruby is installed (2.7+)
+* Ensure a modern ruby is installed (3.1+)
 
-  The editor services support Puppet 7.0.0 and above
+  The editor services support Puppet 8.0.0 and above
 
 * Clone this repository
 
diff --git a/lib/puppet-debugserver/debug_session/hook_handlers.rb b/lib/puppet-debugserver/debug_session/hook_handlers.rb
@@ -273,7 +273,7 @@ def process_breakpoint_hook(reason, args)
           break_description,
           pops_target: pops_target_object,
           scope: scope_object,
-          pops_depth_level: pops_depth_level,
+          pops_depth_level:,
           puppet_stacktrace: stack_trace
         )
       end
diff --git a/lib/puppet-debugserver/debug_session/puppet_session_run_mode.rb b/lib/puppet-debugserver/debug_session/puppet_session_run_mode.rb
@@ -38,7 +38,7 @@ def next!(pops_depth_level)
         @run_mode_mutex.synchronize do
           @mode = :next
           @options = {
-            pops_depth_level: pops_depth_level
+            pops_depth_level:
           }
         end
       end
@@ -57,7 +57,7 @@ def step_out!(pops_depth_level)
         @run_mode_mutex.synchronize do
           @mode = :stepout
           @options = {
-            pops_depth_level: pops_depth_level
+            pops_depth_level:
           }
         end
       end
diff --git a/lib/puppet-debugserver/hooks.rb b/lib/puppet-debugserver/hooks.rb
@@ -57,10 +57,10 @@ def add_hook(event_name, hook_name, callable = nil, &block)
     # @param [Symbol] event_name The name of the event.
     # @param [Array] args The arguments to pass to each hook function.
     # @return [Object] The return value of the last executed hook.
-    def exec_hook(event_name, *args, &block)
+    def exec_hook(event_name, ...)
       PuppetDebugServer.log_message(:debug, "Starting to execute hook #{event_name}") unless event_name == :hook_log_message
       @hooks[event_name.to_s].map do |_hook_name, callable|
-        callable.call(*args, &block)
+        callable.call(...)
       rescue ::RuntimeError => e
         errors << e
         e
diff --git a/lib/puppet-languageserver/manifest/validation_provider.rb b/lib/puppet-languageserver/manifest/validation_provider.rb
@@ -73,7 +73,7 @@ def self.validate(session_state, content, options = {})
         Puppet[:code] = content
         env = Puppet.lookup(:current_environment)
         loaders = Puppet::Pops::Loaders.new(env)
-        Puppet.override({ loaders: loaders }, 'For puppet parser validate') do
+        Puppet.override({ loaders: }, 'For puppet parser validate') do
           validation_environment = env
           $PuppetParserMutex.synchronize do # rubocop:disable Style/GlobalVars
             original_taskmode = Puppet[:tasks] if Puppet.tasks_supported?
diff --git a/lib/puppet-languageserver/message_handler.rb b/lib/puppet-languageserver/message_handler.rb
@@ -157,7 +157,7 @@ def request_textdocument_completion(_, json_rpc_message)
 
       case documents.document_type(file_uri)
       when :manifest
-        PuppetLanguageServer::Manifest::CompletionProvider.complete(session_state, content, line_num, char_num, context: context, tasks_mode: documents.plan_file?(file_uri))
+        PuppetLanguageServer::Manifest::CompletionProvider.complete(session_state, content, line_num, char_num, context:, tasks_mode: documents.plan_file?(file_uri))
       else
         raise "Unable to provide completion on #{file_uri}"
       end
diff --git a/lib/puppet-languageserver/puppet_helper.rb b/lib/puppet-languageserver/puppet_helper.rb
@@ -60,13 +60,13 @@ def self.function(session_state, name, tasks_mode = false)
         :function,
         name,
         fuzzy_match: true,
-        exclude_origins: exclude_origins
+        exclude_origins:
       )
     end
 
     def self.function_names(session_state, tasks_mode = false)
       exclude_origins = tasks_mode ? [] : [:bolt]
-      session_state.object_cache.object_names_by_section(:function, exclude_origins: exclude_origins).map(&:to_s)
+      session_state.object_cache.object_names_by_section(:function, exclude_origins:).map(&:to_s)
     end
 
     def self.get_class(session_state, name)
@@ -83,7 +83,7 @@ def self.datatype(session_state, name, tasks_mode = false)
         :datatype,
         name,
         fuzzy_match: true,
-        exclude_origins: exclude_origins
+        exclude_origins:
       )
     end
 
diff --git a/lib/puppet-languageserver/puppet_lexer_helper.rb b/lib/puppet-languageserver/puppet_lexer_helper.rb
@@ -9,7 +9,7 @@ module Parser
       class Lexer2WithComments < Puppet::Pops::Parser::Lexer2
         # The PATTERN_COMMENT in lexer2 also consumes the trailing \r in the token and
         # we don't want that.
-        PATTERN_COMMENT_NO_WS = /#[^\r\n]*/.freeze
+        PATTERN_COMMENT_NO_WS = /#[^\r\n]*/
 
         TOKEN_COMMENT = [:COMMENT, '#', 1].freeze
         TOKEN_MLCOMMENT = [:MLCOMMENT, nil, 0].freeze
diff --git a/lib/puppet-languageserver/puppetfile/validation_provider.rb b/lib/puppet-languageserver/puppetfile/validation_provider.rb
@@ -73,7 +73,7 @@ def self.validate(content, options = {})
       def self.validate_resolution(puppetfile_document, document_uri, cache, module_path, puppet_version)
         ui = nil
         resolver = PuppetfileResolver::Resolver.new(puppetfile_document, puppet_version)
-        opts = { cache: cache, ui: ui, module_paths: module_path, allow_missing_modules: true }
+        opts = { cache:, ui:, module_paths: module_path, allow_missing_modules: true }
         begin
           resolution = resolver.resolve(opts)
         rescue PuppetfileResolver::Puppetfile::DocumentVersionConflictError,
diff --git a/lib/puppet-languageserver/session_state/language_client.rb b/lib/puppet-languageserver/session_state/language_client.rb
@@ -111,7 +111,7 @@ def register_capability(method, options = {})
         # Note - Don't put more than one method per request even though you can.  It makes decoding errors much harder!
 
         @registrations[method] = [] if @registrations[method].nil?
-        @registrations[method] << { registered: false, state: :pending, id: id }
+        @registrations[method] << { registered: false, state: :pending, id: }
 
         message_handler.protocol.send_client_request('client/registerCapability', params)
         true
diff --git a/lib/puppet-languageserver/session_state/object_cache.rb b/lib/puppet-languageserver/session_state/object_cache.rb
@@ -124,7 +124,7 @@ def object_names_by_section(section, options = {})
       end
 
       # section => <Type of object in the file :function, :type, :class, :datatype>
-      def objects_by_section(section, &_block)
+      def objects_by_section(section, &)
         return if section.nil?
 
         @cache_lock.synchronize do
@@ -136,7 +136,7 @@ def objects_by_section(section, &_block)
         end
       end
 
-      def all_objects(&_block)
+      def all_objects(&)
         @cache_lock.synchronize do
           @inmemory_cache.each_value do |sections|
             next if sections.nil?
diff --git a/lib/puppet_editor_services/server/stdio.rb b/lib/puppet_editor_services/server/stdio.rb
@@ -63,7 +63,7 @@ def pipe_is_readable?(stream, timeout = 0.5)
         read_ready && stream == read_ready[0][0]
       end
 
-      def read_from_pipe(pipe, timeout = 0.1, &_block)
+      def read_from_pipe(pipe, timeout = 0.1, &)
         if pipe_is_readable?(pipe, timeout)
           l = nil
           begin
diff --git a/lib/puppet_editor_services/server/tcp.rb b/lib/puppet_editor_services/server/tcp.rb
@@ -156,8 +156,8 @@ def run_async(*args, &block)
 
       # creates an asynchronous call to a method, with an optional callback (shortcut)
       # @api private
-      def callback(object, method, *args, &block)
-        push_event object.method(method), *args, &block
+      def callback(object, method, ...)
+        push_event(object.method(method), ...)
       end
 
       # event handling FIFO
diff --git a/puppet-editor-services.gemspec b/puppet-editor-services.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
     Language support, such as syntax hightlighting, linting, hover support and more.
   EOF
   s.homepage    = 'https://github.com/puppetlabs/puppet-editor-services'
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.1.0'
   s.executables = %w[ puppet-debugserver puppet-languageserver puppet-languageserver-sidecar ]
   s.files          = FileList['lib/**/*.rb',
                               'bin/*',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ $OSList =@('ubuntu-20.04', 'windows-2019')`
`10`	`10`	`# - https://github.com/puppetlabs/puppet/pull/8577#issuecomment-823820255`
`11`	`11`	`# - https://www.msys2.org/news/#2021-01-31-aslr-enabled-by-default`
`12`	`12`	`$RubyPuppet = @(`
`13`		`- @{ ruby = '2.7'; puppet_gem_version = '~> 7.0' }`
	`13`	`+ @{ ruby = '3.1'; puppet_gem_version = '~> 8.0' }`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`$OSList \| ForEach-Object {`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ def process_breakpoint_hook(reason, args)`
`273`	`273`	`break_description,`
`274`	`274`	`pops_target: pops_target_object,`
`275`	`275`	`scope: scope_object,`
`276`		`- pops_depth_level: pops_depth_level,`
	`276`	`+ pops_depth_level:,`
`277`	`277`	`puppet_stacktrace: stack_trace`
`278`	`278`	`)`
`279`	`279`	`end`