govuk_app_config 9.9.2 → 9.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/autorelease.yml +10 -0
- data/.github/workflows/ci.yml +6 -0
- data/.gitignore +2 -0
- data/.govuk_dependabot_merger.yml +4 -10
- data/CHANGELOG.md +8 -0
- data/govuk_app_config.gemspec +2 -1
- data/lib/govuk_app_config/govuk_error/configuration.rb +1 -0
- data/lib/govuk_app_config/govuk_prometheus_exporter.rb +3 -13
- data/lib/govuk_app_config/version.rb +1 -1
- metadata +20 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c2b999667300e1c7039636683bbec26d0876bba98d909766de7f2a900cbe8fec
|
4
|
+
data.tar.gz: 9f256df66ab205142cf4e53d0fe868bb57d9f17e2465906f10f5be6fc8abdf1e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e12b4f83286dde0a7be9a252e85f0ec6284e86396b7a8f2888c0c34591c41e5acf9c6b685d0c04310d44e8c990b103a2581905c11280beda39863c8ee601b7ae
|
7
|
+
data.tar.gz: 754946671f494b0be22851f8c7b0926fd79a7bbce1a39a7cb5adf8a1ffff12ba2a27ca3997bf32945b8f7b8e9ee7fbe27de5939b9f37e0887e830aac95c7b83e
|
data/.github/workflows/ci.yml
CHANGED
@@ -14,7 +14,13 @@ jobs:
|
|
14
14
|
snyk-security:
|
15
15
|
name: SNYK security analysis
|
16
16
|
uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
|
17
|
+
with:
|
18
|
+
skip_sca: true
|
17
19
|
secrets: inherit
|
20
|
+
permissions:
|
21
|
+
contents: read
|
22
|
+
security-events: write
|
23
|
+
actions: read
|
18
24
|
|
19
25
|
codeql-sast:
|
20
26
|
name: CodeQL SAST scan
|
data/.gitignore
CHANGED
@@ -1,10 +1,4 @@
|
|
1
|
-
api_version:
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
- patch
|
6
|
-
- minor
|
7
|
-
- dependency: plek
|
8
|
-
allowed_semver_bumps:
|
9
|
-
- patch
|
10
|
-
- minor
|
1
|
+
api_version: 2
|
2
|
+
defaults:
|
3
|
+
auto_merge: true
|
4
|
+
update_external_dependencies: true
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
# 9.11.0
|
2
|
+
|
3
|
+
* Add GDS::SSO::PermissionDeniedError to excluded exceptions list ([#366](https://github.com/alphagov/govuk_app_config/pull/366))
|
4
|
+
|
5
|
+
# 9.10.0
|
6
|
+
|
7
|
+
* Simplify the logic for deciding whether to initialize `GovukPrometheusExporter`. `GovukPrometheusExporter` provides the `/metrics` webserver and "exporter" process for aggregating counters in multi-process apps. govuk_app_config will now always attempt to initialize GovukPrometheusExporter except when running under `rails console`. The `GOVUK_PROMETHEUS_EXPORTER` environment variable no longer has any effect.
|
8
|
+
|
1
9
|
# 9.9.2
|
2
10
|
|
3
11
|
* Add single cookie consent api URLs ([#355](https://github.com/alphagov/govuk_app_config/pull/355))
|
data/govuk_app_config.gemspec
CHANGED
@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
|
|
39
39
|
spec.add_development_dependency "rake", "~> 13.0"
|
40
40
|
spec.add_development_dependency "rspec", "~> 3.10"
|
41
41
|
spec.add_development_dependency "rspec-its", "~> 1.3"
|
42
|
-
spec.add_development_dependency "rubocop-govuk", "4.
|
42
|
+
spec.add_development_dependency "rubocop-govuk", "4.16.1"
|
43
|
+
spec.add_development_dependency "simplecov"
|
43
44
|
spec.add_development_dependency "webmock"
|
44
45
|
end
|
@@ -40,6 +40,7 @@ module GovukError
|
|
40
40
|
"CGI::Session::CookieStore::TamperedWithCookie",
|
41
41
|
"GdsApi::HTTPIntermittentServerError",
|
42
42
|
"GdsApi::TimedOutException",
|
43
|
+
"GDS::SSO::PermissionDeniedError",
|
43
44
|
"Mongoid::Errors::DocumentNotFound",
|
44
45
|
"Puma::HttpParserError",
|
45
46
|
"Sinatra::NotFound",
|
@@ -42,15 +42,7 @@ module GovukPrometheusExporter
|
|
42
42
|
end
|
43
43
|
|
44
44
|
def self.should_configure
|
45
|
-
|
46
|
-
if ENV["GOVUK_PROMETHEUS_EXPORTER"] == "force"
|
47
|
-
true
|
48
|
-
elsif File.basename($PROGRAM_NAME) == "rake" ||
|
49
|
-
defined?(Rails) && (Rails.const_defined?("Console") || Rails.env == "test")
|
50
|
-
false
|
51
|
-
else
|
52
|
-
ENV["GOVUK_PROMETHEUS_EXPORTER"] == "true"
|
53
|
-
end
|
45
|
+
!(defined?(Rails) && Rails.const_defined?("Console"))
|
54
46
|
end
|
55
47
|
|
56
48
|
def self.configure(collectors: [], default_aggregation: PrometheusExporter::Metric::Histogram)
|
@@ -81,9 +73,7 @@ module GovukPrometheusExporter
|
|
81
73
|
|
82
74
|
begin
|
83
75
|
server = PrometheusExporter::Server::WebServer.new bind: "0.0.0.0", port: 9394
|
84
|
-
|
85
|
-
collectors.each { |collector| server.collector.register_collector(collector.new) }
|
86
|
-
|
76
|
+
collectors.each { |c| server.collector.register_collector(c.new) }
|
87
77
|
server.start
|
88
78
|
|
89
79
|
if defined?(Rails)
|
@@ -94,7 +84,7 @@ module GovukPrometheusExporter
|
|
94
84
|
Sinatra.use SinatraMiddleware
|
95
85
|
end
|
96
86
|
rescue Errno::EADDRINUSE
|
97
|
-
warn "
|
87
|
+
warn "not starting Prometheus metrics server: address already in use"
|
98
88
|
end
|
99
89
|
end
|
100
90
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: govuk_app_config
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 9.
|
4
|
+
version: 9.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- GOV.UK Dev
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-04-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: logstasher
|
@@ -292,14 +292,28 @@ dependencies:
|
|
292
292
|
requirements:
|
293
293
|
- - '='
|
294
294
|
- !ruby/object:Gem::Version
|
295
|
-
version: 4.
|
295
|
+
version: 4.16.1
|
296
296
|
type: :development
|
297
297
|
prerelease: false
|
298
298
|
version_requirements: !ruby/object:Gem::Requirement
|
299
299
|
requirements:
|
300
300
|
- - '='
|
301
301
|
- !ruby/object:Gem::Version
|
302
|
-
version: 4.
|
302
|
+
version: 4.16.1
|
303
|
+
- !ruby/object:Gem::Dependency
|
304
|
+
name: simplecov
|
305
|
+
requirement: !ruby/object:Gem::Requirement
|
306
|
+
requirements:
|
307
|
+
- - ">="
|
308
|
+
- !ruby/object:Gem::Version
|
309
|
+
version: '0'
|
310
|
+
type: :development
|
311
|
+
prerelease: false
|
312
|
+
version_requirements: !ruby/object:Gem::Requirement
|
313
|
+
requirements:
|
314
|
+
- - ">="
|
315
|
+
- !ruby/object:Gem::Version
|
316
|
+
version: '0'
|
303
317
|
- !ruby/object:Gem::Dependency
|
304
318
|
name: webmock
|
305
319
|
requirement: !ruby/object:Gem::Requirement
|
@@ -322,6 +336,7 @@ extensions: []
|
|
322
336
|
extra_rdoc_files: []
|
323
337
|
files:
|
324
338
|
- ".github/dependabot.yml"
|
339
|
+
- ".github/workflows/autorelease.yml"
|
325
340
|
- ".github/workflows/ci.yml"
|
326
341
|
- ".gitignore"
|
327
342
|
- ".govuk_dependabot_merger.yml"
|
@@ -376,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
376
391
|
- !ruby/object:Gem::Version
|
377
392
|
version: '0'
|
378
393
|
requirements: []
|
379
|
-
rubygems_version: 3.5.
|
394
|
+
rubygems_version: 3.5.9
|
380
395
|
signing_key:
|
381
396
|
specification_version: 4
|
382
397
|
summary: Base configuration for GOV.UK applications
|