From d7d21d8a588fa984666b5e54788f2775e93c77c8 Mon Sep 17 00:00:00 2001 From: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:27:40 -0800 Subject: [PATCH 1/2] replace softserv w/ n8 (config code) --- .github/workflows/build-test-lint.yaml | 6 +++--- .github/workflows/deploy.yaml | 2 +- Dockerfile | 2 +- docker-compose.yml | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index 60893cbd7..1ffb7fcbd 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -17,7 +17,7 @@ on: jobs: build: - uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/build.yaml@v0.0.22 secrets: inherit with: platforms: "linux/amd64" @@ -26,10 +26,10 @@ jobs: workerTarget: hyku-worker test: needs: build - uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/test.yaml@v0.0.22 lint: needs: build - uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/lint.yaml@v0.0.22 with: rubocop_cmd: 'bundle exec rubocop --parallel --format progress' diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 45d31ca48..d5b63e5b3 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -20,5 +20,5 @@ on: jobs: deploy: - uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/deploy.yaml@v0.0.22 secrets: inherit diff --git a/Dockerfile b/Dockerfile index 70a3429c1..b7033fec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN wget -O - https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemal make && \ make install -FROM ghcr.io/scientist-softserv/dev-ops/samvera:f71b284f as hyku-base +FROM ghcr.io/notch8/dev-ops/samvera:f71b284f as hyku-base COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/ RUN sh -l -c " \ diff --git a/docker-compose.yml b/docker-compose.yml index d6140bf39..537cd1e26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ x-app: &app args: - EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool - HYKU_BULKRAX_ENABLED=true - image: ghcr.io/scientist-softserv/palni-palci:${TAG:-latest} + image: ghcr.io/notch8/palni-palci:${TAG:-latest} env_file: - .env # NOTE: all common env variables moved to .env @@ -29,9 +29,9 @@ x-app-worker: &app-worker - EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool - HYKU_BULKRAX_ENABLED=true cache_from: - - ghcr.io/scientist-softserv/palni-palci:latest - - ghcr.io/scientist-softserv/palni-palci/worker:latest - image: ghcr.io/scientist-softserv/palni-palci/worker:${TAG:-latest} + - ghcr.io/notch8/palni-palci:latest + - ghcr.io/notch8/palni-palci/worker:latest + image: ghcr.io/notch8/palni-palci/worker:${TAG:-latest} command: sh -l -c 'bundle && bundle exec sidekiq' depends_on: check_volumes: @@ -85,7 +85,7 @@ services: timeout: "8s" solr: - image: ghcr.io/scientist-softserv/palni-palci/solr:${TAG:-latest} + image: ghcr.io/notch8/palni-palci/solr:${TAG:-latest} build: context: solr dockerfile: Dockerfile From c14df6976fab3ab3f4a5afb72a44a40a0efdcb10 Mon Sep 17 00:00:00 2001 From: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:07:08 -0800 Subject: [PATCH 2/2] replace softserv w/ n8 (code base) --- Gemfile | 2 +- Gemfile.lock | 2 +- README.md | 2 +- .../users/omniauth_callbacks_controller.rb | 2 +- app/jobs/create_large_derivatives_job.rb | 2 +- app/models/sushi.rb | 2 +- app/models/sushi/platform_report.rb | 2 +- app/models/work_authorization.rb | 2 +- .../hyrax/collection_presenter_decorator.rb | 2 +- app/services/iiif_print/tenant_config.rb | 16 ++++++++-------- config/application.rb | 4 ++-- .../location_decorator.rb | 2 +- .../strategies/open_id_connect_decorator.rb | 2 +- lib/tasks/move_banner_images.rake | 2 +- spec/features/feature_flag_spec.rb | 8 ++++---- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 17b75d691..5ee415528 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'main' gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'main' gem 'i18n-debug', require: false, group: %i[development test] gem 'i18n-tasks', group: %i[development test] -gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main' +gem 'iiif_print', github: 'notch8/iiif_print', branch: 'main' gem 'jbuilder', '~> 2.5' gem 'jquery-rails' # Use jquery as the JavaScript library # The maintainers yanked 0.3.2 version (see https://github.com/dryruby/json-canonicalization/issues/2) diff --git a/Gemfile.lock b/Gemfile.lock index 1cec17c5e..14a319c2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GIT valkyrie (~> 2, >= 2.1.1) GIT - remote: https://github.com/scientist-softserv/iiif_print.git + remote: https://github.com/notch8/iiif_print.git revision: eb320b1c454f0219d9e17fd12fd2b525770123b2 branch: main specs: diff --git a/README.md b/README.md index a1cdac8fb..f638e362a 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ Analytics is comprised of two aspects: - *Sending* data to the analytics end-point - *Fetching* and reporting data from the analytics end-point -For a more exhaustive discusion, see [Resolve Sending Google Analytics Data for Tenant and Proprietor · Issue #910 · scientist-softserv/palni-palci](https://github.com/scientist-softserv/palni-palci/issues/910). +For a more exhaustive discusion, see [Resolve Sending Google Analytics Data for Tenant and Proprietor · Issue #910 · notch8/palni-palci](https://github.com/notch8/palni-palci/issues/910). ### Google diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 6cb12bfb3..96dc8ba57 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -10,7 +10,7 @@ def callback @user = User.from_omniauth(request.env['omniauth.auth']) if @user.persisted? - # https://github.com/scientist-softserv/palni-palci/issues/633 + # https://github.com/notch8/palni-palci/issues/633 WorkAuthorization.handle_signin_for!(user: @user, scope: params[:scope]) # By default the sign_in_and_redirect method will look for a stored_location_for. However, diff --git a/app/jobs/create_large_derivatives_job.rb b/app/jobs/create_large_derivatives_job.rb index c068d5152..00a34a52c 100644 --- a/app/jobs/create_large_derivatives_job.rb +++ b/app/jobs/create_large_derivatives_job.rb @@ -10,7 +10,7 @@ # # @see CreateDerivativesJobDecorator # @see Hydra::Derivatives::Processors::Ffmpeg -# @see https://github.com/scientist-softserv/palni-palci/issues/852 +# @see https://github.com/notch8/palni-palci/issues/852 class CreateLargeDerivativesJob < CreateDerivativesJob queue_as :auxiliary end diff --git a/app/models/sushi.rb b/app/models/sushi.rb index 23b847624..6e6cb92e8 100644 --- a/app/models/sushi.rb +++ b/app/models/sushi.rb @@ -416,7 +416,7 @@ def coerce_author(params = {}) return true unless params.key?(:author) @author = params[:author] - # See https://github.com/scientist-softserv/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance + # See https://github.com/notch8/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance raise Sushi::Error::InvalidReportFilterValueError.new(data: "You may not query for multiple authors (as specified by the `#{DELIMITER}' delimiter.)") if @author.include?(DELIMITER) # rubocop:disable Metrics/LineLength diff --git a/app/models/sushi/platform_report.rb b/app/models/sushi/platform_report.rb index 0103035bd..b66374f9c 100644 --- a/app/models/sushi/platform_report.rb +++ b/app/models/sushi/platform_report.rb @@ -123,7 +123,7 @@ def attribute_performance_for_resource_types # We want to consider "or" behavior for multiple metric_types. Namely if you specify any # metric type (other than Searches_Platform) you're going to get results. # - # See https://github.com/scientist-softserv/palni-palci/issues/686#issuecomment-1785326034 + # See https://github.com/notch8/palni-palci/issues/686#issuecomment-1785326034 return [] if metric_type_in_params && (metric_types & (ALLOWED_METRIC_TYPES - ['Searches_Platform'])).count.zero? data_for_resource_types.map do |record| diff --git a/app/models/work_authorization.rb b/app/models/work_authorization.rb index 5c885d4e7..e0a0ffc22 100644 --- a/app/models/work_authorization.rb +++ b/app/models/work_authorization.rb @@ -10,7 +10,7 @@ # first does all of the postgres and then does one (ideally single) fedora change. It is # not bullet proof but does hopefully improve the chances of data integrity. # -# @see https://github.com/scientist-softserv/palni-palci/issues/633 +# @see https://github.com/notch8/palni-palci/issues/633 class WorkAuthorization < ActiveRecord::Base # rubocop:disable ApplicationRecord class WorkNotFoundError < StandardError def initialize(user:, work:) diff --git a/app/presenters/hyrax/collection_presenter_decorator.rb b/app/presenters/hyrax/collection_presenter_decorator.rb index 6c69e93de..7bbf32f84 100644 --- a/app/presenters/hyrax/collection_presenter_decorator.rb +++ b/app/presenters/hyrax/collection_presenter_decorator.rb @@ -110,7 +110,7 @@ def collection_featurable? # # @return [String] # - # @see https://github.com/scientist-softserv/palni-palci/issues/951 + # @see https://github.com/notch8/palni-palci/issues/951 # @see https://github.com/samvera/hyku/issues/1815 def collection_type_badge return "" unless Site.account&.present? diff --git a/app/services/iiif_print/tenant_config.rb b/app/services/iiif_print/tenant_config.rb index 5cf81b351..0294815f7 100644 --- a/app/services/iiif_print/tenant_config.rb +++ b/app/services/iiif_print/tenant_config.rb @@ -12,10 +12,10 @@ module IiifPrint # it is hopefully easier to understand the configuration requirements and scope to this # change. At some point, this might make sense to bring into IIIF Print directly. # - # @see https://github.com/scientist-softserv/palni-palci/issues/656 palni-palci#656 - # @see https://github.com/scientist-softserv/palni-palci/issues/657 palni-palci#657 - # @see https://github.com/scientist-softserv/palni-palci/issues/658 palni-palci#658 - # @see https://github.com/scientist-softserv/palni-palci/issues/659 palni-palci#659 + # @see https://github.com/notch8/palni-palci/issues/656 palni-palci#656 + # @see https://github.com/notch8/palni-palci/issues/657 palni-palci#657 + # @see https://github.com/notch8/palni-palci/issues/658 palni-palci#658 + # @see https://github.com/notch8/palni-palci/issues/659 palni-palci#659 module TenantConfig ## # When we were not planning on calling the underlying IiifPrint service but did due to some kind @@ -92,8 +92,8 @@ def iiif_print_service_instance # derivative_service_plugins: [ IiifPrint::TextExtractionDerivativeService ]) # end # - # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring - # @see https://github.com/scientist-softserv/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation + # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring + # @see https://github.com/notch8/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation module PdfSplitter mattr_accessor :iiif_print_splitter self.iiif_print_splitter = ::IiifPrint::SplitPdfs::PagesToJpgsSplitter @@ -108,7 +108,7 @@ def self.call(*args) end ## - # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service + # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service module SkipSplittingPdfService ## # @return [Symbol] Always :tenant_does_not_split_pdfs @@ -127,7 +127,7 @@ def self.conditionally_enqueue(*_args) # a relatively singular place for all of the configurations. module FileSetActorDecorator ## - # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding + # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding def service return TenantConfig::SkipSplittingPdfService unless TenantConfig.use_iiif_print? diff --git a/config/application.rb b/config/application.rb index 29cd2592d..3c2b7d25e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,7 +14,7 @@ class Application < Rails::Application # @return [String] the URL to use for searching across all tenants. # # @see .cross_tenant_search_host - # @see https://github.com/scientist-softserv/palni-palci/issues/947 + # @see https://github.com/notch8/palni-palci/issues/947 def self.cross_tenant_search_url # Do not include the scheme (e.g. http or https) but instead let the browser apply the correct # scheme. @@ -123,7 +123,7 @@ def self.cross_tenant_search_host ## # This needs to be in the after initialize so that the IiifPrint gem can do it's decoration. # - # @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override. + # @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override. Hyrax::Actors::FileSetActor.prepend(IiifPrint::TenantConfig::FileSetActorDecorator) Hyrax::WorkShowPresenter.prepend(IiifPrint::TenantConfig::WorkShowPresenterDecorator) diff --git a/lib/hyrax/controlled_vocabularies/location_decorator.rb b/lib/hyrax/controlled_vocabularies/location_decorator.rb index 9dff98114..529224b3e 100644 --- a/lib/hyrax/controlled_vocabularies/location_decorator.rb +++ b/lib/hyrax/controlled_vocabularies/location_decorator.rb @@ -6,7 +6,7 @@ module LocationDecorator # the Location class throws an error that split is undefined since it is an enumerator, but this error is coming from deeply nested dependencies. # This causes 500 errors for works with their Location field filled in. # defining split just for the purpose of getting past this error seemed to work and allow locations to save correctly with no adverse effects. - # See https://github.com/scientist-softserv/palni-palci/issues/530 for more details + # See https://github.com/notch8/palni-palci/issues/530 for more details def split(*) [] end diff --git a/lib/omni_auth/strategies/open_id_connect_decorator.rb b/lib/omni_auth/strategies/open_id_connect_decorator.rb index 8a4e094c9..420c6ab93 100644 --- a/lib/omni_auth/strategies/open_id_connect_decorator.rb +++ b/lib/omni_auth/strategies/open_id_connect_decorator.rb @@ -3,7 +3,7 @@ module Strategies ## # OVERRIDE to provide openid {#scope} based on the current session. # - # @see https://github.com/scientist-softserv/palni-palci/issues/633 + # @see https://github.com/notch8/palni-palci/issues/633 module OpenIDConnectDecorator ## # override callback phase to fix issue where state is not required. diff --git a/lib/tasks/move_banner_images.rake b/lib/tasks/move_banner_images.rake index d6d9d1306..dae08a609 100644 --- a/lib/tasks/move_banner_images.rake +++ b/lib/tasks/move_banner_images.rake @@ -1,6 +1,6 @@ # frozen_string_literal: true -# @see https://github.com/scientist-softserv/palni-palci/issues/674 +# @see https://github.com/notch8/palni-palci/issues/674 namespace :hyku do desc 'Move all banner images to new expected location' task copy_banner_images: :environment do diff --git a/spec/features/feature_flag_spec.rb b/spec/features/feature_flag_spec.rb index 44167e838..2ea4a83bd 100644 --- a/spec/features/feature_flag_spec.rb +++ b/spec/features/feature_flag_spec.rb @@ -27,7 +27,7 @@ # rubocop:enable RSpec/LetSetup context 'as a repository admin' do - skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933' + skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933' it 'has a setting for featured works' do login_as admin visit 'admin/features' @@ -44,7 +44,7 @@ expect(page).to have_content 'Pandas' end - skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933' + skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933' it 'has a setting for recently uploaded' do login_as admin visit 'admin/features' @@ -63,7 +63,7 @@ expect(page).to have_css('div#recently_uploaded') end - skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933' + skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933' it 'has settings for the default PDF viewer with a custom toggle switch' do login_as admin visit 'admin/features' @@ -76,7 +76,7 @@ end context 'when all home tabs and share work features are turned off' do - skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933' + skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933' it 'the page only shows the collections tab' do login_as admin visit 'admin/features'