rspec-mergify 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69562ff8faf56e93122d4a11c50cf94e4d328a06a57b84cbc7eff1a80dc3dc9
-  data.tar.gz: d5cdd6a938db90e73a0771a2646b0aa9f303c120ffd72e26df8c02df3a19cbbe
+  metadata.gz: 968b0ced5510f59941eb189080af9e540dc8cd2799757bb16f0dbe746204471e
+  data.tar.gz: 307dff0317e1abf576472b0428a1e3f0f8d7f1b1b9257c84ecfd81f0fac9152c
 SHA512:
-  metadata.gz: 4d6f8fdc77e89ecb4a69c3c44804b2b75ee6749cd4f0f664e903629a6216e4c1be7860a0a774df2b1c90e6eee233f18a5d1e9d07b94949b5c106972f7849cb30
-  data.tar.gz: 2228d6143a76bfba2f0e955ee6ca988d89786e0aeedb9ed2a00d2dde40678dff529f4dd276a30fc7b31f77290389da1b09e40f467021203f578fa760b84c5ee8
+  metadata.gz: 23673868ac2acd11145346748cea2e5c1cae71cb6c55371ad1440a2f9bdf3436ddf0ebaaef9ae2bfd7a56e5d435b67c3f449b3161201becbd3a7b864dea8d2ad
+  data.tar.gz: 2d676dd9fc25b6383db1013e42513d5f70208a6796f4fe4fa5544493d123736871b6d7617c9590c7f8fc8fd2fa4ffb99cf1b683c9cf6df0d124c6a8a27822c05

data/lib/mergify/rspec/ci_insights.rb

@@ -8,6 +8,7 @@ require_relative 'resources/ci'
 require_relative 'resources/git'
 require_relative 'resources/github_actions'
 require_relative 'resources/jenkins'
+require_relative 'resources/buildkite'
 require_relative 'resources/mergify'
 require_relative 'resources/rspec'
 
@@ -102,6 +103,7 @@ module Mergify
           Resources::Git.detect,
           Resources::GitHubActions.detect,
           Resources::Jenkins.detect,
+          Resources::Buildkite.detect,
           Resources::Mergify.detect,
           Resources::RSpec.detect
         ]
@@ -143,7 +145,6 @@ module Mergify
       # rubocop:disable Metrics/MethodLength
       def load_flaky_detector
         return unless @token && @repo_name
-        return unless Utils.env_truthy?('_MERGIFY_TEST_NEW_FLAKY_DETECTION')
 
         require_relative 'flaky_detection'
         mode = @base_branch_name ? 'new' : 'unhealthy'
@@ -153,6 +154,10 @@ module Mergify
           full_repository_name: @repo_name,
           mode: mode
         )
+      rescue FlakyDetectionDisabledError
+        # The repository has not opted into flaky detection, or has no baseline
+        # yet. Both are expected; skip without surfacing an error.
+        nil
       rescue StandardError => e
         @flaky_detector_error_message = "Could not load flaky detector: #{e.message}"
       end

data/lib/mergify/rspec/flaky_detection.rb

@@ -8,6 +8,12 @@ require_relative 'utils'
 
 module Mergify
   module RSpec
+    # Signals that flaky detection must not run for this session, and that this
+    # is expected rather than a failure: the repository has not opted in (the
+    # server responds with 404) or there is no baseline of recorded tests yet.
+    # Callers skip silently instead of surfacing an error banner.
+    class FlakyDetectionDisabledError < StandardError; end
+
     # Manages intelligent test rerunning with budget constraints for flaky detection.
     # rubocop:disable Metrics/ClassLength
     class FlakyDetector
@@ -193,7 +199,7 @@ module Mergify
 
       private
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       def fetch_context
         owner, repo = Utils.split_full_repo_name(@full_repository_name)
         uri = URI("#{@url}/v1/ci/#{owner}/repositories/#{repo}/flaky-detection-context")
@@ -207,9 +213,18 @@ module Mergify
         request['Authorization'] = "Bearer #{@token}"
 
         response = http.request(request)
