Merge pull request #15 from mlibrary/2022-09-08-updates

2022-09-08 Updates
mlibrary · Sep 9, 2022 · 0ea12ab · 0ea12ab
2 parents 3030b1e + 7b48bb1
commit 0ea12ab
Show file tree

Hide file tree

Showing 18 changed files with 392 additions and 626 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -17,7 +17,7 @@ Talk about the intent and scope of the original issue. Go over the general chang
 
 Add links to any documentation or issues that can help give more background information. Is the pull request related to a GitHub or JIRA issue? Link to them while using [closing keywords](https://docs.github.com/articles/closing-issues-using-keywords), like so:
 
-> This pull request resolves/closes/fixes #_1234_/[JIRA-1234](https://tools.lib.umich.edu/jira/browse/JIRA-1234).
+> This pull request resolves/closes/fixes #_1234_/[JIRA-1234](https://mlit.atlassian.net/browse/JIRA-1234).
 
 ## Anything else?
 _Optional_. If appropriate, provide additional notes the reviewers should be made aware of. They can be about any "gotchas" or even changes that are expected to be made in the future, but are not applied to this pull request.

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -40,11 +40,10 @@ jobs:
     environment: testing
     steps:
     - name: Deploy to Testing
-      uses: mlibrary/deploy-to-kubernetes@v1
+      uses: mlibrary/deploy-to-kubernetes@v2
       with:
-        github_username: ${{ github.actor }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        image: mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.sha }}
+        registry_token: ${{ secrets.GITHUB_TOKEN }}
+        image: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.sha }}
         cluster_ca: ${{ secrets.HATCHER_CLUSTER_CA }}
         cluster_server: https://hatcher.kubernetes.lib.umich.edu
         namespace_token: ${{ secrets.HATCHER_TOKEN }}
@@ -56,11 +55,10 @@ jobs:
     environment: staging
     steps:
     - name: Deploy to Staging
-      uses: mlibrary/deploy-to-kubernetes@v1
+      uses: mlibrary/deploy-to-kubernetes@v2
       with:
-        github_username: ${{ github.actor }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        image: mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.sha }}
+        registry_token: ${{ secrets.GITHUB_TOKEN }}
+        image: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.sha }}
         cluster_ca: ${{ secrets.HATCHER_CLUSTER_CA }}
         cluster_server: https://hatcher.kubernetes.lib.umich.edu
         namespace_token: ${{ secrets.HATCHER_TOKEN }}

diff --git a/.github/workflows/deploy-production.yaml b/.github/workflows/deploy-production.yaml
@@ -16,11 +16,10 @@ jobs:
     environment: production
     steps:
     - name: Deploy to Production
-      uses: mlibrary/deploy-to-kubernetes@v1
+      uses: mlibrary/deploy-to-kubernetes@v2
       with:
-        github_username: ${{ github.actor }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        image: mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.event.inputs.tag }}
+        registry_token: ${{ secrets.GITHUB_TOKEN }}
+        image: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{ github.event.inputs.tag }}
         cluster_ca: ${{ secrets.HATCHER_CLUSTER_CA }}
         cluster_server: https://hatcher.kubernetes.lib.umich.edu
         namespace_token: ${{ secrets.HATCHER_TOKEN }}

diff --git a/.github/workflows/manual-deploy-staging.yaml b/.github/workflows/manual-deploy-staging.yaml
@@ -63,9 +63,8 @@ jobs:
     - name: Deploy to ${{ env.environment }}
       uses: mlibrary/deploy-to-kubernetes@v1
       with:
-        github_username: ${{ github.actor }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        image: mlibrary/${{ secrets.IMAGE_NAME }}:${{ steps.tag_check.outputs.tag }}
+        registry_token: ${{ secrets.GITHUB_TOKEN }}
+        image: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{ steps.tag_check.outputs.tag }}
         cluster_ca: ${{ secrets.HATCHER_CLUSTER_CA }}
         cluster_server: https://hatcher.kubernetes.lib.umich.edu
         namespace_token: ${{ secrets.HATCHER_TOKEN }}

