From d315a2370370817be558d631dcb0bbcf0bbf6338 Mon Sep 17 00:00:00 2001 From: Monique Rio Date: Tue, 30 Jul 2024 12:01:24 -0400 Subject: [PATCH 1/3] remove umich-lib components; change 1 to latest for consistency --- views/layout.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/views/layout.erb b/views/layout.erb index 00011a2..6ce0ee2 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -23,11 +23,10 @@ Get This <% if defined?(item) %> "<%= item.title %>" <% end %>| University of Michigan Library - + - - + From 763c977b4205ad8bfc02b8a2844944c6acc6e79e Mon Sep 17 00:00:00 2001 From: Monique Rio Date: Tue, 30 Jul 2024 12:02:49 -0400 Subject: [PATCH 2/3] removing image scanning from github actions --- .../workflows/build-deploy-on-release.yaml | 28 +++++++++---------- .github/workflows/build-main.yml | 28 +++++++++---------- .github/workflows/manual-deploy-unstable.yaml | 28 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-deploy-on-release.yaml b/.github/workflows/build-deploy-on-release.yaml index b8e8ab5..fdc5732 100644 --- a/.github/workflows/build-deploy-on-release.yaml +++ b/.github/workflows/build-deploy-on-release.yaml @@ -14,20 +14,20 @@ jobs: dockerfile: Dockerfile secrets: inherit - scan-image: - needs: build-production - runs-on: ubuntu-latest - steps: - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@master - with: - image-ref: ghcr.io/mlibrary/${{ vars.IMAGE_NAME }}:${{ github.event.release.tag_name }} - format: 'table' - exit-code: '1' - ignore-unfixed: true - vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' - skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' + #scan-image: + #needs: build-production + #runs-on: ubuntu-latest + #steps: + #- name: Run Trivy vulnerability scanner + #uses: aquasecurity/trivy-action@master + #with: + #image-ref: ghcr.io/mlibrary/${{ vars.IMAGE_NAME }}:${{ github.event.release.tag_name }} + #format: 'table' + #exit-code: '1' + #ignore-unfixed: true + #vuln-type: 'os,library' + #severity: 'CRITICAL,HIGH' + #skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' deploy-production: needs: build-production diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 18642b5..b893fcd 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -16,20 +16,20 @@ jobs: dockerfile: Dockerfile secrets: inherit - scan-image: - needs: build-unstable - runs-on: ubuntu-latest - steps: - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@master - with: - image-ref: ${{ needs.build-unstable.outputs.image }} - format: 'table' - exit-code: '1' - ignore-unfixed: true - vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' - skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' + #scan-image: + #needs: build-unstable + #runs-on: ubuntu-latest + #steps: + #- name: Run Trivy vulnerability scanner + #uses: aquasecurity/trivy-action@master + #with: + #image-ref: ${{ needs.build-unstable.outputs.image }} + #format: 'table' + #exit-code: '1' + #ignore-unfixed: true + #vuln-type: 'os,library' + #severity: 'CRITICAL,HIGH' + #skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' deploy-testing: needs: build-unstable diff --git a/.github/workflows/manual-deploy-unstable.yaml b/.github/workflows/manual-deploy-unstable.yaml index a6d1004..c04f74e 100644 --- a/.github/workflows/manual-deploy-unstable.yaml +++ b/.github/workflows/manual-deploy-unstable.yaml @@ -25,20 +25,20 @@ jobs: dockerfile: Dockerfile secrets: inherit - scan-image: - needs: build-unstable - runs-on: ubuntu-latest - steps: - - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@master - with: - image-ref: ${{ needs.build-unstable.outputs.image }} - format: 'table' - exit-code: '1' - ignore-unfixed: true - vuln-type: 'os,library' - severity: 'CRITICAL,HIGH' - skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' + #scan-image: + #needs: build-unstable + #runs-on: ubuntu-latest + #steps: + #- name: Run Trivy vulnerability scanner + #uses: aquasecurity/trivy-action@master + #with: + #image-ref: ${{ needs.build-unstable.outputs.image }} + #format: 'table' + #exit-code: '1' + #ignore-unfixed: true + #vuln-type: 'os,library' + #severity: 'CRITICAL,HIGH' + #skip-files: '/gems/ruby/3.2.0/gems/openid_connect-2.2.0/spec/mock_response/public_keys/private_key.pem' deploy: needs: build-unstable From 530d18feb6a20cf1f567fb9a33b1fd8240238d16 Mon Sep 17 00:00:00 2001 From: Monique Rio Date: Tue, 30 Jul 2024 12:10:36 -0400 Subject: [PATCH 3/3] update-dependencies --- Gemfile.lock | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a7b78c7..cf1624b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,25 +45,26 @@ GEM rexml date (3.3.4) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) drb (2.2.1) dry-initializer (3.1.1) email_validator (2.2.4) activemodel - faraday (2.9.2) + faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0-x86_64-linux-gnu) hashdiff (1.1.0) hashie (5.0.0) - http-2-next (1.0.3) - httpx (1.2.6) - http-2-next (>= 1.0.3) + http-2 (1.0.1) + httpx (1.3.0) + http-2 (>= 1.0.0) i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) @@ -79,6 +80,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -97,6 +99,7 @@ GEM date net-protocol net-pop (0.1.2) + net-protocol net-protocol (0.2.2) timeout net-smtp (0.5.0) @@ -106,7 +109,7 @@ GEM hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth_openid_connect (0.7.1) + omniauth_openid_connect (0.8.0) omniauth (>= 1.9, < 3) openid_connect (~> 2.2) openid_connect (2.3.0) @@ -123,7 +126,7 @@ GEM validate_url webfinger (~> 2.0) parallel (1.25.1) - parser (3.3.3.0) + parser (3.3.4.0) ast (~> 2.4.1) racc prometheus-client (4.2.3) @@ -134,11 +137,11 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - public_suffix (6.0.0) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) - rack (3.1.4) + racc (1.8.1) + rack (3.1.7) rack-oauth2 (2.2.1) activesupport attr_required @@ -161,7 +164,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.2) - rexml (3.3.1) + rexml (3.3.2) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -215,7 +218,7 @@ GEM tilt (~> 2.0) sinatra-flash (0.3.0) sinatra (>= 1.0.0) - standard (1.39.0) + standard (1.39.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0)