-        parse_context(response.body)
+        case response.code.to_i
+        when 200
+          parse_context(response.body)
+        when 404
+          # A 404 means the repository has not opted into flaky detection; this
+          # is the expected default, not an error.
+          raise FlakyDetectionDisabledError
+        else
+          raise "Mergify API returned HTTP #{response.code}"
+        end
       end
-      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
 
       # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       def parse_context(body)
@@ -231,7 +246,9 @@ module Mergify
       def validate!
         return unless @mode == 'new' && @context[:existing_test_names].empty?
 
-        raise 'Cannot use "new" mode without existing test names in the context'
+        # Without a baseline, `new` mode would treat every test as new and rerun
+        # the whole suite. Skip instead of surfacing an error.
+        raise FlakyDetectionDisabledError
       end
 
       def remaining_budget

data/lib/mergify/rspec/quarantine.rb

@@ -54,11 +54,52 @@ module Mergify
 
       private
 
-      # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       def fetch_quarantined_tests(api_url, token, owner, repo, branch_name)
         uri = URI("#{api_url}/v1/ci/#{owner}/repositories/#{repo}/quarantines")
-        uri.query = URI.encode_www_form(branch: branch_name)
+        uri.query = URI.encode_www_form(branch: branch_name, per_page: 100)
+        collected = walk_paginated_quarantines(uri, token)
+        @quarantined_tests = collected if collected
+      rescue Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED, SocketError => e
+        @init_error_msg = "Failed to connect to Mergify API: #{e.message}"
+      rescue JSON::ParserError => e
+        @init_error_msg = "Mergify API returned a malformed quarantine list: #{e.message}"
+      end
 
+      # Follows the RFC 5988 `next` link until exhausted. Returns the full list
+      # on success, or `nil` when the run was aborted (subscription missing or
+      # an error already recorded in @init_error_msg).
+      # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def walk_paginated_quarantines(uri, token)
+        collected = []
+        # Guard against a server returning a `next` link that loops back to a
+        # URL we have already fetched.
+        seen = Set.new
+        while uri
+          if seen.include?(uri.to_s)
+            @init_error_msg = 'Mergify API returned a cyclic `next` link, aborting.'
+            return nil
+          end
+          seen.add(uri.to_s)
+
+          response = perform_request(uri, token)
+          case response.code.to_i
+          when 200
+            data = JSON.parse(response.body)
+            collected.concat(data.fetch('quarantined_tests', []).map { |t| t['test_name'] })
+            next_url = parse_next_link(response['Link'])
+            uri = next_url ? URI(next_url) : nil
+          when 402
+            return nil
+          else
+            @init_error_msg = "Mergify API returned HTTP #{response.code}"
+            return nil
+          end
+        end
+        collected
+      end
+      # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
+
+      def perform_request(uri, token)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = uri.scheme == 'https'
         http.open_timeout = 10
@@ -66,23 +107,27 @@ module Mergify
 
         request = Net::HTTP::Get.new(uri)
         request['Authorization'] = "Bearer #{token}"
+        http.request(request)
+      end
 
-        response = http.request(request)
-        handle_response(response)
-      rescue Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED, SocketError => e
-        @init_error_msg = "Failed to connect to Mergify API: #{e.message}"
+      # Parses RFC 8288 Link headers tolerantly: accepts both quoted
+      # (`rel="next"`) and token (`rel=next`) forms, and matches when `next`
+      # is one of several space-separated rel-types (`rel="next prev"`).
+      def parse_next_link(link_header)
+        return nil if link_header.nil? || link_header.empty?
+
+        link_header.split(',').each do |part|
+          match = part.strip.match(/\A<([^>]+)>\s*;\s*(.+)\z/)
+          next unless match && next_rel?(match[2])
+
+          return match[1]
+        end
+        nil
       end
-      # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
 