diff --git a/.github/workflows/manual-deploy-testing.yaml b/.github/workflows/manual-deploy-testing.yaml
@@ -60,11 +60,10 @@ jobs:
         push: true
         tags: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{steps.tag_check.outputs.tag}}
     - name: Deploy to ${{ env.environment }}
-      uses: mlibrary/deploy-to-kubernetes@v1
+      uses: mlibrary/deploy-to-kubernetes@v2
       with:
-        github_username: ${{ github.actor }}
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        image: mlibrary/${{ secrets.IMAGE_NAME }}:${{ steps.tag_check.outputs.tag }}
+        registry_token: ${{ secrets.GITHUB_TOKEN }}
+        image: ghcr.io/mlibrary/${{ secrets.IMAGE_NAME }}:${{ steps.tag_check.outputs.tag }}
         cluster_ca: ${{ secrets.HATCHER_CLUSTER_CA }}
         cluster_server: https://hatcher.kubernetes.lib.umich.edu
         namespace_token: ${{ secrets.HATCHER_TOKEN }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,10 +12,10 @@ jobs:
         run: cat .env-example .env-dev-values > .env
       - name: Load .env file
         uses: xom9ikk/dotenv@v1.0.2
-      - name: Set up Ruby 3.1.0
+      - name: Set up Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.0
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Run linter for Ruby
         run: bundle exec standardrb

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 ARG RUBY_VERSION=3.1
 FROM ruby:${RUBY_VERSION}
 
-ARG BUNDLER_VERSION=2.3.19
-ARG NPM_VERSION=8.10
+ARG BUNDLER_VERSION=2.3.22
+ARG NPM_VERSION=8.19.1
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,8 +1,8 @@
 ARG RUBY_VERSION=3.1
 FROM ruby:${RUBY_VERSION}
 
-ARG BUNDLER_VERSION=2.3.19
-ARG NPM_VERSION=8.10
+ARG BUNDLER_VERSION=2.3.22
+ARG NPM_VERSION=8.19.1
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,15 +11,15 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     anyway_config (2.3.0)
       ruby-next-core (>= 0.14.0)
@@ -46,10 +46,11 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    json-jwt (1.14.0)
+    json-jwt (1.15.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
+      httpclient
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -60,7 +61,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mustermann (2.0.2)
@@ -80,28 +81,29 @@ GEM
       addressable (~> 2.5)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
-    openid_connect (1.3.0)
+    openid_connect (1.3.1)
       activemodel
       attr_required (>= 1.0.0)
       json-jwt (>= 1.5.0)
+      net-smtp
       rack-oauth2 (>= 1.6.1)
       swd (>= 1.0.0)
       tzinfo
       validate_email
       validate_url
       webfinger (>= 1.0.1)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     prometheus-client (2.1.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.7)
-    puma (5.6.4)
+      pry (>= 0.13, < 0.15)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
     rack (2.2.4)
     rack-oauth2 (1.21.2)
@@ -115,7 +117,7 @@ GEM
     rack-test (2.0.2)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.5.0)
@@ -133,17 +135,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.32.0)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.19.1, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
@@ -170,8 +172,8 @@ GEM
       tilt (~> 2.0)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
-    standard (1.14.0)
-      rubocop (= 1.32.0)
+    standard (1.16.1)
+      rubocop (= 1.35.1)
       rubocop-performance (= 1.14.3)
     swd (1.3.0)
       activesupport (>= 3)
@@ -191,7 +193,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.16.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -235,4 +237,4 @@ DEPENDENCIES
   yabeda-puma-plugin
 
 BUNDLED WITH
