gitlab-labkit 0.36.1 → 0.37.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.gitlab-ci.yml +9 -11
  3. data/CONTRIBUTING.md +4 -4
  4. data/LICENSE +1 -1
  5. data/gitlab-labkit.gemspec +4 -4
  6. data/lib/labkit/logging/sanitizer.rb +8 -0
  7. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2a925d40e6a5ac8cd638b96cff81f08eaa83f7a7d10399cd3f924d74558eba7d
4
- data.tar.gz: ae2a5242670a7a6ca2ae7c8772e032aeddd0e6132636bc3365de009b67132502
3
+ metadata.gz: bc40f1e37b87feea515d17caacf51c043e334fdd2cb2ae12689425dac2c2abaa
4
+ data.tar.gz: 872361b6e95fbd14768ed454afd9ab5aeff18136d62ac7e46d0b636a2ea7877d
5
5
  SHA512:
6
- metadata.gz: 400defec6c30cefe51e4bca0bdf5f92cb5c170f4088c29bf994845d9b28fab49a87fea154f8aa8ab76db3b953141ecddd50ed43822f31e81629d88f93b0c088f
7
- data.tar.gz: f8334faa33fb62610e5dc3ddb6566e12f8af6cd49c5364e15d53aab49086d76c6bc89a9aa259e91b5134148e86c9b08154c09929df30c4a6a3d632004a488c48
6
+ metadata.gz: b75ee05daa1bcfe02e939a7573326c3850ce412b5b753fee6b6139ca323329def13d94a603651a58150e1905fd0c6a9cb6004f6c24190302bb34d9a9d06c1bbc
7
+ data.tar.gz: 0bc7e7d9f5d877626691418da58d7ba4c660cd09533d44c0d6295a8edefb40f193ddfe865e10b434b266a6be42cfed10d6953f273b3a5bae0663c411e7ccda94
data/.gitlab-ci.yml CHANGED
@@ -1,5 +1,8 @@
1
+ variables:
2
+ RUBY_VERSION: "3.1.5"
3
+
1
4
  default:
2
- image: ruby:3.1
5
+ image: "ruby:${RUBY_VERSION}"
3
6
 
4
7
  workflow:
5
8
  rules:
@@ -10,6 +13,11 @@ workflow:
10
13
  # For tags, create a pipeline.
11
14
  - if: '$CI_COMMIT_TAG'
12
15
 
16
+ include:
17
+ - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@1.4.1
18
+ inputs:
19
+ job_image: "ruby:${RUBY_VERSION}"
20
+
13
21
  .test_template: &test_definition
14
22
  image: ruby:${RUBY_VERSION}
15
23
  stage: test
@@ -34,16 +42,6 @@ static-analysis:
34
42
  script:
35
43
  - rake verify
36
44
 
37
- danger-review:
38
- stage: test
39
- except:
40
- - tags
41
- - master
42
- before_script:
43
- - bundle install
44
- script:
45
- - bundle exec danger --fail-on-errors=true --verbose
46
-
47
45
  deploy:
48
46
  stage: deploy
49
47
  script:
data/CONTRIBUTING.md CHANGED
@@ -1,9 +1,9 @@
1
1
  ## Developer Certificate of Origin and License
2
2
 
3
- By contributing to GitLab B.V., you accept and agree to the following terms and
4
- conditions for your present and future contributions submitted to GitLab B.V.
5
- Except for the license granted herein to GitLab B.V. and recipients of software
6
- distributed by GitLab B.V., you reserve all right, title, and interest in and to
3
+ By contributing to GitLab Inc., you accept and agree to the following terms and
4
+ conditions for your present and future contributions submitted to GitLab Inc.
5
+ Except for the license granted herein to GitLab Inc. and recipients of software
6
+ distributed by GitLab Inc., you reserve all right, title, and interest in and to
7
7
  your Contributions.
8
8
 
9
9
  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 CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2016-2019 GitLab B.V.
3
+ Copyright (c) 2016-2019 GitLab Inc.
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
data/gitlab-labkit.gemspec CHANGED
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
19
19
  spec.required_ruby_version = ">= 2.6.0"
20
20
 
21
21
  # Please maintain alphabetical order for dependencies
22
- spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.0.0"
23
- spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.0.0"
22
+ spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"
23
+ spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.1.0"
24
24
  spec.add_runtime_dependency "grpc", ">= 1.62" # Be sure to update the "grpc-tools" dev_dependency too
25
25
  spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
26
26
  spec.add_runtime_dependency "opentracing", "~> 0.4"
27
- spec.add_runtime_dependency "pg_query", ">= 4.2.3", "< 6.0"
28
- spec.add_runtime_dependency "redis", ">3.0.0", "<6.0.0"
27
+ spec.add_runtime_dependency "pg_query", ">= 5.1.0", "< 7.0"
28
+ spec.add_runtime_dependency "redis", "> 3.0.0", "< 6.0.0"
29
29
 
30
30
  # Please maintain alphabetical order for dev dependencies
31
31
  spec.add_development_dependency "excon", "~> 0.78.1"
data/lib/labkit/logging/sanitizer.rb CHANGED
@@ -39,6 +39,14 @@ module Labkit
39
39
  url = url.to_s.strip
40
40
  p = URI::DEFAULT_PARSER.parse(url)
41
41
 
42
+ # After upgrading uri to 1.0.0, the DEFAULT_PARSER has been changed from rfc2396 to rfc3986,
43
+ # and there are the following differences in parsing between rfc2396 and rfc3986.
44
+ # e.g:
45
+ #
46
+ # URI::RFC3986_PARSER.parse('ssh://') => #<URI::Generic ssh://>
47
+ # URI::RFC2396_PARSER.parse('ssh://') => raise URI::InvalidURIError
48
+ return "" if p.host.empty?
49
+
42
50
  p.password = "*****" if p.password.present?
43
51
  p.user = "*****" if p.user.present?
44
52
  p.to_s
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-labkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.36.1
4
+ version: 0.37.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Newdigate
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-06-27 00:00:00.000000000 Z
11
+ date: 2024-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: 5.0.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: 8.0.0
22
+ version: 8.1.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: 5.0.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: 8.0.0
32
+ version: 8.1.0
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: activesupport
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: 5.0.0
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: 8.0.0
42
+ version: 8.1.0
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: 5.0.0
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: 8.0.0
52
+ version: 8.1.0
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: grpc
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,20 @@ dependencies:
98
98
  requirements:
99
99
  - - ">="
100
100
  - !ruby/object:Gem::Version
101
- version: 4.2.3
101
+ version: 5.1.0
102
102
  - - "<"
103
103
  - !ruby/object:Gem::Version
104
- version: '6.0'
104
+ version: '7.0'
105
105
  type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - ">="
110
110
  - !ruby/object:Gem::Version
111
- version: 4.2.3
111
+ version: 5.1.0
112
112
  - - "<"
113
113
  - !ruby/object:Gem::Version
114
- version: '6.0'
114
+ version: '7.0'
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: redis
117
117
  requirement: !ruby/object:Gem::Requirement