-      def handle_response(response)
-        case response.code.to_i
-        when 200
-          data = JSON.parse(response.body)
-          @quarantined_tests = data.fetch('quarantined_tests', []).map { |t| t['test_name'] }
-        when 402
-          # No subscription — silently skip
-        else
-          @init_error_msg = "Mergify API returned HTTP #{response.code}"
+      def next_rel?(params)
+        params.scan(/rel\s*=\s*(?:"([^"]+)"|([^\s;,]+))/i).any? do |quoted, token|
+          (quoted || token).split.include?('next')
         end
       end
     end

data/lib/mergify/rspec/resources/buildkite.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'opentelemetry-sdk'
+require_relative '../utils'
+require_relative 'git'
+
+module Mergify
+  module RSpec
+    module Resources
+      # Detects OpenTelemetry Resource attributes for Buildkite.
+      module Buildkite
+        module_function
+
+        BUILDKITE_MAPPING = {
+          'cicd.pipeline.name' => [:to_s, 'BUILDKITE_PIPELINE_SLUG'],
+          'cicd.pipeline.task.name' => [
+            :to_s,
+            lambda {
+              label = ENV.fetch('BUILDKITE_LABEL', nil)
+              label && !label.empty? ? label : ENV.fetch('BUILDKITE_STEP_KEY', nil)
+            }
+          ],
+          'cicd.pipeline.run.id' => [:to_s, 'BUILDKITE_BUILD_ID'],
+          'cicd.pipeline.run.url' => [:to_s, 'BUILDKITE_BUILD_URL'],
+          'cicd.pipeline.run.attempt' => [
+            :to_i,
+            -> { ENV.fetch('BUILDKITE_RETRY_COUNT', '0').to_i + 1 }
+          ],
+          'cicd.pipeline.runner.name' => [:to_s, 'BUILDKITE_AGENT_NAME'],
+          'vcs.ref.head.name' => [:to_s, 'BUILDKITE_BRANCH'],
+          'vcs.ref.base.name' => [:to_s, 'BUILDKITE_PULL_REQUEST_BASE_BRANCH'],
+          'vcs.ref.head.revision' => [:to_s, 'BUILDKITE_COMMIT'],
+          'vcs.repository.url.full' => [:to_s, 'BUILDKITE_REPO'],
+          'vcs.repository.name' => [
+            :to_s,
+            lambda {
+              url = ENV.fetch('BUILDKITE_REPO', nil)
+              Utils.repository_name_from_url(url) if url
+            }
+          ]
+        }.freeze
+
+        def detect
+          return OpenTelemetry::SDK::Resources::Resource.create({}) if Utils.ci_provider != :buildkite
+
+          git_attrs = Utils.get_attributes(Git::GIT_MAPPING)
+          buildkite_attrs = Utils.get_attributes(BUILDKITE_MAPPING)
+          merged = git_attrs.merge(buildkite_attrs)
+          OpenTelemetry::SDK::Resources::Resource.create(merged)
+        end
+      end
+    end
+  end
+end

data/lib/mergify/rspec/utils.rb

@@ -15,6 +15,7 @@ module Mergify
         'GITHUB_ACTIONS' => :github_actions,
         'CIRCLECI' => :circleci,
         'JENKINS_URL' => :jenkins,
+        'BUILDKITE' => :buildkite,
         '_RSPEC_MERGIFY_TEST' => :rspec_mergify_suite
       }.freeze
 
@@ -125,6 +126,9 @@ module Mergify
         when :circleci
           url = ENV.fetch('CIRCLE_REPOSITORY_URL', nil)
           return repository_name_from_url(url) if url
+        when :buildkite
+          url = ENV.fetch('BUILDKITE_REPO', nil)
+          return repository_name_from_url(url) if url
         when :rspec_mergify_suite
           return 'Mergifyio/rspec-mergify'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mergify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Mergify
@@ -67,6 +67,7 @@ files:
 - lib/mergify/rspec/flaky_detection.rb
 - lib/mergify/rspec/formatter.rb
 - lib/mergify/rspec/quarantine.rb
+- lib/mergify/rspec/resources/buildkite.rb
 - lib/mergify/rspec/resources/ci.rb
 - lib/mergify/rspec/resources/git.rb
 - lib/mergify/rspec/resources/github_actions.rb