-   2.3.19
+   2.3.22
diff --git a/css/styles/anchors.css b/css/styles/anchors.css
@@ -19,7 +19,7 @@
 h1 a {
   color: inherit;
   text-decoration-color: var(--color-teal-400);
-  text-underline-offset: var(--space-xx-small);
+  text-underline-offset: 0.25rem;
 }
 
 h1 a:not(:hover) {

diff --git a/css/styles/base.css b/css/styles/base.css
@@ -36,19 +36,19 @@ body {
 
 main {
   flex-grow: 1;
-  margin-bottom: var(--space-x-large);
+  margin-bottom: 2rem;
 }
 
 main > * + * {
-  margin-top: var(--space-x-large);
+  margin-top: 2rem;
 }
 
 @media (min-width: 1000px) {
   main {
     align-content: start;
     align-items: flex-start;
     display: grid;
-    gap: 0 var(--space-xxx-large);
+    gap: 0 3rem;
     grid-template-areas:
       "title title"
       "flash flash"

diff --git a/css/styles/forms.css b/css/styles/forms.css
@@ -26,7 +26,7 @@ form > * {
 
 form > * + * {
   display: block;
-  margin-top: var(--space-small);
+  margin-top: 0.75rem;
 }
 
 
@@ -51,10 +51,10 @@ select {
   all: unset;
   border: solid 1px var(--color-neutral-400);
   border-radius: var(--radius-default);
-  box-shadow: inset 0 1px var(--space-xxx-small) rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 0.125rem rgba(0, 0, 0, 0.1);
   font-family: inherit;
   font-size: 1rem;
-  padding: var(--space-small);
+  padding: 0.75rem;
 }
 
 input {
@@ -72,14 +72,14 @@ input {
 
 .dropdown > select {
   cursor: pointer;
-  padding-right: var(--space-xx-large);
+  padding-right: 2.5rem;
 }
 
 .dropdown > svg {
   fill: var(--color-teal-400);
   pointer-events: none;
   position: absolute;
-  right: var(--space-x-small);
+  right: 0.5rem;
   top: 50%;
   transform: translateY(-50%);
 }
@@ -124,7 +124,7 @@ duet-date-picker {
 .duet-date__select select:focus + .duet-date__select-label,
 .duet-date__next:focus,
 .duet-date__prev:focus {
-  box-shadow: 0 0 0 var(--space-xxx-small) var(--color-maize-400),
+  box-shadow: 0 0 0 0.125rem var(--color-maize-400),
     0 0 0 3px var(--color-neutral-400);
   outline: 0;
 }

diff --git a/css/styles/get-option.css b/css/styles/get-option.css
@@ -20,9 +20,9 @@
 .get-option {
   border: solid 1px var(--color-teal-400);
   border-radius: var(--radius-default);
-  box-shadow: 0 var(--space-xxx-small) var(--space-x-small) 0 rgba(16, 102, 132, 0.5);
+  box-shadow: 0 0.125rem 0.5rem 0 rgba(16, 102, 132, 0.5);
   grid-area: content;
-  padding: var(--space-large);
+  padding: 1.5rem;
 }
 
 

diff --git a/css/styles/messages.css b/css/styles/messages.css
@@ -22,7 +22,7 @@
 .message--info {
   background: var(--color-teal-100);
   border-bottom: 1px solid var(--color-teal-400);
-  padding: var(--space-small) var(--space-medium);
+  padding: 0.75rem 1rem;
 }
 
 #maincontent + .message {

diff --git a/css/styles/sidebar.css b/css/styles/sidebar.css
@@ -22,11 +22,11 @@
 aside {
   grid-area: sidebar;
   position: sticky;
-  top: var(--space-x-large);
+  top: 2rem;
 }
 
 aside > * + * {
-  margin-top: var(--space-x-large);
+  margin-top: 2rem;
 }
 
 
@@ -52,7 +52,7 @@ aside dl.record {
 }
 
 aside dl.record > dt {
-  padding-right: var(--space-x-large);
+  padding-right: 2rem;
 }
 
 /*** 2.2 - Service Info ***/
@@ -66,11 +66,11 @@ aside ul.contact li {
   align-items: center;
   display: flex;
   flex-wrap: wrap;
-  gap: var(--space-x-small);
+  gap: 0.5rem;
 }
 
 aside ul.contact li + li {
-  margin-top: var(--space-medium);
+  margin-top: 1rem;
 }
 
 aside ul.contact li svg {