From 3a5e7fec014b0e149d6131760ce4fb3eebf7bff7 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Wed, 13 Dec 2023 15:32:36 +0100 Subject: [PATCH] feat(ds-fr): Update to latest version --- machines/compute01/ds-fr/package/meta.nix | 4 +- .../compute01/ds-fr/package/rubyEnv/Gemfile | 1 - .../ds-fr/package/rubyEnv/Gemfile.lock | 61 +++------ .../ds-fr/package/rubyEnv/gemset.nix | 125 ++++++------------ 4 files changed, 64 insertions(+), 127 deletions(-) diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix index c463df7..402b3ff 100644 --- a/machines/compute01/ds-fr/package/meta.nix +++ b/machines/compute01/ds-fr/package/meta.nix @@ -1,5 +1,5 @@ { - version = "2023-12-13-01"; - src-hash = "sha256-yFICI1cKwe+0JyL5Qkl+rh4tgCxbwWY5URdnnrjEsRw="; + version = "2023-12-13-02"; + src-hash = "sha256-yr7gvyiJ4ymXQKMM/qPtwYrtA6RDMmlb3fhYizAw/tc="; deps-hash = "sha256-uTePIPqyb+nON9MXAkNELzEu8xFXIa+DQTMFWyOJuSY="; } diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile index ebfc313..b53c139 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -32,7 +32,6 @@ gem 'discard' gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails gem 'dry-monads' gem 'elastic-apm' -gem 'faraday-jwt' gem 'flipper' gem 'flipper-active_record' gem 'flipper-ui' diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index 8b03303..13cd7e0 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -116,7 +116,6 @@ GEM axlsx_styler (1.1.0) activesupport (>= 3.1) caxlsx (>= 2.0.2) - base64 (0.2.0) bcrypt (3.1.19) benchmark-ips (2.12.0) better_html (1.0.16) @@ -127,7 +126,7 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties - bindata (2.4.15) + bindata (2.4.10) bindex (0.8.1) bootsnap (1.9.3) msgpack (~> 1.0) @@ -175,7 +174,7 @@ GEM css_parser (1.9.0) addressable daemons (1.3.1) - date (3.3.4) + date (3.3.3) deep_cloneable (3.2.0) activerecord (>= 3.1.0, < 8) delayed_cron_job (0.7.4) @@ -238,16 +237,6 @@ GEM excon (0.102.0) factory_bot (6.1.0) activesupport (>= 5.0.0) - faraday (2.7.12) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - 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.0.2) ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -336,6 +325,7 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) http_accept_language (2.1.1) + httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) i18n-tasks (1.0.9) @@ -364,12 +354,10 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.5.1) - json-jwt (1.16.3) + json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap bindata - faraday (~> 2.0) - faraday-follow_redirects json_schemer (0.2.17) ecma-re-validator (~> 0.3) hana (~> 1.3) @@ -445,14 +433,14 @@ GEM multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - net-imap (0.4.7) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.2) + net-protocol (0.2.1) timeout - net-smtp (0.4.0) + net-smtp (0.3.3) net-protocol netrc (0.11.0) nio4r (2.5.9) @@ -460,19 +448,16 @@ GEM mini_portile2 (~> 2.8.2) racc (~> 1.4) open4 (1.3.4) - openid_connect (2.2.0) + openid_connect (1.3.0) activemodel attr_required (>= 1.0.0) - faraday (~> 2.0) - faraday-follow_redirects - json-jwt (>= 1.16) - net-smtp - rack-oauth2 (~> 2.2) - swd (~> 2.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) tzinfo validate_email validate_url - webfinger (~> 2.0) + webfinger (>= 1.0.1) orm_adapter (0.5.0) parallel (1.23.0) parsby (1.1.1) @@ -506,7 +491,7 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.4) + public_suffix (5.0.3) puma (6.3.1) nio4r (~> 2.0) pundit (2.2.0) @@ -518,11 +503,10 @@ GEM rack (>= 1.0, < 3) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-oauth2 (2.2.0) + rack-oauth2 (1.19.0) activesupport attr_required - faraday (~> 2.0) - faraday-follow_redirects + httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) rack-protection (3.0.5) @@ -739,11 +723,10 @@ GEM stackprof (0.2.21) strong_migrations (0.8.0) activerecord (>= 5.2) - swd (2.0.2) + swd (1.3.0) activesupport (>= 3) attr_required (>= 0.0.5) - faraday (~> 2.0) - faraday-follow_redirects + httpclient (>= 2.4) sysexits (1.2.0) temple (0.8.2) terminal-table (3.0.2) @@ -752,7 +735,7 @@ GEM thread_safe (0.3.6) tilt (2.0.11) timecop (0.9.4) - timeout (0.4.1) + timeout (0.4.0) ttfunk (1.7.0) turbo-rails (1.3.2) actionpack (>= 6.0.0) @@ -771,7 +754,7 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.15) + validate_url (1.0.13) activemodel (>= 3.0.0) public_suffix vcr (6.1.0) @@ -797,10 +780,9 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webfinger (2.1.2) + webfinger (1.2.0) activesupport - faraday (~> 2.0) - faraday-follow_redirects + httpclient (>= 2.4) webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -867,7 +849,6 @@ DEPENDENCIES dry-monads elastic-apm factory_bot - faraday-jwt flipper flipper-active_record flipper-ui diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index 95eb43a..7e14f58 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -312,16 +312,6 @@ }; version = "1.1.0"; }; - base64 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; - }; bcrypt = { groups = ["default"]; platforms = []; @@ -358,10 +348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; type = "gem"; }; - version = "2.4.15"; + version = "2.4.10"; }; bindex = { groups = ["default" "development"]; @@ -637,10 +627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; type = "gem"; }; - version = "3.3.4"; + version = "3.3.3"; }; deep_cloneable = { dependencies = ["activerecord"]; @@ -921,49 +911,6 @@ }; version = "6.1.0"; }; - faraday = { - dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; - type = "gem"; - }; - version = "2.7.12"; - }; - 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 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; - type = "gem"; - }; - version = "3.0.2"; - }; ffi = { groups = ["default" "development"]; platforms = []; @@ -1324,6 +1271,16 @@ }; 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 = ["default" "development" "test"]; @@ -1431,15 +1388,15 @@ version = "2.5.1"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata" "faraday" "faraday-follow_redirects"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nb5c0dlwi4ps5z46hg9zdah8cmqm3fcdxxqi9185b8ki4j73jai"; + sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; type = "gem"; }; - version = "1.16.3"; + version = "1.13.0"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -1784,10 +1741,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.4.7"; + version = "0.3.7"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1806,10 +1763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.1"; }; net-smtp = { dependencies = ["net-protocol"]; @@ -1817,10 +1774,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; type = "gem"; }; - version = "0.4.0"; + version = "0.3.3"; }; netrc = { groups = ["default"]; @@ -1864,15 +1821,15 @@ version = "1.3.4"; }; openid_connect = { - dependencies = ["activemodel" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j19w1vw762skcykysqz6zv077b3qa3qbs5x7aywh4p53dicgd25"; + sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7"; type = "gem"; }; - version = "2.2.0"; + version = "1.3.0"; }; orm_adapter = { groups = ["default"]; @@ -2048,10 +2005,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -2128,15 +2085,15 @@ version = "3.0.0"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "rack"]; + dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dq7yxj5hi3nvvafk6b77hcw9b8mxijynrlgx6nb0a8b6n86fgx0"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "2.2.0"; + version = "1.19.0"; }; rack-protection = { dependencies = ["rack"]; @@ -2946,15 +2903,15 @@ version = "0.8.0"; }; swd = { - dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects"]; + dependencies = ["activesupport" "attr_required" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sr1vz64kcxq148vnhp5jq8bzmhplhlc19zbihw76ya7nkh02qpa"; + sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w"; type = "gem"; }; - version = "2.0.2"; + version = "1.3.0"; }; sysexits = { groups = ["default" "development"]; @@ -3032,10 +2989,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.0"; }; ttfunk = { groups = ["default"]; @@ -3148,10 +3105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj"; + sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk"; type = "gem"; }; - version = "1.0.15"; + version = "1.0.13"; }; vcr = { groups = ["test"]; @@ -3230,15 +3187,15 @@ version = "4.1.0"; }; webfinger = { - dependencies = ["activesupport" "faraday" "faraday-follow_redirects"]; + dependencies = ["activesupport" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z31li2iss9r9pxslmmqa76kixlfl4q58ss9lkds7ci7yck9fm6j"; + sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q"; type = "gem"; }; - version = "2.1.2"; + version = "1.2.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"];