gitlab-labkit 0.36.1 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a925d40e6a5ac8cd638b96cff81f08eaa83f7a7d10399cd3f924d74558eba7d
-  data.tar.gz: ae2a5242670a7a6ca2ae7c8772e032aeddd0e6132636bc3365de009b67132502
+  metadata.gz: bc40f1e37b87feea515d17caacf51c043e334fdd2cb2ae12689425dac2c2abaa
+  data.tar.gz: 872361b6e95fbd14768ed454afd9ab5aeff18136d62ac7e46d0b636a2ea7877d
 SHA512:
-  metadata.gz: 400defec6c30cefe51e4bca0bdf5f92cb5c170f4088c29bf994845d9b28fab49a87fea154f8aa8ab76db3b953141ecddd50ed43822f31e81629d88f93b0c088f
-  data.tar.gz: f8334faa33fb62610e5dc3ddb6566e12f8af6cd49c5364e15d53aab49086d76c6bc89a9aa259e91b5134148e86c9b08154c09929df30c4a6a3d632004a488c48
+  metadata.gz: b75ee05daa1bcfe02e939a7573326c3850ce412b5b753fee6b6139ca323329def13d94a603651a58150e1905fd0c6a9cb6004f6c24190302bb34d9a9d06c1bbc
+  data.tar.gz: 0bc7e7d9f5d877626691418da58d7ba4c660cd09533d44c0d6295a8edefb40f193ddfe865e10b434b266a6be42cfed10d6953f273b3a5bae0663c411e7ccda94

data/.gitlab-ci.yml

@@ -1,5 +1,8 @@
+variables:
+  RUBY_VERSION: "3.1.5"
+
 default:
-  image: ruby:3.1
+  image: "ruby:${RUBY_VERSION}"
 
 workflow:
   rules:
@@ -10,6 +13,11 @@ workflow:
     # For tags, create a pipeline.
     - if: '$CI_COMMIT_TAG'
 
+include:
+  - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@1.4.1
+    inputs:
+      job_image: "ruby:${RUBY_VERSION}"
+
 .test_template: &test_definition
   image: ruby:${RUBY_VERSION}
   stage: test
@@ -34,16 +42,6 @@ static-analysis:
   script:
     - rake verify
 
-danger-review:
-  stage: test
-  except:
-    - tags
-    - master
-  before_script:
-    - bundle install
-  script:
-    - bundle exec danger --fail-on-errors=true --verbose
-
 deploy:
   stage: deploy
   script:

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
 ## Developer Certificate of Origin and License
 
-By contributing to GitLab B.V., you accept and agree to the following terms and
-conditions for your present and future contributions submitted to GitLab B.V.
-Except for the license granted herein to GitLab B.V. and recipients of software
-distributed by GitLab B.V., you reserve all right, title, and interest in and to
+By contributing to GitLab Inc., you accept and agree to the following terms and
+conditions for your present and future contributions submitted to GitLab Inc.
+Except for the license granted herein to GitLab Inc. and recipients of software
+distributed by GitLab Inc., you reserve all right, title, and interest in and to
 your Contributions.
 
 All contributions are subject to the Developer Certificate of Origin and license set out at [docs.gitlab.com/ce/legal/developer_certificate_of_origin](https://docs.gitlab.com/ce/legal/developer_certificate_of_origin).

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2019 GitLab B.V.
+Copyright (c) 2016-2019 GitLab Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/gitlab-labkit.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.6.0"
 
   # Please maintain alphabetical order for dependencies
-  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.0.0"
-  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.0.0"
+  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.1.0"
   spec.add_runtime_dependency "grpc", ">= 1.62" # Be sure to update the "grpc-tools" dev_dependency too
   spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
   spec.add_runtime_dependency "opentracing", "~> 0.4"
-  spec.add_runtime_dependency "pg_query", ">= 4.2.3", "< 6.0"
-  spec.add_runtime_dependency "redis", ">3.0.0", "<6.0.0"
+  spec.add_runtime_dependency "pg_query", ">= 5.1.0", "< 7.0"
+  spec.add_runtime_dependency "redis", "> 3.0.0", "< 6.0.0"
 
   # Please maintain alphabetical order for dev dependencies
   spec.add_development_dependency "excon", "~> 0.78.1"

data/lib/labkit/logging/sanitizer.rb

@@ -39,6 +39,14 @@ module Labkit
         url = url.to_s.strip
         p = URI::DEFAULT_PARSER.parse(url)
 
+        # After upgrading uri to 1.0.0, the DEFAULT_PARSER has been changed from rfc2396 to rfc3986,
+        # and there are the following differences in parsing between rfc2396 and rfc3986.
+        # e.g:
+        #
+        #     URI::RFC3986_PARSER.parse('ssh://') => #<URI::Generic ssh://>
+        #     URI::RFC2396_PARSER.parse('ssh://') => raise URI::InvalidURIError
+        return "" if p.host.empty?
+
         p.password = "*****" if p.password.present?
         p.user = "*****" if p.user.present?
         p.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.37.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement