Merge pull request #30 from mlibrary/2023-05-01-updates

May 2023 dependency updates.

.github/PULL_REQUEST_TEMPLATE/dependency_updates_template.md

@@ -16,4 +16,5 @@ These dependencies have been updated to their latest versions:
   - [x] Chrome
   - [x] Firefox
   - [x] Safari
-  - [ ] Edge (the assignee was not able to test the pull request in this browser)
+  - [x] Edge
+

.github/pull_request_template.md

@@ -31,7 +31,7 @@ List instructions on how to test the pull request. Some examples:
   - [x] Chrome
   - [x] Firefox
   - [x] Safari
-  - [ ] Edge (the assignee was not able to test the pull request in this browser)
+  - [x] Edge
 - Run accessibility tests:
   - [x] WAVE
   - [x] ARC Toolkit

.github/workflows/build-deploy-on-release.yaml

@@ -11,6 +11,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.release.tag_name }}
+      dockerfile: Dockerfile.prod
     secrets: inherit
 
   deploy-production:

.github/workflows/build-main.yml

@@ -13,14 +13,15 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.sha }}
+      dockerfile: Dockerfile.prod
     secrets: inherit
 
   deploy-testing:
     needs: build-unstable
     name: Deploy to testing
     uses: mlibrary/platform-engineering-workflows/.github/workflows/deploy.yml@v1
     with:
-      image: ghcr.io/mlibrary/${{ vars.IMAGE_NAME }}-unstable:${{ github.sha }}
+      image: ${{ needs.build-unstable.outputs.image }}
       file: environments/get-this/testing/web-image.txt
       CONFIG_REPO_RW_APP_ID: ${{ vars.CONFIG_REPO_RW_APP_ID }}
       CONFIG_REPO_RW_INSTALL_ID: ${{ vars.CONFIG_REPO_RW_INSTALL_ID }}

.github/workflows/deploy-production.yaml

@@ -14,6 +14,7 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.inputs.tag }}
+      dockerfile: Dockerfile.prod
     secrets: inherit
 
   deploy-production:

.github/workflows/manual-deploy-unstable.yaml

@@ -22,14 +22,15 @@ jobs:
     with:
       image_name: ${{ vars.IMAGE_NAME }}
       tag: ${{ github.event.inputs.tag }}
+      dockerfile: Dockerfile.prod
     secrets: inherit
 
   deploy:
     needs: build-unstable
     name: Deploy to ${{ github.event.inputs.tanka_env }}
     uses: mlibrary/platform-engineering-workflows/.github/workflows/deploy.yml@v1
     with:
-      image: ghcr.io/mlibrary/${{ vars.IMAGE_NAME }}-unstable:${{ github.event.inputs.tag }}
+      image: ${{ needs.build-unstable.outputs.image }}
       file: environments/get-this/${{ github.event.inputs.tanka_env }}/web-image.txt
       CONFIG_REPO_RW_APP_ID: ${{ vars.CONFIG_REPO_RW_APP_ID }}
       CONFIG_REPO_RW_INSTALL_ID: ${{ vars.CONFIG_REPO_RW_INSTALL_ID }}

Dockerfile

@@ -1,8 +1,6 @@
 ARG RUBY_VERSION=3.2
 FROM ruby:${RUBY_VERSION}
 
-ARG BUNDLER_VERSION=2.4.7
-ARG NPM_VERSION="latest"
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000
@@ -12,14 +10,14 @@ LABEL maintainer="mrio@umich.edu"
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   apt-transport-https
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   nodejs \
   vim-tiny
 
-RUN gem install bundler:${BUNDLER_VERSION}
-RUN npm install -g npm@${NPM_VERSION}
+RUN gem install bundler
+RUN npm install -g npm
 
 RUN groupadd -g ${GID} -o ${UNAME}
 RUN useradd -m -d /app -u ${UID} -g ${GID} -o -s /bin/bash ${UNAME}

Dockerfile.prod

@@ -1,8 +1,6 @@
 ARG RUBY_VERSION=3.2
 FROM ruby:${RUBY_VERSION}
 
-ARG BUNDLER_VERSION=2.4.7
-ARG NPM_VERSION="latest"
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000
@@ -12,14 +10,14 @@ LABEL maintainer="mrio@umich.edu"
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   apt-transport-https
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   nodejs \
   vim-tiny
 
-RUN gem install bundler:${BUNDLER_VERSION}
-RUN npm install -g npm@${NPM_VERSION}
+RUN gem install bundler
+RUN npm install -g npm
 
 RUN groupadd -g ${GID} -o ${UNAME}
 RUN useradd -m -d /app -u ${UID} -g ${GID} -o -s /bin/bash ${UNAME}
@@ -38,8 +36,6 @@ RUN --mount=type=secret,id=gh_package_read_token \
 
 USER $UNAME
 
-
-
 RUN npm ci
 
 RUN npm run build

Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activesupport (7.0.4.2)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
-    anyway_config (2.3.1)
+    anyway_config (2.4.0)
       ruby-next-core (>= 0.14.0)
     ast (2.4.2)
     attr_required (1.0.1)
@@ -38,10 +38,9 @@ GEM
     hashdiff (1.0.1)
     hashie (5.0.0)
     http-2-next (0.5.1)
-    httpclient (2.8.3)
-    httpx (0.22.4)
+    httpx (0.23.1)
       http-2-next (>= 0.4.1)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
     json-jwt (1.16.3)
@@ -51,6 +50,7 @@ GEM
       faraday (~> 2.0)
       faraday-follow_redirects
     language_server-protocol (3.17.0.3)
+    lint_roller (1.0.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -74,27 +74,29 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth_openid_connect (0.6.1)
+    omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.1)
-    openid_connect (1.4.2)
+      openid_connect (~> 2.2)
+    openid_connect (2.2.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
       net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
       validate_email
       validate_url
-      webfinger (~> 1.2)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+      webfinger (~> 2.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     prometheus-client (2.1.0)
     pry (0.14.2)
@@ -104,51 +106,52 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     public_suffix (5.0.1)
-    puma (6.1.1)
+    puma (6.2.2)
       nio4r (~> 2.0)
-    rack (2.2.6.3)
-    rack-oauth2 (1.21.3)
+    rack (2.2.7)
+    rack-oauth2 (2.2.0)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
+    rack-protection (3.0.6)
       rack
-    rack-test (2.0.2)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.44.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.1)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.15.2)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-next-core (0.15.3)
@@ -160,27 +163,35 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (3.0.5)
+    sinatra (3.0.6)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
+      rack-protection (= 3.0.6)
       tilt (~> 2.0)
-    sinatra-contrib (3.0.5)
+    sinatra-contrib (3.0.6)
       multi_json
       mustermann (~> 3.0)
-      rack-protection (= 3.0.5)
-      sinatra (= 3.0.5)
+      rack-protection (= 3.0.6)
+      sinatra (= 3.0.6)
       tilt (~> 2.0)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
-    standard (1.24.3)
+    standard (1.28.2)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.44.1)
-      rubocop-performance (= 1.15.2)
-    swd (1.3.0)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.0.1)
+    standard-custom (1.0.0)
+      lint_roller (~> 1.0)
+    standard-performance (1.0.1)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.16.0)
+    swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     tilt (2.1.0)
     timeout (0.3.2)
     tzinfo (2.0.6)
@@ -192,9 +203,10 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    webfinger (1.2.0)
+    webfinger (2.1.2)
       activesupport
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

get-this.rb

@@ -7,9 +7,6 @@
 require "omniauth_openid_connect"
 require "sinatra/flash"
 require "faraday/follow_redirects"
-#
-# Monkey patch for omniauth_openid_connect -> openid_connect -> webfinger -> httpclient SSL errors
-require_relative "./lib/monkey_httpclient"
 
 Time.zone = "Eastern Time (US & Canada)"