gitlab-exporter 11.18.2 → 11.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bb85649c03d72472315136401ebb234618c2350a5e75e5f426619aed2c97286
-  data.tar.gz: f0f0f46b1cbfea992e7b171ed7a1877af7c232a5e0e1a549666d5086d8e72087
+  metadata.gz: 386af9238448d41f015fd10a4ae29d4e6b42913078cb0d86cbb862909bc2b7e0
+  data.tar.gz: 98e064fe309955646d3879528743528646b1bb57122a5237660b7be772cac359
 SHA512:
-  metadata.gz: ed4f5b1dfa84d713c4c2246fa3e77ca604fe49d616d11f0ddc6cf80d1a5d87bc79f62115e4abec9e7d18ef1f50b5f6a654a329d9477464c83f3884cbb06d960f
-  data.tar.gz: c10bb0f6452deff8a9f7615a8d7379d30e1c9cc428b50b8092f5f007db87b97ac12c6567b8db75f321a0c749686329931b6fa49ab2e1e63ae335b85341b5ee7b
+  metadata.gz: 415c5e84efdc17ebd72e7bc870fba4bb0f0052992390737c8d6cc64e397185f92f4deb3ffd6809700ea308719ad00061cafd44bd7c30f224144b4a5eec0926df
+  data.tar.gz: 740a3e32681f861ad5503b7605f2de60cef9a99d8fa64b2530c0aa5599462dce67fddbb1b4312fbd316881915d207d762e1d88215cbdf7f20d7cc7d20aa56897

data/.gitlab-ci.yml

@@ -43,8 +43,19 @@ rspec:
   before_script: *before_scripts
   parallel:
     matrix:
-      - RUBY_VERSION: "2.7"
-      - RUBY_VERSION: "3.0"
+      - RUBY_VERSION: ["2.7", "3.0"]
+
+rspec_integration:
+  script:
+    - bundle exec rspec spec -t integration -f d -c
+  before_script: *before_scripts
+  services:
+    - redis:latest
+  variables:
+    REDIS_URL: "redis://redis"
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["2.7", "3.0"]
 
 rubocop:
   script:

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (11.18.2)
+    gitlab-exporter (11.19.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.2.3)
       puma (= 5.6.5)
       quantile (= 0.2.1)
       redis (= 4.4.0)
-      redis-namespace (= 1.6.0)
+      redis-namespace (= 1.9.0)
       sidekiq (= 6.4.0)
       sinatra (~> 2.2.0)
 
@@ -53,8 +53,8 @@ GEM
       rack
     rainbow (3.0.0)
     redis (4.4.0)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
+    redis-namespace (1.9.0)
+      redis (>= 4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.7.0)

data/gitlab-exporter.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "puma", "5.6.5"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.4.0"
-  s.add_runtime_dependency "redis-namespace", "1.6.0"
+  s.add_runtime_dependency "redis-namespace", "1.9.0"
   s.add_runtime_dependency "sidekiq", "6.4.0"
   s.add_runtime_dependency "sinatra", "~> 2.2.0"
 

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "11.18.2".freeze
+    VERSION = "11.19.0".freeze
   end
 end

data/lib/gitlab_exporter/web_exporter.rb

@@ -2,7 +2,6 @@ require "sinatra/base"
 require "English"
 require "cgi"
 
-require_relative "rack_vulndb_255039_patch"
 require_relative "tls_helper"
 
 module GitLab

data/spec/integration/cli_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+require "gitlab_exporter/cli"
+
+module GitLab
+  module Exporter
+    module CLI
+      describe SidekiqRunner, :integration do
+        let(:redis_url) { ENV.fetch("REDIS_URL", "redis://localhost:6379") }
+        let(:io) { StringIO.new }
+
+        it "can properly reach out to redis" do
+          args = CLIArgs.new([io], options: { /^--redis-url/ => redis_url })
+          runner = SidekiqRunner.new(args)
+
+          expect { runner.run }.not_to raise_error
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,10 @@ require "tmpdir"
 $LOAD_PATH.unshift File.expand_path(".")
 Dir["spec/support/**/*.rb"].each do |f| require f end
 
+RSpec.configure do |config|
+  config.filter_run_excluding integration: true
+end
+
 class GitRepoBuilder
   def origin
     @origin ||= create_origin
@@ -41,19 +45,30 @@ class GitRepoBuilder
 end
 
 class CLIArgs
-  def initialize(args)
+  def initialize(args, options: {})
     @arguments = args
+    @options = options
   end
 
   def options
     yield self
+
+    self
   end
 
-  def on(*args); end
+  def on(flag, *_)
+    match = @options.find { |regex, _| regex.match?(flag) }
+
+    yield match[1] if match
+  end
 
   def banner=(banner); end
 
   def parse!
     @arguments
   end
+
+  def shift
+    @arguments.shift
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 11.18.2
+  version: 11.19.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,6 @@ files:
 - lib/gitlab_exporter/prober.rb
 - lib/gitlab_exporter/process.rb
 - lib/gitlab_exporter/prometheus.rb
-- lib/gitlab_exporter/rack_vulndb_255039_patch.rb
 - lib/gitlab_exporter/ruby.rb
 - lib/gitlab_exporter/sidekiq.rb
 - lib/gitlab_exporter/tls_helper.rb
@@ -217,6 +216,7 @@ files:
 - spec/fixtures/smaps/sample.txt
 - spec/git_process_proper_spec.rb
 - spec/git_spec.rb
+- spec/integration/cli_spec.rb
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
 - spec/ruby_spec.rb
@@ -254,6 +254,7 @@ test_files:
 - spec/fixtures/smaps/sample.txt
 - spec/git_process_proper_spec.rb
 - spec/git_spec.rb
+- spec/integration/cli_spec.rb
 - spec/memstats_spec.rb
 - spec/prometheus_metrics_spec.rb
 - spec/ruby_spec.rb

data/lib/gitlab_exporter/rack_vulndb_255039_patch.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-if Gem.loaded_specs["rack"].version >= Gem::Version.new("3.0.0")
-  fail <<~ERR
-    This patch is unnecessary in Rack versions 3.0.0 or newer.
-    Please remove this file and the associated spec.
-
-    See https://github.com/rack/rack/blob/main/CHANGELOG.md#security (issue #1733)
-  ERR
-end
-
-# Patches a cache poisoning attack vector in Rack by not allowing semicolons
-# to delimit query parameters.
-# See https://github.com/rack/rack/issues/1732.
-#
-# Solution is taken from the same issue.
-#
-# The actual patch is due for release in Rack 3.0.0.
-module Rack
-  class Request # rubocop:disable Style/Documentation
-    Helpers.module_eval do
-      # rubocop: disable Naming/MethodName
-      def GET
-        if get_header(RACK_REQUEST_QUERY_STRING) == query_string
-          get_header(RACK_REQUEST_QUERY_HASH)
-        else
-          query_hash = parse_query(query_string, "&") # only allow ampersand here
-          set_header(RACK_REQUEST_QUERY_STRING, query_string)
-          set_header(RACK_REQUEST_QUERY_HASH, query_hash)
-        end
-      end
-      # rubocop: enable Naming/MethodName
-    end
-  end
-end