From 171505def21955735ed9a7c2bd19abfe828ba32d Mon Sep 17 00:00:00 2001
From: DGNum Chores <tech@dgnum.eu>
Date: Thu, 14 Mar 2024 17:28:18 +0000
Subject: [PATCH] chore(ds-fr): Update
---
machines/compute01/ds-fr/package/meta.nix | 4 +-
.../compute01/ds-fr/package/rubyEnv/Gemfile | 1 +
.../ds-fr/package/rubyEnv/Gemfile.lock | 58 +++++---
.../ds-fr/package/rubyEnv/gemset.nix | 134 +++++++++++++-----
4 files changed, 141 insertions(+), 56 deletions(-)
diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix
index 53352fc4..991bbd50 100644
--- a/machines/compute01/ds-fr/package/meta.nix
+++ b/machines/compute01/ds-fr/package/meta.nix
@@ -1,5 +1,5 @@
{
- version = "2024-03-11-02";
- src-hash = "sha256-9M2ToTVzJq7ToIDFjTpKsoT/+w5KmeT0SIwDAF8jV+s=";
+ version = "2024-03-14-01";
+ src-hash = "sha256-eWQp+c2k5GWBdJw7coK5dL7y6j8t6ZVUnYP7iasau/4=";
deps-hash = "sha256-9HbZtk0sgBSWzzFrjXnSyEVWaQMiyC1v89vXB0UK9Hc=";
}
diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile
index 18a70463..e2c2022b 100644
--- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile
+++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile
@@ -31,6 +31,7 @@ gem 'devise-two-factor'
gem 'discard'
gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
gem 'dry-monads'
+gem 'faraday-jwt'
gem 'flipper'
gem 'flipper-active_record'
gem 'flipper-active_support_cache_store'
diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock
index 088b30b0..4a2910f4 100644
--- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock
+++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
parser (>= 2.4)
smart_properties
bigdecimal (3.1.6)
- bindata (2.4.15)
+ bindata (2.5.0)
bindex (0.8.1)
bootsnap (1.18.3)
msgpack (~> 1.2)
@@ -223,6 +223,8 @@ GEM
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dumb_delegator (1.0.0)
+ email_validator (2.2.4)
+ activemodel
erubi (1.12.0)
et-orbi (1.2.7)
tzinfo
@@ -231,6 +233,15 @@ GEM
excon (0.109.0)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
+ faraday (2.9.0)
+ faraday-net_http (>= 2.0, < 3.2)
+ faraday-follow_redirects (0.3.0)
+ faraday (>= 1, < 3)
+ faraday-jwt (0.1.0)
+ faraday (~> 2.0)
+ json-jwt (~> 1.16)
+ faraday-net_http (3.1.0)
+ net-http
ffi (1.16.3)
flipper (1.2.2)
concurrent-ruby (< 2)
@@ -308,8 +319,7 @@ GEM
highline (3.0.1)
htmlentities (4.3.4)
http_accept_language (2.1.1)
- httpclient (2.8.3)
- i18n (1.14.1)
+ i18n (1.14.4)
concurrent-ruby (~> 1.0)
i18n-tasks (1.0.13)
activesupport (>= 4.0.2)
@@ -341,10 +351,13 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.1)
- json-jwt (1.13.0)
+ json-jwt (1.16.6)
activesupport (>= 4.2)
aes_key_wrap
+ base64
bindata
+ faraday (~> 2.0)
+ faraday-follow_redirects
json_schemer (2.1.1)
hana (~> 1.3)
regexp_parser (~> 2.0)
@@ -418,6 +431,8 @@ GEM
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
+ net-http (0.4.1)
+ uri
net-imap (0.4.10)
date
net-protocol
@@ -431,16 +446,19 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- openid_connect (1.3.0)
+ openid_connect (2.3.0)
activemodel
attr_required (>= 1.0.0)
- json-jwt (>= 1.5.0)
- rack-oauth2 (>= 1.6.1)
- swd (>= 1.0.0)
+ email_validator
+ faraday (~> 2.0)
+ faraday-follow_redirects
+ json-jwt (>= 1.16)
+ mail
+ rack-oauth2 (~> 2.2)
+ swd (~> 2.0)
tzinfo
- validate_email
validate_url
- webfinger (>= 1.0.1)
+ webfinger (~> 2.0)
orm_adapter (0.5.0)
parallel (1.24.0)
parsby (1.1.1)
@@ -482,10 +500,11 @@ GEM
rack (>= 1.0, < 4)
rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
- rack-oauth2 (1.19.0)
+ rack-oauth2 (2.2.1)
activesupport
attr_required
- httpclient
+ faraday (~> 2.0)
+ faraday-follow_redirects
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (3.2.0)
@@ -710,10 +729,11 @@ GEM
stringio (3.1.0)
strong_migrations (1.7.0)
activerecord (>= 5.2)
- swd (1.3.0)
+ swd (2.0.3)
activesupport (>= 3)
attr_required (>= 0.0.5)
- httpclient (>= 2.4)
+ faraday (~> 2.0)
+ faraday-follow_redirects
sysexits (1.2.0)
temple (0.8.2)
terminal-table (3.0.2)
@@ -737,9 +757,7 @@ GEM
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
- validate_email (0.1.6)
- activemodel (>= 3.0)
- mail (>= 2.2.5)
+ uri (0.13.0)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
@@ -766,9 +784,10 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webfinger (1.2.0)
+ webfinger (2.1.3)
activesupport
- httpclient (>= 2.4)
+ faraday (~> 2.0)
+ faraday-follow_redirects
webmock (3.20.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
@@ -834,6 +853,7 @@ DEPENDENCIES
dotenv-rails
dry-monads
factory_bot
+ faraday-jwt
flipper
flipper-active_record
flipper-active_support_cache_store
diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix
index 0a6312f5..87a3d1ab 100644
--- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix
+++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix
@@ -503,10 +503,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5";
+ sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19";
type = "gem";
};
- version = "2.4.15";
+ version = "2.5.0";
};
bindex = {
groups = [
@@ -1033,6 +1033,17 @@
};
version = "1.0.0";
};
+ email_validator = {
+ dependencies = [ "activemodel" ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs";
+ type = "gem";
+ };
+ version = "2.2.4";
+ };
erubi = {
groups = [
"default"
@@ -1090,6 +1101,53 @@
};
version = "6.4.6";
};
+ faraday = {
+ dependencies = [ "faraday-net_http" ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
+ type = "gem";
+ };
+ version = "2.9.0";
+ };
+ faraday-follow_redirects = {
+ dependencies = [ "faraday" ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ faraday-jwt = {
+ dependencies = [
+ "faraday"
+ "json-jwt"
+ ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "0yqd9529f1g77prcfzf14ri5kdnr32yzymh55wc7cjr6ybblhk1p";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ faraday-net_http = {
+ dependencies = [ "net-http" ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
+ type = "gem";
+ };
+ version = "3.1.0";
+ };
ffi = {
groups = [
"default"
@@ -1477,16 +1535,6 @@
};
version = "2.1.1";
};
- httpclient = {
- groups = [ "default" ];
- platforms = [ ];
- source = {
- remotes = [ "https://rubygems.org" ];
- sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
- type = "gem";
- };
- version = "2.8.3";
- };
i18n = {
dependencies = [ "concurrent-ruby" ];
groups = [
@@ -1497,10 +1545,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+ sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.4";
};
i18n-tasks = {
dependencies = [
@@ -1656,16 +1704,19 @@
dependencies = [
"activesupport"
"aes_key_wrap"
+ "base64"
"bindata"
+ "faraday"
+ "faraday-follow_redirects"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr";
+ sha256 = "0v16kd05ijdmw1q8avpfsjkdiha6c2070hbz2g2fqg3lv2f1yidb";
type = "gem";
};
- version = "1.13.0";
+ version = "1.16.6";
};
json_schemer = {
dependencies = [
@@ -2090,6 +2141,17 @@
};
version = "3.0.0";
};
+ net-http = {
+ dependencies = [ "uri" ];
+ groups = [ "default" ];
+ platforms = [ ];
+ source = {
+ remotes = [ "https://rubygems.org" ];
+ sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";
+ type = "gem";
+ };
+ version = "0.4.1";
+ };
net-imap = {
dependencies = [
"date"
@@ -2185,11 +2247,14 @@
dependencies = [
"activemodel"
"attr_required"
+ "email_validator"
+ "faraday"
+ "faraday-follow_redirects"
"json-jwt"
+ "mail"
"rack-oauth2"
"swd"
"tzinfo"
- "validate_email"
"validate_url"
"webfinger"
];
@@ -2197,10 +2262,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7";
+ sha256 = "0k3l4ak1mawrw74qy4xfh81hdfxvamijcjb3f1gadq0ixgprrfqd";
type = "gem";
};
- version = "1.3.0";
+ version = "2.3.0";
};
orm_adapter = {
groups = [ "default" ];
@@ -2477,7 +2542,8 @@
dependencies = [
"activesupport"
"attr_required"
- "httpclient"
+ "faraday"
+ "faraday-follow_redirects"
"json-jwt"
"rack"
];
@@ -2485,10 +2551,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw";
+ sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7";
type = "gem";
};
- version = "1.19.0";
+ version = "2.2.1";
};
rack-protection = {
dependencies = [
@@ -3596,16 +3662,17 @@
dependencies = [
"activesupport"
"attr_required"
- "httpclient"
+ "faraday"
+ "faraday-follow_redirects"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w";
+ sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc";
type = "gem";
};
- version = "1.3.0";
+ version = "2.0.3";
};
sysexits = {
groups = [
@@ -3803,19 +3870,15 @@
};
version = "2.5.0";
};
- validate_email = {
- dependencies = [
- "activemodel"
- "mail"
- ];
+ uri = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
+ sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
type = "gem";
};
- version = "0.1.6";
+ version = "0.13.0";
};
validate_url = {
dependencies = [
@@ -3933,16 +3996,17 @@
webfinger = {
dependencies = [
"activesupport"
- "httpclient"
+ "faraday"
+ "faraday-follow_redirects"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q";
+ sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn";
type = "gem";
};
- version = "1.2.0";
+ version = "2.1.3";
};
webmock = {
dependencies = [