From 81dcc8bb4e7dcafcb376291c066c8537a944b3ff Mon Sep 17 00:00:00 2001 From: Sandeep Reddy Date: Mon, 19 Feb 2024 13:39:13 +0530 Subject: [PATCH 01/21] Update resource pool feature identifiers --- ...urcepoolidentifierstomiqproductfeatures.rb | 35 +++++++++++++++++ ...oolidentifierstomiqproductfeatures_spec.rb | 39 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb create mode 100644 spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb diff --git a/db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb b/db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb new file mode 100644 index 00000000..73187b6d --- /dev/null +++ b/db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb @@ -0,0 +1,35 @@ +class Updateresourcepoolidentifierstomiqproductfeatures < ActiveRecord::Migration[6.1] + class MiqProductFeature < ActiveRecord::Base; end + + FEATURE_MAPPING_UPDATE = { + 'resource_pool' => 'resource_pool_infra', + 'resource_pool_view' => 'resource_pool_infra_view', + 'resource_pool_show_list' => 'resource_pool_infra_show_list', + 'resource_pool_show' => 'resource_pool_infra_show', + 'resource_pool_control' => 'resource_pool_infra_control', + 'resource_pool_tag' => 'resource_pool_infra_tag', + 'resource_pool_protect' => 'resource_pool_infra_protect', + 'resource_pool_admin' => 'resource_pool_infra_admin', + 'resource_pool_delete' => 'resource_pool_infra_delete' + }.freeze + + def up + return if MiqProductFeature.none? + + say_with_time('Updating resource_pool features to resource_pool_infra') do + FEATURE_MAPPING_UPDATE.each do |from, to| + MiqProductFeature.find_by(:identifier => from)&.update!(:identifier => to) + end + end + end + + def down + return if MiqProductFeature.none? + + say_with_time('Reverting resource_pool_infra features back to resource_pool') do + FEATURE_MAPPING_UPDATE.each do |to, from| + MiqProductFeature.find_by(:identifier => from)&.update!(:identifier => to) + end + end + end +end diff --git a/spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb b/spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb new file mode 100644 index 00000000..266cb465 --- /dev/null +++ b/spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb @@ -0,0 +1,39 @@ +require_migration + +describe Updateresourcepoolidentifierstomiqproductfeatures do + let(:miq_product_feature) { migration_stub(:MiqProductFeature) } + + before do + %w[resource_pool resource_pool_view resource_pool_show_list resource_pool_show resource_pool_control resource_pool_tag resource_pool_protect resource_pool_admin resource_pool_delete].each do |identifier| + miq_product_feature.create!(:identifier => identifier) + end + end + + migration_context :up do + it "updates existing resource_pool features to resource_pool_infra" do + migrate + + described_class::FEATURE_MAPPING_UPDATE.each do |old_identifier, new_identifier| + expect(miq_product_feature.exists?(:identifier => old_identifier)).to be_falsy + expect(miq_product_feature.exists?(:identifier => new_identifier)).to be_truthy + end + end + end + + migration_context :down do + before do + described_class::FEATURE_MAPPING_UPDATE.each do |_old_identifier, new_identifier| + miq_product_feature.create!(:identifier => new_identifier) + end + end + + it "reverts resource_pool_infra features back to resource_pool" do + migrate + + described_class::FEATURE_MAPPING_UPDATE.each do |old_identifier, new_identifier| + expect(miq_product_feature.exists?(:identifier => new_identifier)).to be_falsy + expect(miq_product_feature.exists?(:identifier => old_identifier)).to be_truthy + end + end + end +end From 4eea048b710d9d780094f75e31e449da237ff1a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:52:11 +0000 Subject: [PATCH 02/21] Update paambaati/codeclimate-action action to v9 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 165bd484..f690c000 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,4 +47,4 @@ jobs: - name: Report code coverage if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '7.0' }} continue-on-error: true - uses: paambaati/codeclimate-action@v8 + uses: paambaati/codeclimate-action@v9 From 1aaec8f0c8d32fa054ed8f8ccbb29df2bff509b3 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 09:36:23 -0400 Subject: [PATCH 03/21] Cleanup naming of the migration --- ...update_resource_pool_identifiers_to_miq_product_features.rb} | 2 +- ...e_resource_pool_identifiers_to_miq_product_features_spec.rb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename db/migrate/{20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb => 20240516101409_update_resource_pool_identifiers_to_miq_product_features.rb} (95%) rename spec/migrations/{20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb => 20240516101409_update_resource_pool_identifiers_to_miq_product_features_spec.rb} (95%) diff --git a/db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb b/db/migrate/20240516101409_update_resource_pool_identifiers_to_miq_product_features.rb similarity index 95% rename from db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb rename to db/migrate/20240516101409_update_resource_pool_identifiers_to_miq_product_features.rb index 73187b6d..45840f62 100644 --- a/db/migrate/20240516101409_updateresourcepoolidentifierstomiqproductfeatures.rb +++ b/db/migrate/20240516101409_update_resource_pool_identifiers_to_miq_product_features.rb @@ -1,4 +1,4 @@ -class Updateresourcepoolidentifierstomiqproductfeatures < ActiveRecord::Migration[6.1] +class UpdateResourcePoolIdentifiersToMiqProductFeatures < ActiveRecord::Migration[6.1] class MiqProductFeature < ActiveRecord::Base; end FEATURE_MAPPING_UPDATE = { diff --git a/spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb b/spec/migrations/20240516101409_update_resource_pool_identifiers_to_miq_product_features_spec.rb similarity index 95% rename from spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb rename to spec/migrations/20240516101409_update_resource_pool_identifiers_to_miq_product_features_spec.rb index 266cb465..d850c2d5 100644 --- a/spec/migrations/20240516101409_updateresourcepoolidentifierstomiqproductfeatures_spec.rb +++ b/spec/migrations/20240516101409_update_resource_pool_identifiers_to_miq_product_features_spec.rb @@ -1,6 +1,6 @@ require_migration -describe Updateresourcepoolidentifierstomiqproductfeatures do +describe UpdateResourcePoolIdentifiersToMiqProductFeatures do let(:miq_product_feature) { migration_stub(:MiqProductFeature) } before do From fa56048346ea53a173be0ccdc8a6de4be0439a0f Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 15:27:43 -0400 Subject: [PATCH 04/21] Remove the old dummy Rails app --- spec/dummy/.gitignore | 33 ------ spec/dummy/README.md | 24 ---- spec/dummy/Rakefile | 6 - spec/dummy/app/assets/config/manifest.js | 2 - spec/dummy/app/assets/images/.keep | 0 .../app/assets/stylesheets/application.css | 15 --- .../app/channels/application_cable/channel.rb | 4 - .../channels/application_cable/connection.rb | 4 - .../app/controllers/application_controller.rb | 2 - spec/dummy/app/controllers/concerns/.keep | 0 spec/dummy/app/helpers/application_helper.rb | 2 - .../dummy/app/javascript/channels/consumer.js | 6 - spec/dummy/app/javascript/channels/index.js | 5 - .../dummy/app/javascript/packs/application.js | 17 --- spec/dummy/app/jobs/application_job.rb | 7 -- spec/dummy/app/mailers/application_mailer.rb | 4 - spec/dummy/app/models/application_record.rb | 3 - spec/dummy/app/models/concerns/.keep | 0 .../app/views/layouts/application.html.erb | 15 --- spec/dummy/app/views/layouts/mailer.html.erb | 13 --- spec/dummy/app/views/layouts/mailer.text.erb | 1 - spec/dummy/bin/rails | 4 - spec/dummy/bin/rake | 4 - spec/dummy/bin/setup | 36 ------ spec/dummy/bin/yarn | 11 -- spec/dummy/certs/v2_key | 5 - spec/dummy/config.ru | 5 - spec/dummy/config/application.rb | 24 ---- spec/dummy/config/boot.rb | 3 - spec/dummy/config/cable.yml | 10 -- spec/dummy/config/credentials.yml.enc | 1 - spec/dummy/config/database.tmpl.yml | 23 ---- spec/dummy/config/environment.rb | 5 - spec/dummy/config/environments/development.rb | 54 --------- spec/dummy/config/environments/production.rb | 106 ------------------ spec/dummy/config/environments/test.rb | 48 -------- .../application_controller_renderer.rb | 8 -- .../initializers/backtrace_silencers.rb | 7 -- .../initializers/content_security_policy.rb | 30 ----- .../config/initializers/cookies_serializer.rb | 5 - .../initializers/filter_parameter_logging.rb | 4 - spec/dummy/config/initializers/inflections.rb | 16 --- spec/dummy/config/initializers/mime_types.rb | 4 - .../config/initializers/wrap_parameters.rb | 14 --- spec/dummy/config/locales/en.yml | 33 ------ spec/dummy/config/puma.rb | 38 ------- spec/dummy/config/routes.rb | 3 - spec/dummy/config/storage.yml | 34 ------ spec/dummy/db/seeds.rb | 7 -- spec/dummy/lib/assets/.keep | 0 spec/dummy/lib/tasks/.keep | 0 spec/dummy/log/.keep | 0 spec/dummy/package.json | 11 -- spec/dummy/public/404.html | 67 ----------- spec/dummy/public/422.html | 67 ----------- spec/dummy/public/500.html | 66 ----------- .../public/apple-touch-icon-precomposed.png | 0 spec/dummy/public/apple-touch-icon.png | 0 spec/dummy/public/favicon.ico | 0 spec/dummy/public/robots.txt | 1 - spec/dummy/storage/.keep | 0 .../test/application_system_test_case.rb | 5 - .../application_cable/connection_test.rb | 11 -- spec/dummy/test/controllers/.keep | 0 spec/dummy/test/fixtures/.keep | 0 spec/dummy/test/fixtures/files/.keep | 0 spec/dummy/test/helpers/.keep | 0 spec/dummy/test/integration/.keep | 0 spec/dummy/test/mailers/.keep | 0 spec/dummy/test/models/.keep | 0 spec/dummy/test/system/.keep | 0 spec/dummy/test/test_helper.rb | 13 --- spec/dummy/tmp/.keep | 0 spec/dummy/tmp/pids/.keep | 0 spec/dummy/vendor/.keep | 0 75 files changed, 946 deletions(-) delete mode 100644 spec/dummy/.gitignore delete mode 100644 spec/dummy/README.md delete mode 100644 spec/dummy/Rakefile delete mode 100644 spec/dummy/app/assets/config/manifest.js delete mode 100644 spec/dummy/app/assets/images/.keep delete mode 100644 spec/dummy/app/assets/stylesheets/application.css delete mode 100644 spec/dummy/app/channels/application_cable/channel.rb delete mode 100644 spec/dummy/app/channels/application_cable/connection.rb delete mode 100644 spec/dummy/app/controllers/application_controller.rb delete mode 100644 spec/dummy/app/controllers/concerns/.keep delete mode 100644 spec/dummy/app/helpers/application_helper.rb delete mode 100644 spec/dummy/app/javascript/channels/consumer.js delete mode 100644 spec/dummy/app/javascript/channels/index.js delete mode 100644 spec/dummy/app/javascript/packs/application.js delete mode 100644 spec/dummy/app/jobs/application_job.rb delete mode 100644 spec/dummy/app/mailers/application_mailer.rb delete mode 100644 spec/dummy/app/models/application_record.rb delete mode 100644 spec/dummy/app/models/concerns/.keep delete mode 100644 spec/dummy/app/views/layouts/application.html.erb delete mode 100644 spec/dummy/app/views/layouts/mailer.html.erb delete mode 100644 spec/dummy/app/views/layouts/mailer.text.erb delete mode 100755 spec/dummy/bin/rails delete mode 100755 spec/dummy/bin/rake delete mode 100755 spec/dummy/bin/setup delete mode 100755 spec/dummy/bin/yarn delete mode 100644 spec/dummy/certs/v2_key delete mode 100644 spec/dummy/config.ru delete mode 100644 spec/dummy/config/application.rb delete mode 100644 spec/dummy/config/boot.rb delete mode 100644 spec/dummy/config/cable.yml delete mode 100644 spec/dummy/config/credentials.yml.enc delete mode 100644 spec/dummy/config/database.tmpl.yml delete mode 100644 spec/dummy/config/environment.rb delete mode 100644 spec/dummy/config/environments/development.rb delete mode 100644 spec/dummy/config/environments/production.rb delete mode 100644 spec/dummy/config/environments/test.rb delete mode 100644 spec/dummy/config/initializers/application_controller_renderer.rb delete mode 100644 spec/dummy/config/initializers/backtrace_silencers.rb delete mode 100644 spec/dummy/config/initializers/content_security_policy.rb delete mode 100644 spec/dummy/config/initializers/cookies_serializer.rb delete mode 100644 spec/dummy/config/initializers/filter_parameter_logging.rb delete mode 100644 spec/dummy/config/initializers/inflections.rb delete mode 100644 spec/dummy/config/initializers/mime_types.rb delete mode 100644 spec/dummy/config/initializers/wrap_parameters.rb delete mode 100644 spec/dummy/config/locales/en.yml delete mode 100644 spec/dummy/config/puma.rb delete mode 100644 spec/dummy/config/routes.rb delete mode 100644 spec/dummy/config/storage.yml delete mode 100644 spec/dummy/db/seeds.rb delete mode 100644 spec/dummy/lib/assets/.keep delete mode 100644 spec/dummy/lib/tasks/.keep delete mode 100644 spec/dummy/log/.keep delete mode 100644 spec/dummy/package.json delete mode 100644 spec/dummy/public/404.html delete mode 100644 spec/dummy/public/422.html delete mode 100644 spec/dummy/public/500.html delete mode 100644 spec/dummy/public/apple-touch-icon-precomposed.png delete mode 100644 spec/dummy/public/apple-touch-icon.png delete mode 100644 spec/dummy/public/favicon.ico delete mode 100644 spec/dummy/public/robots.txt delete mode 100644 spec/dummy/storage/.keep delete mode 100644 spec/dummy/test/application_system_test_case.rb delete mode 100644 spec/dummy/test/channels/application_cable/connection_test.rb delete mode 100644 spec/dummy/test/controllers/.keep delete mode 100644 spec/dummy/test/fixtures/.keep delete mode 100644 spec/dummy/test/fixtures/files/.keep delete mode 100644 spec/dummy/test/helpers/.keep delete mode 100644 spec/dummy/test/integration/.keep delete mode 100644 spec/dummy/test/mailers/.keep delete mode 100644 spec/dummy/test/models/.keep delete mode 100644 spec/dummy/test/system/.keep delete mode 100644 spec/dummy/test/test_helper.rb delete mode 100644 spec/dummy/tmp/.keep delete mode 100644 spec/dummy/tmp/pids/.keep delete mode 100644 spec/dummy/vendor/.keep diff --git a/spec/dummy/.gitignore b/spec/dummy/.gitignore deleted file mode 100644 index c873b5ca..00000000 --- a/spec/dummy/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -# See https://help.github.com/articles/ignoring-files for more about ignoring files. -# -# If you find yourself ignoring temporary files generated by your text editor -# or operating system, you probably want to add a global ignore instead: -# git config --global core.excludesfile '~/.gitignore_global' - -# Ignore bundler config. -/.bundle - -# Ignore all logfiles and tempfiles. -/log/* -/tmp/* -!/log/.keep -!/tmp/.keep - -# Ignore pidfiles, but keep the directory. -/tmp/pids/* -!/tmp/pids/ -!/tmp/pids/.keep - -# Ignore uploaded files in development. -/storage/* -!/storage/.keep - -/public/assets -.byebug_history - -# Ignore master key for decrypting credentials and more. -/config/master.key - -# Ignores for working with manageiq-schema plugin -/config/database.yml -/db/schema.rb diff --git a/spec/dummy/README.md b/spec/dummy/README.md deleted file mode 100644 index 7db80e4c..00000000 --- a/spec/dummy/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# README - -This README would normally document whatever steps are necessary to get the -application up and running. - -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile deleted file mode 100644 index e85f9139..00000000 --- a/spec/dummy/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require_relative 'config/application' - -Rails.application.load_tasks diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js deleted file mode 100644 index 59181933..00000000 --- a/spec/dummy/app/assets/config/manifest.js +++ /dev/null @@ -1,2 +0,0 @@ -//= link_tree ../images -//= link_directory ../stylesheets .css diff --git a/spec/dummy/app/assets/images/.keep b/spec/dummy/app/assets/images/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index d05ea0f5..00000000 --- a/spec/dummy/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/spec/dummy/app/channels/application_cable/channel.rb b/spec/dummy/app/channels/application_cable/channel.rb deleted file mode 100644 index d6726972..00000000 --- a/spec/dummy/app/channels/application_cable/channel.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Channel < ActionCable::Channel::Base - end -end diff --git a/spec/dummy/app/channels/application_cable/connection.rb b/spec/dummy/app/channels/application_cable/connection.rb deleted file mode 100644 index 0ff5442f..00000000 --- a/spec/dummy/app/channels/application_cable/connection.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Connection < ActionCable::Connection::Base - end -end diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb deleted file mode 100644 index 09705d12..00000000 --- a/spec/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ApplicationController < ActionController::Base -end diff --git a/spec/dummy/app/controllers/concerns/.keep b/spec/dummy/app/controllers/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/spec/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/spec/dummy/app/javascript/channels/consumer.js b/spec/dummy/app/javascript/channels/consumer.js deleted file mode 100644 index 0eceb59b..00000000 --- a/spec/dummy/app/javascript/channels/consumer.js +++ /dev/null @@ -1,6 +0,0 @@ -// Action Cable provides the framework to deal with WebSockets in Rails. -// You can generate new channels where WebSocket features live using the `rails generate channel` command. - -import { createConsumer } from "@rails/actioncable" - -export default createConsumer() diff --git a/spec/dummy/app/javascript/channels/index.js b/spec/dummy/app/javascript/channels/index.js deleted file mode 100644 index 0cfcf749..00000000 --- a/spec/dummy/app/javascript/channels/index.js +++ /dev/null @@ -1,5 +0,0 @@ -// Load all the channels within this directory and all subdirectories. -// Channel files must be named *_channel.js. - -const channels = require.context('.', true, /_channel\.js$/) -channels.keys().forEach(channels) diff --git a/spec/dummy/app/javascript/packs/application.js b/spec/dummy/app/javascript/packs/application.js deleted file mode 100644 index 9cd55d4b..00000000 --- a/spec/dummy/app/javascript/packs/application.js +++ /dev/null @@ -1,17 +0,0 @@ -// This file is automatically compiled by Webpack, along with any other files -// present in this directory. You're encouraged to place your actual application logic in -// a relevant structure within app/javascript and only use these pack files to reference -// that code so it'll be compiled. - -require("@rails/ujs").start() -require("turbolinks").start() -require("@rails/activestorage").start() -require("channels") - - -// Uncomment to copy all static images under ../images to the output folder and reference -// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) -// or the `imagePath` JavaScript helper below. -// -// const images = require.context('../images', true) -// const imagePath = (name) => images(name, true) diff --git a/spec/dummy/app/jobs/application_job.rb b/spec/dummy/app/jobs/application_job.rb deleted file mode 100644 index d394c3d1..00000000 --- a/spec/dummy/app/jobs/application_job.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ApplicationJob < ActiveJob::Base - # Automatically retry jobs that encountered a deadlock - # retry_on ActiveRecord::Deadlocked - - # Most jobs are safe to ignore if the underlying records are no longer available - # discard_on ActiveJob::DeserializationError -end diff --git a/spec/dummy/app/mailers/application_mailer.rb b/spec/dummy/app/mailers/application_mailer.rb deleted file mode 100644 index 286b2239..00000000 --- a/spec/dummy/app/mailers/application_mailer.rb +++ /dev/null @@ -1,4 +0,0 @@ -class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' - layout 'mailer' -end diff --git a/spec/dummy/app/models/application_record.rb b/spec/dummy/app/models/application_record.rb deleted file mode 100644 index 10a4cba8..00000000 --- a/spec/dummy/app/models/application_record.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true -end diff --git a/spec/dummy/app/models/concerns/.keep b/spec/dummy/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index ce3865f8..00000000 --- a/spec/dummy/app/views/layouts/application.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - - - - Dummy - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - diff --git a/spec/dummy/app/views/layouts/mailer.html.erb b/spec/dummy/app/views/layouts/mailer.html.erb deleted file mode 100644 index cbd34d2e..00000000 --- a/spec/dummy/app/views/layouts/mailer.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - <%= yield %> - - diff --git a/spec/dummy/app/views/layouts/mailer.text.erb b/spec/dummy/app/views/layouts/mailer.text.erb deleted file mode 100644 index 37f0bddb..00000000 --- a/spec/dummy/app/views/layouts/mailer.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%= yield %> diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails deleted file mode 100755 index 07396602..00000000 --- a/spec/dummy/bin/rails +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake deleted file mode 100755 index 17240489..00000000 --- a/spec/dummy/bin/rake +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run diff --git a/spec/dummy/bin/setup b/spec/dummy/bin/setup deleted file mode 100755 index 5853b5ea..00000000 --- a/spec/dummy/bin/setup +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env ruby -require 'fileutils' - -# path to your application root. -APP_ROOT = File.expand_path('..', __dir__) - -def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") -end - -FileUtils.chdir APP_ROOT do - # This script is a way to setup or update your development environment automatically. - # This script is idempotent, so that you can run it at anytime and get an expectable outcome. - # Add necessary setup steps to this file. - - puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' - system('bundle check') || system!('bundle install') - - # Install JavaScript dependencies - # system('bin/yarn') - - # puts "\n== Copying sample files ==" - # unless File.exist?('config/database.yml') - # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' - # end - - puts "\n== Preparing database ==" - system! 'bin/rails db:prepare' - - puts "\n== Removing old logs and tempfiles ==" - system! 'bin/rails log:clear tmp:clear' - - puts "\n== Restarting application server ==" - system! 'bin/rails restart' -end diff --git a/spec/dummy/bin/yarn b/spec/dummy/bin/yarn deleted file mode 100755 index 460dd565..00000000 --- a/spec/dummy/bin/yarn +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby -APP_ROOT = File.expand_path('..', __dir__) -Dir.chdir(APP_ROOT) do - begin - exec "yarnpkg", *ARGV - rescue Errno::ENOENT - $stderr.puts "Yarn executable was not detected in the system." - $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" - exit 1 - end -end diff --git a/spec/dummy/certs/v2_key b/spec/dummy/certs/v2_key deleted file mode 100644 index ad7bc69c..00000000 --- a/spec/dummy/certs/v2_key +++ /dev/null @@ -1,5 +0,0 @@ ---- -:EZCRYPTO KEY FILE: KEEP THIS SECURE ! -:created: 2014-02-28 09:59:47 -0500 -:algorithm: aes-256-cbc -:key: uXfIgSAUq5Oz8goc/zI8HOOo0SI++Sd9mfpgBanYIM4= diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru deleted file mode 100644 index f7ba0b52..00000000 --- a/spec/dummy/config.ru +++ /dev/null @@ -1,5 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require_relative 'config/environment' - -run Rails.application diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb deleted file mode 100644 index 241fd32b..00000000 --- a/spec/dummy/config/application.rb +++ /dev/null @@ -1,24 +0,0 @@ -require_relative 'boot' - -require 'rails/all' - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(*Rails.groups) - -module Dummy - class Application < Rails::Application - config.load_defaults Rails::VERSION::STRING.to_f - - # Settings in config/environments/* take precedence over those specified here. - # Application configuration can go into files in config/initializers - # -- all .rb files in that directory are automatically loaded after loading - # the framework and any gems in your application. - - # HACK: Temporary override of the default setting until we can update the - # migration specs to honor it. - config.active_record.belongs_to_required_by_default = false - - config.active_record.use_yaml_unsafe_load = true - end -end diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb deleted file mode 100644 index 40592003..00000000 --- a/spec/dummy/config/boot.rb +++ /dev/null @@ -1,3 +0,0 @@ -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__) - -require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/spec/dummy/config/cable.yml b/spec/dummy/config/cable.yml deleted file mode 100644 index 98367f89..00000000 --- a/spec/dummy/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: async - -test: - adapter: test - -production: - adapter: redis - url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: dummy_production diff --git a/spec/dummy/config/credentials.yml.enc b/spec/dummy/config/credentials.yml.enc deleted file mode 100644 index bec50ba0..00000000 --- a/spec/dummy/config/credentials.yml.enc +++ /dev/null @@ -1 +0,0 @@ -oiIf1Y+qNWVE1jEKZ4/3Z65QM0K+10X5NxTYTGl+a8lVK+uzvZWieC2L8pY9Mr9APee6Q3sa2vYY/eZxmt8QroCs8IBC/PtS85WGS6gGNA6AJ2pTF3vae+ena4dWXjSWe2pDsgp1N+87qtSTfWHElVZ6v6iPqGcNryiI7BQRsfFk+ViAY57tW9o7nUKAA34TQeELiqTOwUPnCQGnpPc3X+rji+ZAaGPgUeXdWe187x0U8UBL7Hb805Dn2dDahnE3bgCE1lqOdvdsQVk5+mfxQ8wtg3PGba3hPDt/TNx4BnNfzYtmIXpKd8VGZnYs3Ltjd3ZV29Qy3SKp9Lrap2dTTNZ8+djGUJQbl2n7XX9zX4AM77GZ2ZARylQYJxJQykjpcnMd2SgVwfOX6PaiYnFihWpkaj6ag8eV6B5X--6kdjfr/7h6Czlc02--KnWFZqSVFBWitLLXyiUkvg== \ No newline at end of file diff --git a/spec/dummy/config/database.tmpl.yml b/spec/dummy/config/database.tmpl.yml deleted file mode 100644 index cf3f1057..00000000 --- a/spec/dummy/config/database.tmpl.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -base: &base - adapter: postgresql - encoding: utf8 - username: root - password: smartvm - pool: 5 - wait_timeout: 5 - min_messages: warning - -development: - <<: *base - database: dummy_development - min_messages: notice - -production: - <<: *base - database: dummy_production - -test: &test - <<: *base - pool: 3 - database: dummy_test diff --git a/spec/dummy/config/environment.rb b/spec/dummy/config/environment.rb deleted file mode 100644 index 426333bb..00000000 --- a/spec/dummy/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require_relative 'application' - -# Initialize the Rails application. -Rails.application.initialize! diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb deleted file mode 100644 index 5523fd03..00000000 --- a/spec/dummy/config/environments/development.rb +++ /dev/null @@ -1,54 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Do not eager load code on boot. - config.eager_load = false - - # Show full error reports. - config.consider_all_requests_local = true - - # Enable/disable caching. By default caching is disabled. - # Run rails dev:cache to toggle caching. - if Rails.root.join('tmp', 'caching-dev.txt').exist? - config.action_controller.perform_caching = true - config.action_controller.enable_fragment_cache_logging = true - - config.cache_store = :memory_store - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}" - } - else - config.action_controller.perform_caching = false - - config.cache_store = :null_store - end - - # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local - - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = false - - config.action_mailer.perform_caching = false - - # Print deprecation notices to the Rails logger. - config.active_support.deprecation = :log - - # Raise an error on page load if there are pending migrations. - config.active_record.migration_error = :page_load - - # Highlight code that triggered database queries in logs. - config.active_record.verbose_query_logs = true - - # Raises error for missing translations. - # config.i18n.raise_on_missing_translations = true - - # Use an evented file watcher to asynchronously detect changes in source code, - # routes, locales, etc. This feature depends on the listen gem. - # config.file_watcher = ActiveSupport::EventedFileUpdateChecker -end diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb deleted file mode 100644 index b9caeda7..00000000 --- a/spec/dummy/config/environments/production.rb +++ /dev/null @@ -1,106 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - - # Store uploaded files on the local file system (see config/storage.yml for options). - config.active_storage.service = :local - - # Mount Action Cable outside main process or domain. - # config.action_cable.mount_path = nil - # config.action_cable.url = 'wss://example.com/cable' - # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :debug - - # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "dummy_production" - - config.action_mailer.perform_caching = false - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require 'syslog/logger' - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - # Inserts middleware to perform automatic connection switching. - # The `database_selector` hash is used to pass options to the DatabaseSelector - # middleware. The `delay` is used to determine how long to wait after a write - # to send a subsequent read to the primary. - # - # The `database_resolver` class is used by the middleware to determine which - # database is appropriate to use based on the time delay. - # - # The `database_resolver_context` class is used by the middleware to set - # timestamps for the last write to the primary. The resolver uses the context - # class timestamps to determine how long to wait before reading from the - # replica. - # - # By default Rails will store a last write timestamp in the session. The - # DatabaseSelector middleware is designed as such you can define your own - # strategy for connection switching and pass that into the middleware through - # these configuration options. - # config.active_record.database_selector = { delay: 2.seconds } - # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver - # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session -end diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb deleted file mode 100644 index 470dee4b..00000000 --- a/spec/dummy/config/environments/test.rb +++ /dev/null @@ -1,48 +0,0 @@ -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - config.cache_classes = true - - # Do not eager load code on boot. This avoids loading your whole application - # just for the purpose of running a single test. If you are using a tool that - # preloads Rails for running tests, you may have to set it to true. - config.eager_load = false - - # Configure public file server for tests with Cache-Control for performance. - config.public_file_server.enabled = true - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}" - } - - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - config.cache_store = :null_store - - # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment. - config.action_controller.allow_forgery_protection = false - - # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test - - config.action_mailer.perform_caching = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Print deprecation notices to the stderr. - config.active_support.deprecation = :stderr - - # Raises error for missing translations. - # config.action_view.raise_on_missing_translations = true -end diff --git a/spec/dummy/config/initializers/application_controller_renderer.rb b/spec/dummy/config/initializers/application_controller_renderer.rb deleted file mode 100644 index 89d2efab..00000000 --- a/spec/dummy/config/initializers/application_controller_renderer.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# ActiveSupport::Reloader.to_prepare do -# ApplicationController.renderer.defaults.merge!( -# http_host: 'example.org', -# https: false -# ) -# end diff --git a/spec/dummy/config/initializers/backtrace_silencers.rb b/spec/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/spec/dummy/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/spec/dummy/config/initializers/content_security_policy.rb b/spec/dummy/config/initializers/content_security_policy.rb deleted file mode 100644 index 35d0f26f..00000000 --- a/spec/dummy/config/initializers/content_security_policy.rb +++ /dev/null @@ -1,30 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide content security policy -# For further information see the following documentation -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy - -# Rails.application.config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https -# # If you are using webpack-dev-server then specify webpack-dev-server host -# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development? - -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end - -# If you are using UJS then enable automatic nonce generation -# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } - -# Set the nonce only to specific directives -# Rails.application.config.content_security_policy_nonce_directives = %w(script-src) - -# Report CSP violations to a specified URI -# For further information see the following documentation: -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only -# Rails.application.config.content_security_policy_report_only = true diff --git a/spec/dummy/config/initializers/cookies_serializer.rb b/spec/dummy/config/initializers/cookies_serializer.rb deleted file mode 100644 index 5a6a32d3..00000000 --- a/spec/dummy/config/initializers/cookies_serializer.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Specify a serializer for the signed and encrypted cookie jars. -# Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/spec/dummy/config/initializers/filter_parameter_logging.rb b/spec/dummy/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4a994e1e..00000000 --- a/spec/dummy/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] diff --git a/spec/dummy/config/initializers/inflections.rb b/spec/dummy/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9..00000000 --- a/spec/dummy/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/spec/dummy/config/initializers/mime_types.rb b/spec/dummy/config/initializers/mime_types.rb deleted file mode 100644 index dc189968..00000000 --- a/spec/dummy/config/initializers/mime_types.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf diff --git a/spec/dummy/config/initializers/wrap_parameters.rb b/spec/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index bbfc3961..00000000 --- a/spec/dummy/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/spec/dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml deleted file mode 100644 index cf9b342d..00000000 --- a/spec/dummy/config/locales/en.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# The following keys must be escaped otherwise they will not be retrieved by -# the default I18n backend: -# -# true, false, on, off, yes, no -# -# Instead, surround them with single quotes. -# -# en: -# 'true': 'foo' -# -# To learn more, please read the Rails Internationalization guide -# available at https://guides.rubyonrails.org/i18n.html. - -en: - hello: "Hello world" diff --git a/spec/dummy/config/puma.rb b/spec/dummy/config/puma.rb deleted file mode 100644 index 5ed44377..00000000 --- a/spec/dummy/config/puma.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers: a minimum and maximum. -# Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum; this matches the default thread size of Active Record. -# -max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } -min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } -threads min_threads_count, max_threads_count - -# Specifies the `port` that Puma will listen on to receive requests; default is 3000. -# -port ENV.fetch("PORT") { 3000 } - -# Specifies the `environment` that Puma will run in. -# -environment ENV.fetch("RAILS_ENV") { "development" } - -# Specifies the `pidfile` that Puma will use. -pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } - -# Specifies the number of `workers` to boot in clustered mode. -# Workers are forked web server processes. If using threads and workers together -# the concurrency of the application would be max `threads` * `workers`. -# Workers do not work on JRuby or Windows (both of which do not support -# processes). -# -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# Use the `preload_app!` method when specifying a `workers` number. -# This directive tells Puma to first boot the application and load code -# before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. -# -# preload_app! - -# Allow puma to be restarted by `rails restart` command. -plugin :tmp_restart diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb deleted file mode 100644 index c06383a1..00000000 --- a/spec/dummy/config/routes.rb +++ /dev/null @@ -1,3 +0,0 @@ -Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html -end diff --git a/spec/dummy/config/storage.yml b/spec/dummy/config/storage.yml deleted file mode 100644 index d32f76e8..00000000 --- a/spec/dummy/config/storage.yml +++ /dev/null @@ -1,34 +0,0 @@ -test: - service: Disk - root: <%= Rails.root.join("tmp/storage") %> - -local: - service: Disk - root: <%= Rails.root.join("storage") %> - -# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) -# amazon: -# service: S3 -# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> -# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> -# region: us-east-1 -# bucket: your_own_bucket - -# Remember not to checkin your GCS keyfile to a repository -# google: -# service: GCS -# project: your_project -# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> -# bucket: your_own_bucket - -# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) -# microsoft: -# service: AzureStorage -# storage_account_name: your_account_name -# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> -# container: your_container_name - -# mirror: -# service: Mirror -# primary: local -# mirrors: [ amazon, google, microsoft ] diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb deleted file mode 100644 index 1beea2ac..00000000 --- a/spec/dummy/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) diff --git a/spec/dummy/lib/assets/.keep b/spec/dummy/lib/assets/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/lib/tasks/.keep b/spec/dummy/lib/tasks/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/log/.keep b/spec/dummy/log/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/package.json b/spec/dummy/package.json deleted file mode 100644 index 11bee3f6..00000000 --- a/spec/dummy/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "dummy", - "private": true, - "dependencies": { - "@rails/ujs": "^6.0.0", - "turbolinks": "^5.2.0", - "@rails/activestorage": "^6.0.0", - "@rails/actioncable": "^6.0.0" - }, - "version": "0.1.0" -} diff --git a/spec/dummy/public/404.html b/spec/dummy/public/404.html deleted file mode 100644 index 2be3af26..00000000 --- a/spec/dummy/public/404.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - - -
-
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/dummy/public/422.html b/spec/dummy/public/422.html deleted file mode 100644 index c08eac0d..00000000 --- a/spec/dummy/public/422.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - - -
-
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/dummy/public/500.html b/spec/dummy/public/500.html deleted file mode 100644 index 78a030af..00000000 --- a/spec/dummy/public/500.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - - -
-
-

We're sorry, but something went wrong.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/dummy/public/apple-touch-icon-precomposed.png b/spec/dummy/public/apple-touch-icon-precomposed.png deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/public/apple-touch-icon.png b/spec/dummy/public/apple-touch-icon.png deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/public/favicon.ico b/spec/dummy/public/favicon.ico deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/public/robots.txt b/spec/dummy/public/robots.txt deleted file mode 100644 index c19f78ab..00000000 --- a/spec/dummy/public/robots.txt +++ /dev/null @@ -1 +0,0 @@ -# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/spec/dummy/storage/.keep b/spec/dummy/storage/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/application_system_test_case.rb b/spec/dummy/test/application_system_test_case.rb deleted file mode 100644 index d19212ab..00000000 --- a/spec/dummy/test/application_system_test_case.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "test_helper" - -class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - driven_by :selenium, using: :chrome, screen_size: [1400, 1400] -end diff --git a/spec/dummy/test/channels/application_cable/connection_test.rb b/spec/dummy/test/channels/application_cable/connection_test.rb deleted file mode 100644 index 800405f1..00000000 --- a/spec/dummy/test/channels/application_cable/connection_test.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "test_helper" - -class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase - # test "connects with cookies" do - # cookies.signed[:user_id] = 42 - # - # connect - # - # assert_equal connection.user_id, "42" - # end -end diff --git a/spec/dummy/test/controllers/.keep b/spec/dummy/test/controllers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/fixtures/.keep b/spec/dummy/test/fixtures/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/fixtures/files/.keep b/spec/dummy/test/fixtures/files/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/helpers/.keep b/spec/dummy/test/helpers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/integration/.keep b/spec/dummy/test/integration/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/mailers/.keep b/spec/dummy/test/mailers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/models/.keep b/spec/dummy/test/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/system/.keep b/spec/dummy/test/system/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/test/test_helper.rb b/spec/dummy/test/test_helper.rb deleted file mode 100644 index d5300f88..00000000 --- a/spec/dummy/test/test_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' -require 'rails/test_help' - -class ActiveSupport::TestCase - # Run tests in parallel with specified workers - parallelize(workers: :number_of_processors) - - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - fixtures :all - - # Add more helper methods to be used by all tests here... -end diff --git a/spec/dummy/tmp/.keep b/spec/dummy/tmp/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/tmp/pids/.keep b/spec/dummy/tmp/pids/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/spec/dummy/vendor/.keep b/spec/dummy/vendor/.keep deleted file mode 100644 index e69de29b..00000000 From ee2b361163d0fa2eda16c8a5d414a30437a2c9af Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 15:30:16 -0400 Subject: [PATCH 05/21] Update dummy app to Rails 7.0.8.4 Using the following commands after the old manageiq-schema/spec/dummy directory has been removed: ``` cd /path/to/manageiq-schema/.. rails new dummy --database postgresql --skip-spring --skip-bundle --skip-webpack-install --skip-bootsnap --skip-listen rm -rf dummy/.git cp -r dummy manageiq-schema/spec ``` --- spec/dummy/.gitattributes | 7 ++ spec/dummy/.gitignore | 31 +++++++ spec/dummy/.ruby-version | 1 + spec/dummy/Gemfile | 69 ++++++++++++++ spec/dummy/README.md | 24 +++++ spec/dummy/Rakefile | 6 ++ spec/dummy/app/assets/config/manifest.js | 2 + spec/dummy/app/assets/images/.keep | 0 .../app/assets/stylesheets/application.css | 15 +++ .../app/channels/application_cable/channel.rb | 4 + .../channels/application_cable/connection.rb | 4 + .../app/controllers/application_controller.rb | 2 + spec/dummy/app/controllers/concerns/.keep | 0 spec/dummy/app/helpers/application_helper.rb | 2 + spec/dummy/app/jobs/application_job.rb | 7 ++ spec/dummy/app/mailers/application_mailer.rb | 4 + spec/dummy/app/models/application_record.rb | 3 + spec/dummy/app/models/concerns/.keep | 0 .../app/views/layouts/application.html.erb | 15 +++ spec/dummy/app/views/layouts/mailer.html.erb | 13 +++ spec/dummy/app/views/layouts/mailer.text.erb | 1 + spec/dummy/bin/rails | 4 + spec/dummy/bin/rake | 4 + spec/dummy/bin/setup | 33 +++++++ spec/dummy/config.ru | 6 ++ spec/dummy/config/application.rb | 22 +++++ spec/dummy/config/boot.rb | 3 + spec/dummy/config/cable.yml | 10 ++ spec/dummy/config/credentials.yml.enc | 1 + spec/dummy/config/database.yml | 86 +++++++++++++++++ spec/dummy/config/environment.rb | 5 + spec/dummy/config/environments/development.rb | 70 ++++++++++++++ spec/dummy/config/environments/production.rb | 93 +++++++++++++++++++ spec/dummy/config/environments/test.rb | 60 ++++++++++++ spec/dummy/config/initializers/assets.rb | 12 +++ .../initializers/content_security_policy.rb | 25 +++++ .../initializers/filter_parameter_logging.rb | 8 ++ spec/dummy/config/initializers/inflections.rb | 16 ++++ .../config/initializers/permissions_policy.rb | 11 +++ spec/dummy/config/locales/en.yml | 33 +++++++ spec/dummy/config/puma.rb | 43 +++++++++ spec/dummy/config/routes.rb | 6 ++ spec/dummy/config/storage.yml | 34 +++++++ spec/dummy/db/seeds.rb | 7 ++ spec/dummy/lib/assets/.keep | 0 spec/dummy/lib/tasks/.keep | 0 spec/dummy/log/.keep | 0 spec/dummy/public/404.html | 67 +++++++++++++ spec/dummy/public/422.html | 67 +++++++++++++ spec/dummy/public/500.html | 66 +++++++++++++ .../public/apple-touch-icon-precomposed.png | 0 spec/dummy/public/apple-touch-icon.png | 0 spec/dummy/public/favicon.ico | 0 spec/dummy/public/robots.txt | 1 + spec/dummy/storage/.keep | 0 .../test/application_system_test_case.rb | 5 + .../application_cable/connection_test.rb | 11 +++ spec/dummy/test/controllers/.keep | 0 spec/dummy/test/fixtures/files/.keep | 0 spec/dummy/test/helpers/.keep | 0 spec/dummy/test/integration/.keep | 0 spec/dummy/test/mailers/.keep | 0 spec/dummy/test/models/.keep | 0 spec/dummy/test/system/.keep | 0 spec/dummy/test/test_helper.rb | 13 +++ spec/dummy/tmp/.keep | 0 spec/dummy/tmp/pids/.keep | 0 spec/dummy/tmp/storage/.keep | 0 spec/dummy/vendor/.keep | 0 69 files changed, 1032 insertions(+) create mode 100644 spec/dummy/.gitattributes create mode 100644 spec/dummy/.gitignore create mode 100644 spec/dummy/.ruby-version create mode 100644 spec/dummy/Gemfile create mode 100644 spec/dummy/README.md create mode 100644 spec/dummy/Rakefile create mode 100644 spec/dummy/app/assets/config/manifest.js create mode 100644 spec/dummy/app/assets/images/.keep create mode 100644 spec/dummy/app/assets/stylesheets/application.css create mode 100644 spec/dummy/app/channels/application_cable/channel.rb create mode 100644 spec/dummy/app/channels/application_cable/connection.rb create mode 100644 spec/dummy/app/controllers/application_controller.rb create mode 100644 spec/dummy/app/controllers/concerns/.keep create mode 100644 spec/dummy/app/helpers/application_helper.rb create mode 100644 spec/dummy/app/jobs/application_job.rb create mode 100644 spec/dummy/app/mailers/application_mailer.rb create mode 100644 spec/dummy/app/models/application_record.rb create mode 100644 spec/dummy/app/models/concerns/.keep create mode 100644 spec/dummy/app/views/layouts/application.html.erb create mode 100644 spec/dummy/app/views/layouts/mailer.html.erb create mode 100644 spec/dummy/app/views/layouts/mailer.text.erb create mode 100755 spec/dummy/bin/rails create mode 100755 spec/dummy/bin/rake create mode 100755 spec/dummy/bin/setup create mode 100644 spec/dummy/config.ru create mode 100644 spec/dummy/config/application.rb create mode 100644 spec/dummy/config/boot.rb create mode 100644 spec/dummy/config/cable.yml create mode 100644 spec/dummy/config/credentials.yml.enc create mode 100644 spec/dummy/config/database.yml create mode 100644 spec/dummy/config/environment.rb create mode 100644 spec/dummy/config/environments/development.rb create mode 100644 spec/dummy/config/environments/production.rb create mode 100644 spec/dummy/config/environments/test.rb create mode 100644 spec/dummy/config/initializers/assets.rb create mode 100644 spec/dummy/config/initializers/content_security_policy.rb create mode 100644 spec/dummy/config/initializers/filter_parameter_logging.rb create mode 100644 spec/dummy/config/initializers/inflections.rb create mode 100644 spec/dummy/config/initializers/permissions_policy.rb create mode 100644 spec/dummy/config/locales/en.yml create mode 100644 spec/dummy/config/puma.rb create mode 100644 spec/dummy/config/routes.rb create mode 100644 spec/dummy/config/storage.yml create mode 100644 spec/dummy/db/seeds.rb create mode 100644 spec/dummy/lib/assets/.keep create mode 100644 spec/dummy/lib/tasks/.keep create mode 100644 spec/dummy/log/.keep create mode 100644 spec/dummy/public/404.html create mode 100644 spec/dummy/public/422.html create mode 100644 spec/dummy/public/500.html create mode 100644 spec/dummy/public/apple-touch-icon-precomposed.png create mode 100644 spec/dummy/public/apple-touch-icon.png create mode 100644 spec/dummy/public/favicon.ico create mode 100644 spec/dummy/public/robots.txt create mode 100644 spec/dummy/storage/.keep create mode 100644 spec/dummy/test/application_system_test_case.rb create mode 100644 spec/dummy/test/channels/application_cable/connection_test.rb create mode 100644 spec/dummy/test/controllers/.keep create mode 100644 spec/dummy/test/fixtures/files/.keep create mode 100644 spec/dummy/test/helpers/.keep create mode 100644 spec/dummy/test/integration/.keep create mode 100644 spec/dummy/test/mailers/.keep create mode 100644 spec/dummy/test/models/.keep create mode 100644 spec/dummy/test/system/.keep create mode 100644 spec/dummy/test/test_helper.rb create mode 100644 spec/dummy/tmp/.keep create mode 100644 spec/dummy/tmp/pids/.keep create mode 100644 spec/dummy/tmp/storage/.keep create mode 100644 spec/dummy/vendor/.keep diff --git a/spec/dummy/.gitattributes b/spec/dummy/.gitattributes new file mode 100644 index 00000000..31eeee0b --- /dev/null +++ b/spec/dummy/.gitattributes @@ -0,0 +1,7 @@ +# See https://git-scm.com/docs/gitattributes for more about git attribute files. + +# Mark the database schema as having been generated. +db/schema.rb linguist-generated + +# Mark any vendored files as having been vendored. +vendor/* linguist-vendored diff --git a/spec/dummy/.gitignore b/spec/dummy/.gitignore new file mode 100644 index 00000000..e16dc71d --- /dev/null +++ b/spec/dummy/.gitignore @@ -0,0 +1,31 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +/tmp/storage/* +!/tmp/storage/ +!/tmp/storage/.keep + +/public/assets + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/spec/dummy/.ruby-version b/spec/dummy/.ruby-version new file mode 100644 index 00000000..36415f72 --- /dev/null +++ b/spec/dummy/.ruby-version @@ -0,0 +1 @@ +ruby-3.1.5 diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile new file mode 100644 index 00000000..5a02bb41 --- /dev/null +++ b/spec/dummy/Gemfile @@ -0,0 +1,69 @@ +source "https://rubygems.org" +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby "3.1.5" + +# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" +gem "rails", "~> 7.0.8", ">= 7.0.8.4" + +# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] +gem "sprockets-rails" + +# Use postgresql as the database for Active Record +gem "pg", "~> 1.1" + +# Use the Puma web server [https://github.com/puma/puma] +gem "puma", "~> 5.0" + +# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] +gem "importmap-rails" + +# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev] +gem "turbo-rails" + +# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev] +gem "stimulus-rails" + +# Build JSON APIs with ease [https://github.com/rails/jbuilder] +gem "jbuilder" + +# Use Redis adapter to run Action Cable in production +# gem "redis", "~> 4.0" + +# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis] +# gem "kredis" + +# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword] +# gem "bcrypt", "~> 3.1.7" + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] + +# Use Sass to process CSS +# gem "sassc-rails" + +# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] +# gem "image_processing", "~> 1.2" + +group :development, :test do + # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem + gem "debug", platforms: %i[ mri mingw x64_mingw ] +end + +group :development do + # Use console on exceptions pages [https://github.com/rails/web-console] + gem "web-console" + + # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler] + # gem "rack-mini-profiler" + + # Speed up commands on slow machines / big apps [https://github.com/rails/spring] + # gem "spring" +end + +group :test do + # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing] + gem "capybara" + gem "selenium-webdriver" + +end diff --git a/spec/dummy/README.md b/spec/dummy/README.md new file mode 100644 index 00000000..7db80e4c --- /dev/null +++ b/spec/dummy/README.md @@ -0,0 +1,24 @@ +# README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile new file mode 100644 index 00000000..9a5ea738 --- /dev/null +++ b/spec/dummy/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative "config/application" + +Rails.application.load_tasks diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js new file mode 100644 index 00000000..59181933 --- /dev/null +++ b/spec/dummy/app/assets/config/manifest.js @@ -0,0 +1,2 @@ +//= link_tree ../images +//= link_directory ../stylesheets .css diff --git a/spec/dummy/app/assets/images/.keep b/spec/dummy/app/assets/images/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css new file mode 100644 index 00000000..288b9ab7 --- /dev/null +++ b/spec/dummy/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/spec/dummy/app/channels/application_cable/channel.rb b/spec/dummy/app/channels/application_cable/channel.rb new file mode 100644 index 00000000..d6726972 --- /dev/null +++ b/spec/dummy/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/spec/dummy/app/channels/application_cable/connection.rb b/spec/dummy/app/channels/application_cable/connection.rb new file mode 100644 index 00000000..0ff5442f --- /dev/null +++ b/spec/dummy/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb new file mode 100644 index 00000000..09705d12 --- /dev/null +++ b/spec/dummy/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/spec/dummy/app/controllers/concerns/.keep b/spec/dummy/app/controllers/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb new file mode 100644 index 00000000..de6be794 --- /dev/null +++ b/spec/dummy/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/spec/dummy/app/jobs/application_job.rb b/spec/dummy/app/jobs/application_job.rb new file mode 100644 index 00000000..d394c3d1 --- /dev/null +++ b/spec/dummy/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/spec/dummy/app/mailers/application_mailer.rb b/spec/dummy/app/mailers/application_mailer.rb new file mode 100644 index 00000000..3c34c814 --- /dev/null +++ b/spec/dummy/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: "from@example.com" + layout "mailer" +end diff --git a/spec/dummy/app/models/application_record.rb b/spec/dummy/app/models/application_record.rb new file mode 100644 index 00000000..b63caeb8 --- /dev/null +++ b/spec/dummy/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + primary_abstract_class +end diff --git a/spec/dummy/app/models/concerns/.keep b/spec/dummy/app/models/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb new file mode 100644 index 00000000..70b4b279 --- /dev/null +++ b/spec/dummy/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + Dummy + + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + + + + <%= yield %> + + diff --git a/spec/dummy/app/views/layouts/mailer.html.erb b/spec/dummy/app/views/layouts/mailer.html.erb new file mode 100644 index 00000000..cbd34d2e --- /dev/null +++ b/spec/dummy/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/spec/dummy/app/views/layouts/mailer.text.erb b/spec/dummy/app/views/layouts/mailer.text.erb new file mode 100644 index 00000000..37f0bddb --- /dev/null +++ b/spec/dummy/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails new file mode 100755 index 00000000..efc03774 --- /dev/null +++ b/spec/dummy/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +APP_PATH = File.expand_path("../config/application", __dir__) +require_relative "../config/boot" +require "rails/commands" diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake new file mode 100755 index 00000000..4fbf10b9 --- /dev/null +++ b/spec/dummy/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative "../config/boot" +require "rake" +Rake.application.run diff --git a/spec/dummy/bin/setup b/spec/dummy/bin/setup new file mode 100755 index 00000000..ec47b79b --- /dev/null +++ b/spec/dummy/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require "fileutils" + +# path to your application root. +APP_ROOT = File.expand_path("..", __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to set up or update your development environment automatically. + # This script is idempotent, so that you can run it at any time and get an expectable outcome. + # Add necessary setup steps to this file. + + puts "== Installing dependencies ==" + system! "gem install bundler --conservative" + system("bundle check") || system!("bundle install") + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # FileUtils.cp "config/database.yml.sample", "config/database.yml" + # end + + puts "\n== Preparing database ==" + system! "bin/rails db:prepare" + + puts "\n== Removing old logs and tempfiles ==" + system! "bin/rails log:clear tmp:clear" + + puts "\n== Restarting application server ==" + system! "bin/rails restart" +end diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru new file mode 100644 index 00000000..4a3c09a6 --- /dev/null +++ b/spec/dummy/config.ru @@ -0,0 +1,6 @@ +# This file is used by Rack-based servers to start the application. + +require_relative "config/environment" + +run Rails.application +Rails.application.load_server diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb new file mode 100644 index 00000000..9b9479e6 --- /dev/null +++ b/spec/dummy/config/application.rb @@ -0,0 +1,22 @@ +require_relative "boot" + +require "rails/all" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Dummy + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 7.0 + + # Configuration for the application, engines, and railties goes here. + # + # These settings can be overridden in specific environments using the files + # in config/environments, which are processed later. + # + # config.time_zone = "Central Time (US & Canada)" + # config.eager_load_paths << Rails.root.join("extras") + end +end diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb new file mode 100644 index 00000000..28201161 --- /dev/null +++ b/spec/dummy/config/boot.rb @@ -0,0 +1,3 @@ +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) + +require "bundler/setup" # Set up gems listed in the Gemfile. diff --git a/spec/dummy/config/cable.yml b/spec/dummy/config/cable.yml new file mode 100644 index 00000000..98367f89 --- /dev/null +++ b/spec/dummy/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: dummy_production diff --git a/spec/dummy/config/credentials.yml.enc b/spec/dummy/config/credentials.yml.enc new file mode 100644 index 00000000..4253f72c --- /dev/null +++ b/spec/dummy/config/credentials.yml.enc @@ -0,0 +1 @@ +Yxkt5W1Zg072FWMc4rrotXZAhLf+tftpT0oyifNXWtku5z42ZVgFQz6OJzZ0JK1r3G0rYEe+UI9Z99c/SQRNK2/8eR1NcU/TeGwWRA5LbFHWz4bZNCmZxls3hHx4Poe/BMGEP8OhMb+R8pHpWzO8U4DwtUbyOJfFnBL+CCaMxiVnKweo1ooUGiZ/U4oYeIwszvbWxcROiWpnitJxwX+xgkeIXhFz1EDrScS45a75MJ3jTW3G2vEJtEHf8Xa1/+/hIjmfkv6v9p1UdX2ff7rlMJtsBkjL8tgJfVX6KGYyD3m3xb+Z8JkqJqZTg3RkV99YvW/4b304xamowtouAH1PJLdielZlRxYkUx1V1iUqYN2IYiO30J7dWljboQewcPJCBLjrPMFaznezIUSkvjvorQjj1HwUyP67sFbv--M74pk+55PaCnIJ9X--Fuq6lUqx7x/TYwWyALv3ZQ== \ No newline at end of file diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml new file mode 100644 index 00000000..8d927df0 --- /dev/null +++ b/spec/dummy/config/database.yml @@ -0,0 +1,86 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem "pg" +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: dummy_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user running Rails. + #username: dummy + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: dummy_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password or a full connection URL as an environment +# variable when you boot the app. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# If the connection URL is provided in the special DATABASE_URL environment +# variable, Rails will automatically merge its configuration values on top of +# the values provided in this file. Alternatively, you can specify a connection +# URL environment variable explicitly: +# +# production: +# url: <%= ENV["MY_APP_DATABASE_URL"] %> +# +# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full overview on how database connection configuration can be specified. +# +production: + <<: *default + database: dummy_production + username: dummy + password: <%= ENV["DUMMY_DATABASE_PASSWORD"] %> diff --git a/spec/dummy/config/environment.rb b/spec/dummy/config/environment.rb new file mode 100644 index 00000000..cac53157 --- /dev/null +++ b/spec/dummy/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative "application" + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb new file mode 100644 index 00000000..8500f459 --- /dev/null +++ b/spec/dummy/config/environments/development.rb @@ -0,0 +1,70 @@ +require "active_support/core_ext/integer/time" + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded any time + # it changes. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable server timing + config.server_timing = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join("tmp/caching-dev.txt").exist? + config.action_controller.perform_caching = true + config.action_controller.enable_fragment_cache_logging = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + "Cache-Control" => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise exceptions for disallowed deprecations. + config.active_support.disallowed_deprecation = :raise + + # Tell Active Support which deprecation messages to disallow. + config.active_support.disallowed_deprecation_warnings = [] + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations. + # config.i18n.raise_on_missing_translations = true + + # Annotate rendered view with file names. + # config.action_view.annotate_rendered_view_with_filenames = true + + # Uncomment if you wish to allow Action Cable access from any origin. + # config.action_cable.disable_request_forgery_protection = true +end diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb new file mode 100644 index 00000000..8e989b5f --- /dev/null +++ b/spec/dummy/config/environments/production.rb @@ -0,0 +1,93 @@ +require "active_support/core_ext/integer/time" + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? + + # Compress CSS using a preprocessor. + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.asset_host = "http://assets.example.com" + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache + # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = "wss://example.com/cable" + # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Include generic and useful information about system operation, but avoid logging too much + # information to avoid inadvertent exposure of personally identifiable information (PII). + config.log_level = :info + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "dummy_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Don't log any deprecations. + config.active_support.report_deprecations = false + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require "syslog/logger" + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb new file mode 100644 index 00000000..6ea4d1e7 --- /dev/null +++ b/spec/dummy/config/environments/test.rb @@ -0,0 +1,60 @@ +require "active_support/core_ext/integer/time" + +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Turn false under Spring and add config.action_view.cache_template_loading = true. + config.cache_classes = true + + # Eager loading loads your whole application. When running a single test locally, + # this probably isn't necessary. It's a good idea to do in a continuous integration + # system, or in some way before deploying your code. + config.eager_load = ENV["CI"].present? + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + "Cache-Control" => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raise exceptions for disallowed deprecations. + config.active_support.disallowed_deprecation = :raise + + # Tell Active Support which deprecation messages to disallow. + config.active_support.disallowed_deprecation_warnings = [] + + # Raises error for missing translations. + # config.i18n.raise_on_missing_translations = true + + # Annotate rendered view with file names. + # config.action_view.annotate_rendered_view_with_filenames = true +end diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb new file mode 100644 index 00000000..2eeef966 --- /dev/null +++ b/spec/dummy/config/initializers/assets.rb @@ -0,0 +1,12 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = "1.0" + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/spec/dummy/config/initializers/content_security_policy.rb b/spec/dummy/config/initializers/content_security_policy.rb new file mode 100644 index 00000000..54f47cf1 --- /dev/null +++ b/spec/dummy/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy. +# See the Securing Rails Applications Guide for more information: +# https://guides.rubyonrails.org/security.html#content-security-policy-header + +# Rails.application.configure do +# config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end +# +# # Generate session nonces for permitted importmap and inline scripts +# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } +# config.content_security_policy_nonce_directives = %w(script-src) +# +# # Report violations without enforcing the policy. +# # config.content_security_policy_report_only = true +# end diff --git a/spec/dummy/config/initializers/filter_parameter_logging.rb b/spec/dummy/config/initializers/filter_parameter_logging.rb new file mode 100644 index 00000000..adc6568c --- /dev/null +++ b/spec/dummy/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# Configure parameters to be filtered from the log file. Use this to limit dissemination of +# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported +# notations and behaviors. +Rails.application.config.filter_parameters += [ + :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn +] diff --git a/spec/dummy/config/initializers/inflections.rb b/spec/dummy/config/initializers/inflections.rb new file mode 100644 index 00000000..3860f659 --- /dev/null +++ b/spec/dummy/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, "\\1en" +# inflect.singular /^(ox)en/i, "\\1" +# inflect.irregular "person", "people" +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym "RESTful" +# end diff --git a/spec/dummy/config/initializers/permissions_policy.rb b/spec/dummy/config/initializers/permissions_policy.rb new file mode 100644 index 00000000..00f64d71 --- /dev/null +++ b/spec/dummy/config/initializers/permissions_policy.rb @@ -0,0 +1,11 @@ +# Define an application-wide HTTP permissions policy. For further +# information see https://developers.google.com/web/updates/2018/06/feature-policy +# +# Rails.application.config.permissions_policy do |f| +# f.camera :none +# f.gyroscope :none +# f.microphone :none +# f.usb :none +# f.fullscreen :self +# f.payment :self, "https://secure.example.com" +# end diff --git a/spec/dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml new file mode 100644 index 00000000..8ca56fc7 --- /dev/null +++ b/spec/dummy/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t "hello" +# +# In views, this is aliased to just `t`: +# +# <%= t("hello") %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# "true": "foo" +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/spec/dummy/config/puma.rb b/spec/dummy/config/puma.rb new file mode 100644 index 00000000..daaf0369 --- /dev/null +++ b/spec/dummy/config/puma.rb @@ -0,0 +1,43 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `worker_timeout` threshold that Puma will use to wait before +# terminating a worker in development environments. +# +worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development" + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `bin/rails restart` command. +plugin :tmp_restart diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb new file mode 100644 index 00000000..262ffd54 --- /dev/null +++ b/spec/dummy/config/routes.rb @@ -0,0 +1,6 @@ +Rails.application.routes.draw do + # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html + + # Defines the root path route ("/") + # root "articles#index" +end diff --git a/spec/dummy/config/storage.yml b/spec/dummy/config/storage.yml new file mode 100644 index 00000000..4942ab66 --- /dev/null +++ b/spec/dummy/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket-<%= Rails.env %> + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket-<%= Rails.env %> + +# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name-<%= Rails.env %> + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb new file mode 100644 index 00000000..bc25fce3 --- /dev/null +++ b/spec/dummy/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }]) +# Character.create(name: "Luke", movie: movies.first) diff --git a/spec/dummy/lib/assets/.keep b/spec/dummy/lib/assets/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/lib/tasks/.keep b/spec/dummy/lib/tasks/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/log/.keep b/spec/dummy/log/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/public/404.html b/spec/dummy/public/404.html new file mode 100644 index 00000000..2be3af26 --- /dev/null +++ b/spec/dummy/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/spec/dummy/public/422.html b/spec/dummy/public/422.html new file mode 100644 index 00000000..c08eac0d --- /dev/null +++ b/spec/dummy/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/spec/dummy/public/500.html b/spec/dummy/public/500.html new file mode 100644 index 00000000..78a030af --- /dev/null +++ b/spec/dummy/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/spec/dummy/public/apple-touch-icon-precomposed.png b/spec/dummy/public/apple-touch-icon-precomposed.png new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/public/apple-touch-icon.png b/spec/dummy/public/apple-touch-icon.png new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/public/favicon.ico b/spec/dummy/public/favicon.ico new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/public/robots.txt b/spec/dummy/public/robots.txt new file mode 100644 index 00000000..c19f78ab --- /dev/null +++ b/spec/dummy/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/spec/dummy/storage/.keep b/spec/dummy/storage/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/application_system_test_case.rb b/spec/dummy/test/application_system_test_case.rb new file mode 100644 index 00000000..d19212ab --- /dev/null +++ b/spec/dummy/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/spec/dummy/test/channels/application_cable/connection_test.rb b/spec/dummy/test/channels/application_cable/connection_test.rb new file mode 100644 index 00000000..800405f1 --- /dev/null +++ b/spec/dummy/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/spec/dummy/test/controllers/.keep b/spec/dummy/test/controllers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/fixtures/files/.keep b/spec/dummy/test/fixtures/files/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/helpers/.keep b/spec/dummy/test/helpers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/integration/.keep b/spec/dummy/test/integration/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/mailers/.keep b/spec/dummy/test/mailers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/models/.keep b/spec/dummy/test/models/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/system/.keep b/spec/dummy/test/system/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/test/test_helper.rb b/spec/dummy/test/test_helper.rb new file mode 100644 index 00000000..d713e377 --- /dev/null +++ b/spec/dummy/test/test_helper.rb @@ -0,0 +1,13 @@ +ENV["RAILS_ENV"] ||= "test" +require_relative "../config/environment" +require "rails/test_help" + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + parallelize(workers: :number_of_processors) + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/spec/dummy/tmp/.keep b/spec/dummy/tmp/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/tmp/pids/.keep b/spec/dummy/tmp/pids/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/tmp/storage/.keep b/spec/dummy/tmp/storage/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/dummy/vendor/.keep b/spec/dummy/vendor/.keep new file mode 100644 index 00000000..e69de29b From c89dbcfd89bead6f2dc7cfc1a7ef3e32b62e1073 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Wed, 3 Nov 2021 16:21:43 -0400 Subject: [PATCH 06/21] Restore changes needed to run the schema plugin in the dummy app Commit b15f5f5766d6a429d63652c79a881b97a996bf8e: - Remove the .ruby-version restriction - Load the manageiq-schema Gemfile instead of the dummy app Gemfile - Delete the generated database.yml in favor of database.tmpl.yml - Ignore the db/schema.rb that is generated - Restore the v2_key Commit c716815961acde41c1d1dbd2a7c362504e23db62: - Temporary override of the belongs_to_required_by_default setting Commit 6b7d6fd2e129e4592c6d2545721a16c995f1fcd5: - Update the dummy app to use_yaml_unsafe_load Commit 7e34b02c551d25892511e702029900fb049ec39b: - Modify the Rails version to allow multiple versions in test Commit 8529571f1a45c254fd9f4267c127a52f87a6fd9a: - Drop config.assets since sprockets-rails isn't in rails 7 --- spec/dummy/.gitignore | 4 + spec/dummy/.ruby-version | 1 - spec/dummy/Gemfile | 69 --------------- spec/dummy/certs/v2_key | 5 ++ spec/dummy/config/application.rb | 8 +- spec/dummy/config/boot.rb | 2 +- spec/dummy/config/database.tmpl.yml | 23 +++++ spec/dummy/config/database.yml | 86 ------------------- spec/dummy/config/environments/development.rb | 3 - spec/dummy/config/environments/production.rb | 6 -- spec/dummy/config/initializers/assets.rb | 12 --- 11 files changed, 40 insertions(+), 179 deletions(-) delete mode 100644 spec/dummy/.ruby-version delete mode 100644 spec/dummy/Gemfile create mode 100644 spec/dummy/certs/v2_key create mode 100644 spec/dummy/config/database.tmpl.yml delete mode 100644 spec/dummy/config/database.yml delete mode 100644 spec/dummy/config/initializers/assets.rb diff --git a/spec/dummy/.gitignore b/spec/dummy/.gitignore index e16dc71d..3d30682d 100644 --- a/spec/dummy/.gitignore +++ b/spec/dummy/.gitignore @@ -29,3 +29,7 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Ignores for working with manageiq-schema plugin +/config/database.yml +/db/schema.rb diff --git a/spec/dummy/.ruby-version b/spec/dummy/.ruby-version deleted file mode 100644 index 36415f72..00000000 --- a/spec/dummy/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -ruby-3.1.5 diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile deleted file mode 100644 index 5a02bb41..00000000 --- a/spec/dummy/Gemfile +++ /dev/null @@ -1,69 +0,0 @@ -source "https://rubygems.org" -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -ruby "3.1.5" - -# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" -gem "rails", "~> 7.0.8", ">= 7.0.8.4" - -# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] -gem "sprockets-rails" - -# Use postgresql as the database for Active Record -gem "pg", "~> 1.1" - -# Use the Puma web server [https://github.com/puma/puma] -gem "puma", "~> 5.0" - -# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] -gem "importmap-rails" - -# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev] -gem "turbo-rails" - -# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev] -gem "stimulus-rails" - -# Build JSON APIs with ease [https://github.com/rails/jbuilder] -gem "jbuilder" - -# Use Redis adapter to run Action Cable in production -# gem "redis", "~> 4.0" - -# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis] -# gem "kredis" - -# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword] -# gem "bcrypt", "~> 3.1.7" - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] - -# Use Sass to process CSS -# gem "sassc-rails" - -# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] -# gem "image_processing", "~> 1.2" - -group :development, :test do - # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem - gem "debug", platforms: %i[ mri mingw x64_mingw ] -end - -group :development do - # Use console on exceptions pages [https://github.com/rails/web-console] - gem "web-console" - - # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler] - # gem "rack-mini-profiler" - - # Speed up commands on slow machines / big apps [https://github.com/rails/spring] - # gem "spring" -end - -group :test do - # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing] - gem "capybara" - gem "selenium-webdriver" - -end diff --git a/spec/dummy/certs/v2_key b/spec/dummy/certs/v2_key new file mode 100644 index 00000000..ad7bc69c --- /dev/null +++ b/spec/dummy/certs/v2_key @@ -0,0 +1,5 @@ +--- +:EZCRYPTO KEY FILE: KEEP THIS SECURE ! +:created: 2014-02-28 09:59:47 -0500 +:algorithm: aes-256-cbc +:key: uXfIgSAUq5Oz8goc/zI8HOOo0SI++Sd9mfpgBanYIM4= diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 9b9479e6..a26290e4 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -9,7 +9,7 @@ module Dummy class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults Rails::VERSION::STRING.to_f # Configuration for the application, engines, and railties goes here. # @@ -18,5 +18,11 @@ class Application < Rails::Application # # config.time_zone = "Central Time (US & Canada)" # config.eager_load_paths << Rails.root.join("extras") + + # HACK: Temporary override of the default setting until we can update the + # migration specs to honor it. + config.active_record.belongs_to_required_by_default = false + + config.active_record.use_yaml_unsafe_load = true end end diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb index 28201161..4cdfdda2 100644 --- a/spec/dummy/config/boot.rb +++ b/spec/dummy/config/boot.rb @@ -1,3 +1,3 @@ -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../../Gemfile", __dir__) require "bundler/setup" # Set up gems listed in the Gemfile. diff --git a/spec/dummy/config/database.tmpl.yml b/spec/dummy/config/database.tmpl.yml new file mode 100644 index 00000000..cf3f1057 --- /dev/null +++ b/spec/dummy/config/database.tmpl.yml @@ -0,0 +1,23 @@ +--- +base: &base + adapter: postgresql + encoding: utf8 + username: root + password: smartvm + pool: 5 + wait_timeout: 5 + min_messages: warning + +development: + <<: *base + database: dummy_development + min_messages: notice + +production: + <<: *base + database: dummy_production + +test: &test + <<: *base + pool: 3 + database: dummy_test diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml deleted file mode 100644 index 8d927df0..00000000 --- a/spec/dummy/config/database.yml +++ /dev/null @@ -1,86 +0,0 @@ -# PostgreSQL. Versions 9.3 and up are supported. -# -# Install the pg driver: -# gem install pg -# On macOS with Homebrew: -# gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On macOS with MacPorts: -# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config -# On Windows: -# gem install pg -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -# -# Configure Using Gemfile -# gem "pg" -# -default: &default - adapter: postgresql - encoding: unicode - # For details on connection pooling, see Rails configuration guide - # https://guides.rubyonrails.org/configuring.html#database-pooling - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - -development: - <<: *default - database: dummy_development - - # The specified database role being used to connect to postgres. - # To create additional roles in postgres see `$ createuser --help`. - # When left blank, postgres will use the default role. This is - # the same name as the operating system user running Rails. - #username: dummy - - # The password associated with the postgres role (username). - #password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - - # The TCP port the server listens on. Defaults to 5432. - # If your server runs on a different port number, change accordingly. - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # Defaults to warning. - #min_messages: notice - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: dummy_test - -# As with config/credentials.yml, you never want to store sensitive information, -# like your database password, in your source code. If your source code is -# ever seen by anyone, they now have access to your database. -# -# Instead, provide the password or a full connection URL as an environment -# variable when you boot the app. For example: -# -# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" -# -# If the connection URL is provided in the special DATABASE_URL environment -# variable, Rails will automatically merge its configuration values on top of -# the values provided in this file. Alternatively, you can specify a connection -# URL environment variable explicitly: -# -# production: -# url: <%= ENV["MY_APP_DATABASE_URL"] %> -# -# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full overview on how database connection configuration can be specified. -# -production: - <<: *default - database: dummy_production - username: dummy - password: <%= ENV["DUMMY_DATABASE_PASSWORD"] %> diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb index 8500f459..fc7f82b5 100644 --- a/spec/dummy/config/environments/development.rb +++ b/spec/dummy/config/environments/development.rb @@ -56,9 +56,6 @@ # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true - # Suppress logger output for asset requests. - config.assets.quiet = true - # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb index 8e989b5f..83a5a16e 100644 --- a/spec/dummy/config/environments/production.rb +++ b/spec/dummy/config/environments/production.rb @@ -24,12 +24,6 @@ # Apache or NGINX already handles this. config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? - # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.asset_host = "http://assets.example.com" diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb deleted file mode 100644 index 2eeef966..00000000 --- a/spec/dummy/config/initializers/assets.rb +++ /dev/null @@ -1,12 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = "1.0" - -# Add additional assets to the asset load path. -# Rails.application.config.assets.paths << Emoji.images_path - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -# Rails.application.config.assets.precompile += %w( admin.js admin.css ) From 77bea1a16b38205a42fa7669c94975f9e84f516b Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Thu, 29 Aug 2024 23:31:46 -0400 Subject: [PATCH 07/21] Drop Rails 6.1 --- .github/workflows/ci.yaml | 1 - Gemfile | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f690c000..6f738353 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,6 @@ jobs: - '3.0' - '3.1' rails-version: - - '6.1' - '7.0' services: postgres: diff --git a/Gemfile b/Gemfile index 035177f2..3102353b 100644 --- a/Gemfile +++ b/Gemfile @@ -16,9 +16,7 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle minimum_version = case ENV.fetch('TEST_RAILS_VERSION', nil) when "7.0" - "~>7.0.8" - else # Default local bundling to use this version for generating migrations - "~>6.1.4" + "~>7.0.8" end gem "rails", minimum_version From e14287084bbe3668f64280df507ebb72196d2262 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Fri, 30 Aug 2024 13:33:04 -0400 Subject: [PATCH 08/21] Reset resource_pool_infra product features --- ...0172702_reset_resource_pool_identifiers.rb | 35 ++++++++++++++++ ...02_reset_resource_pool_identifiers_spec.rb | 41 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 db/migrate/20240830172702_reset_resource_pool_identifiers.rb create mode 100644 spec/migrations/20240830172702_reset_resource_pool_identifiers_spec.rb diff --git a/db/migrate/20240830172702_reset_resource_pool_identifiers.rb b/db/migrate/20240830172702_reset_resource_pool_identifiers.rb new file mode 100644 index 00000000..404c739b --- /dev/null +++ b/db/migrate/20240830172702_reset_resource_pool_identifiers.rb @@ -0,0 +1,35 @@ +class ResetResourcePoolIdentifiers < ActiveRecord::Migration[6.1] + class MiqProductFeature < ActiveRecord::Base; end + + FEATURE_MAPPING_UPDATE = { + 'resource_pool_infra' => 'resource_pool', + 'resource_pool_infra_view' => 'resource_pool_view', + 'resource_pool_infra_show_list' => 'resource_pool_show_list', + 'resource_pool_infra_show' => 'resource_pool_show', + 'resource_pool_infra_control' => 'resource_pool_control', + 'resource_pool_infra_tag' => 'resource_pool_tag', + 'resource_pool_infra_protect' => 'resource_pool_protect', + 'resource_pool_infra_admin' => 'resource_pool_admin', + 'resource_pool_infra_delete' => 'resource_pool_delete' + }.freeze + + def up + return if MiqProductFeature.none? + + say_with_time('Resetting resource_pool_infra features back to resource_pool') do + FEATURE_MAPPING_UPDATE.each do |from, to| + MiqProductFeature.find_by(:identifier => from)&.update!(:identifier => to) + end + end + end + + def down + return if MiqProductFeature.none? + + say_with_time('Updating resource_pool features to resource_pool_infra') do + FEATURE_MAPPING_UPDATE.each do |to, from| + MiqProductFeature.find_by(:identifier => from)&.update!(:identifier => to) + end + end + end +end diff --git a/spec/migrations/20240830172702_reset_resource_pool_identifiers_spec.rb b/spec/migrations/20240830172702_reset_resource_pool_identifiers_spec.rb new file mode 100644 index 00000000..c4008872 --- /dev/null +++ b/spec/migrations/20240830172702_reset_resource_pool_identifiers_spec.rb @@ -0,0 +1,41 @@ +require_migration + +# This is mostly necessary for data migrations, so feel free to delete this +# file if you do no need it. +describe ResetResourcePoolIdentifiers do + let(:miq_product_feature) { migration_stub(:MiqProductFeature) } + + before do + described_class::FEATURE_MAPPING_UPDATE.each_key do |old_identifier| + miq_product_feature.create!(:identifier => old_identifier) + end + end + + migration_context :up do + it "updates existing resource_pool features to resource_pool_infra" do + migrate + + described_class::FEATURE_MAPPING_UPDATE.each do |old_identifier, new_identifier| + expect(miq_product_feature.exists?(:identifier => old_identifier)).to be_falsy + expect(miq_product_feature.exists?(:identifier => new_identifier)).to be_truthy + end + end + end + + migration_context :down do + before do + described_class::FEATURE_MAPPING_UPDATE.each_value do |new_identifier| + miq_product_feature.create!(:identifier => new_identifier) + end + end + + it "reverts resource_pool_infra features back to resource_pool" do + migrate + + described_class::FEATURE_MAPPING_UPDATE.each do |old_identifier, new_identifier| + expect(miq_product_feature.exists?(:identifier => new_identifier)).to be_falsy + expect(miq_product_feature.exists?(:identifier => old_identifier)).to be_truthy + end + end + end +end From 4228aaede745985c2eaa0c999948c74f48255f59 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 24 Sep 2024 09:56:04 -0400 Subject: [PATCH 09/21] Use core minimum but allow 7.0/7.1/7.2 since core sets upper limit This should be safe to use as is since the core application sets the rails version. This will allow us to test with other versions on master. --- manageiq-schema.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-schema.gemspec b/manageiq-schema.gemspec index 85044485..16474c87 100644 --- a/manageiq-schema.gemspec +++ b/manageiq-schema.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |spec| spec.add_dependency "manageiq-password", ">= 1.2.0", "< 2" spec.add_dependency "more_core_extensions", ">= 3.5", "< 5" spec.add_dependency "pg" - spec.add_dependency "rails", ">=6.0.4", "<7.1" + spec.add_dependency "rails", ">=7.0.8", "<8.0" spec.add_development_dependency "manageiq-style", ">= 1.5.2" spec.add_development_dependency "rspec" From 6080c9e9ebfcb9b12e293d781f4feb429ce63820 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Mon, 30 Sep 2024 17:13:53 -0400 Subject: [PATCH 10/21] Testing with ruby 3.2, 3.3 --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6f738353..4ac65dfa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,6 +14,8 @@ jobs: ruby-version: - '3.0' - '3.1' + - '3.2' + - '3.3' rails-version: - '7.0' services: From 34b99965c8c80ded80f06b68e396c40b6ff46fde Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Thu, 17 Oct 2024 16:40:16 -0400 Subject: [PATCH 11/21] Add a migration to encrypt database password using scram-sha-256 CP4AIOPS-3003 --- ...41017013023_reencrypt_password_scramsha.rb | 13 +++++++++++ ...013023_reencrypt_password_scramsha_spec.rb | 22 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 db/migrate/20241017013023_reencrypt_password_scramsha.rb create mode 100644 spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb diff --git a/db/migrate/20241017013023_reencrypt_password_scramsha.rb b/db/migrate/20241017013023_reencrypt_password_scramsha.rb new file mode 100644 index 00000000..4595dd7e --- /dev/null +++ b/db/migrate/20241017013023_reencrypt_password_scramsha.rb @@ -0,0 +1,13 @@ +class ReencryptPasswordScramsha < ActiveRecord::Migration[6.1] + def up + say_with_time('Reencrypting database user password with scram-sha-256') do + db_config = ActiveRecord::Base.connection_db_config.configuration_hash + username = db_config[:username] + password = connection.raw_connection.encrypt_password(db_config[:password], username, "scram-sha-256") + + connection.execute <<-SQL + ALTER ROLE #{username} WITH PASSWORD '#{password}'; + SQL + end + end +end diff --git a/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb b/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb new file mode 100644 index 00000000..1f293931 --- /dev/null +++ b/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb @@ -0,0 +1,22 @@ +require_migration + +# This is mostly necessary for data migrations, so feel free to delete this +# file if you do no need it. +describe ReencryptPasswordScramsha do + migration_context :up do + it "Ensures that the user password is stored as scram-sha-256" do + migrate + + username = ActiveRecord::Base.connection_db_config.configuration_hash[:username] + + users_and_passwords = ActiveRecord::Base.connection.execute <<-SQL + SELECT rolname, rolpassword FROM pg_authid WHERE rolcanlogin; + SQL + + record = users_and_passwords.to_a.detect { |i| i["rolname"] == username } + + expect(record["rolname"]).to eq(username) + expect(record["rolpassword"]).to match(/^SCRAM-SHA-256.*/) + end + end +end From d43fbcc75e1350110e2b35ed4cf4c9026adf626a Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Wed, 23 Oct 2024 10:33:27 -0400 Subject: [PATCH 12/21] Bump the rails gem minimum for CVEs --- manageiq-schema.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-schema.gemspec b/manageiq-schema.gemspec index 16474c87..ceaecc22 100644 --- a/manageiq-schema.gemspec +++ b/manageiq-schema.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |spec| spec.add_dependency "manageiq-password", ">= 1.2.0", "< 2" spec.add_dependency "more_core_extensions", ">= 3.5", "< 5" spec.add_dependency "pg" - spec.add_dependency "rails", ">=7.0.8", "<8.0" + spec.add_dependency "rails", ">=7.0.8.5", "<8.0" spec.add_development_dependency "manageiq-style", ">= 1.5.2" spec.add_development_dependency "rspec" From 07500c8bb91cad480c49d4afe963bb0a12a481ee Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Wed, 2 Oct 2024 15:32:29 -0400 Subject: [PATCH 13/21] Support using rails 7.1 and 7.2 versioned gems Add them to the matrix. --- .github/workflows/ci.yaml | 5 +++++ Gemfile | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4ac65dfa..4e916c62 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,6 +18,11 @@ jobs: - '3.3' rails-version: - '7.0' + - '7.1' + - '7.2' + exclude: + - ruby-version: '3.0' + rails-version: '7.2' services: postgres: image: manageiq/postgresql:13 diff --git a/Gemfile b/Gemfile index 3102353b..876a14d4 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,12 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle # your gem to rubygems.org. minimum_version = - case ENV.fetch('TEST_RAILS_VERSION', nil) - when "7.0" + case ENV['TEST_RAILS_VERSION'] + when "7.2" + "~>7.2.1" + when "7.1" + "~>7.1.4" + else # Default local bundling to use this version for generating migrations "~>7.0.8" end From 9ad9001485588cdd8742e4f54cb95c42c0499e34 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Wed, 2 Oct 2024 15:34:15 -0400 Subject: [PATCH 14/21] Set default_column_serializer to YAML for now for backward compatibility --- spec/dummy/config/application.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index a26290e4..c81ea41b 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -23,6 +23,11 @@ class Application < Rails::Application # migration specs to honor it. config.active_record.belongs_to_required_by_default = false + # Note, you can't pass kwargs :coder => YAML to serialize until rails 7.1 as it was a positional + # argument previously. To avoid a case statement in all usages of serialize, we're defaulting + # all serialized columns to YAML for rails 7.1+ here. Ideally, we would use JSON if we find we can + # use a simpler datatype. See: https://github.com/rails/rails/pull/47463 + config.active_record.default_column_serializer = YAML if Rails.version >= "7.1" config.active_record.use_yaml_unsafe_load = true end end From 3eab6b5db412f428770976f4571bf6a1083c107a Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Wed, 2 Oct 2024 15:35:06 -0400 Subject: [PATCH 15/21] Prepend serialize in 7.1+ to convert positional arguments to kwargs See https://www.github.com/rails/rails/pull/47463 --- .../serialize_positional_to_kwargs_bridge.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb diff --git a/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb b/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb new file mode 100644 index 00000000..bffe3b99 --- /dev/null +++ b/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb @@ -0,0 +1,23 @@ +module Dummy + module SerializePositionalToKwargsBridge + def serialize(*args, **options) + return super if Rails.version < "7.1" || options[:coder] + + # If class_name_or_coder second argument is a class, set the type + if args[1].respond_to?(:new) + options = options.merge(coder: YAML, type: args[1]) + # If no class or coder provided, assume YAML coder and Object (legacy defaults / no validation) + elsif args[1].blank? + options = options.merge(coder: YAML, type: Object) + else + # otherwise, it's a coder which should only define dump/load, so set coder + options = options.merge(coder: args[1], type: Object) + end + + # pass the first argument (drop the second) and forward the updated kwargs + super(args[0], **options) + end + end +end + +ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, Dummy::SerializePositionalToKwargsBridge) From 320a780834f7696c8ff2fd967c9edf7bd33773a2 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 4 Oct 2024 16:11:59 -0400 Subject: [PATCH 16/21] Use the rails 7.1+ serialize interface even for 7.0 We can intercept serialize for 7.0 and convert kwargs back to the positional class_name_or_coder. Update existing migrations to use rails 7.1 interface. --- ...2526_move_zone_ntp_settings_to_settings.rb | 2 +- ...06083431_convert_quadicon_settings_keys.rb | 2 +- ...conversion_host_id_to_miq_request_tasks.rb | 2 +- ...20191002103406_remove_quadicon_settings.rb | 2 +- .../20200331150436_rename_foreman_features.rb | 2 +- ...00512201614_update_chargeback_startpage.rb | 2 +- ...update_chargeback_assignments_startpage.rb | 2 +- ...200_update_chargeback_reports_startpage.rb | 2 +- ...just_control_explorer_startpage_entries.rb | 2 +- ...ut_after_policy_profile_deexplorization.rb | 2 +- ...shortcut_after_actions_de_explorization.rb | 2 +- ...cy_startpage_url_after_de_explorization.rb | 2 +- ...180202_update_policy_rsop_startpage_url.rb | 2 +- ...0226_update_policy_export_startpage_url.rb | 2 +- ...6201124_update_policy_log_startpage_url.rb | 2 +- ...ts_startpage_url_after_de_explorization.rb | 2 +- ...es_startpage_url_after_de_explorization.rb | 2 +- ...ts_startpage_url_after_de_explorization.rb | 2 +- ...ns_startpage_url_after_de_explorization.rb | 2 +- ...30_update_automation_provider_startpage.rb | 2 +- ...hortcut_after_services_de_explorization.rb | 2 +- ...5200407_fix_vpc_provision_instance_type.rb | 2 +- .../serialize_positional_to_kwargs_bridge.rb | 20 ++++++++----------- 23 files changed, 30 insertions(+), 34 deletions(-) diff --git a/db/migrate/20171103212526_move_zone_ntp_settings_to_settings.rb b/db/migrate/20171103212526_move_zone_ntp_settings_to_settings.rb index 018a6c99..5adc5c3a 100644 --- a/db/migrate/20171103212526_move_zone_ntp_settings_to_settings.rb +++ b/db/migrate/20171103212526_move_zone_ntp_settings_to_settings.rb @@ -3,7 +3,7 @@ class SettingsChange < ActiveRecord::Base serialize :value end class Zone < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20180606083431_convert_quadicon_settings_keys.rb b/db/migrate/20180606083431_convert_quadicon_settings_keys.rb index e7f15248..ddec2b8b 100644 --- a/db/migrate/20180606083431_convert_quadicon_settings_keys.rb +++ b/db/migrate/20180606083431_convert_quadicon_settings_keys.rb @@ -1,6 +1,6 @@ class ConvertQuadiconSettingsKeys < ActiveRecord::Migration[5.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20181001131632_add_conversion_host_id_to_miq_request_tasks.rb b/db/migrate/20181001131632_add_conversion_host_id_to_miq_request_tasks.rb index d33a66f2..641500d1 100644 --- a/db/migrate/20181001131632_add_conversion_host_id_to_miq_request_tasks.rb +++ b/db/migrate/20181001131632_add_conversion_host_id_to_miq_request_tasks.rb @@ -3,7 +3,7 @@ class MiqRequestTask < ActiveRecord::Base self.inheritance_column = :_type_disabled include ActiveRecord::IdRegions - serialize :options, Hash + serialize :options, :type => Hash belongs_to :conversion_host, :class_name => "AddConversionHostIdToMiqRequestTasks::ConversionHost" end diff --git a/db/migrate/20191002103406_remove_quadicon_settings.rb b/db/migrate/20191002103406_remove_quadicon_settings.rb index 0d98f62e..29cb2046 100644 --- a/db/migrate/20191002103406_remove_quadicon_settings.rb +++ b/db/migrate/20191002103406_remove_quadicon_settings.rb @@ -1,6 +1,6 @@ class RemoveQuadiconSettings < ActiveRecord::Migration[5.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20200331150436_rename_foreman_features.rb b/db/migrate/20200331150436_rename_foreman_features.rb index 86dfa7b8..36052a34 100644 --- a/db/migrate/20200331150436_rename_foreman_features.rb +++ b/db/migrate/20200331150436_rename_foreman_features.rb @@ -2,7 +2,7 @@ class RenameForemanFeatures < ActiveRecord::Migration[5.1] class MiqProductFeature < ActiveRecord::Base; end class MiqRolesFeature < ActiveRecord::Base; end class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end FEATURE_MAPPING = { diff --git a/db/migrate/20200512201614_update_chargeback_startpage.rb b/db/migrate/20200512201614_update_chargeback_startpage.rb index 2775ea38..2bbd946a 100644 --- a/db/migrate/20200512201614_update_chargeback_startpage.rb +++ b/db/migrate/20200512201614_update_chargeback_startpage.rb @@ -1,6 +1,6 @@ class UpdateChargebackStartpage < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20200520182548_update_chargeback_assignments_startpage.rb b/db/migrate/20200520182548_update_chargeback_assignments_startpage.rb index c521c5c4..7dcca221 100644 --- a/db/migrate/20200520182548_update_chargeback_assignments_startpage.rb +++ b/db/migrate/20200520182548_update_chargeback_assignments_startpage.rb @@ -1,6 +1,6 @@ class UpdateChargebackAssignmentsStartpage < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash include ActiveRecord::IdRegions end diff --git a/db/migrate/20200520210200_update_chargeback_reports_startpage.rb b/db/migrate/20200520210200_update_chargeback_reports_startpage.rb index 03eaa355..d046e8fd 100644 --- a/db/migrate/20200520210200_update_chargeback_reports_startpage.rb +++ b/db/migrate/20200520210200_update_chargeback_reports_startpage.rb @@ -1,6 +1,6 @@ class UpdateChargebackReportsStartpage < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash include ActiveRecord::IdRegions end diff --git a/db/migrate/20200910163718_adjust_control_explorer_startpage_entries.rb b/db/migrate/20200910163718_adjust_control_explorer_startpage_entries.rb index 4886f8cd..5e0f6593 100644 --- a/db/migrate/20200910163718_adjust_control_explorer_startpage_entries.rb +++ b/db/migrate/20200910163718_adjust_control_explorer_startpage_entries.rb @@ -1,6 +1,6 @@ class AdjustControlExplorerStartpageEntries < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20201227173629_update_startup_shortcut_after_policy_profile_deexplorization.rb b/db/migrate/20201227173629_update_startup_shortcut_after_policy_profile_deexplorization.rb index 7711ad1e..73c1dc2e 100644 --- a/db/migrate/20201227173629_update_startup_shortcut_after_policy_profile_deexplorization.rb +++ b/db/migrate/20201227173629_update_startup_shortcut_after_policy_profile_deexplorization.rb @@ -1,6 +1,6 @@ class UpdateStartupShortcutAfterPolicyProfileDeexplorization < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20201230005555_update_startpage_shortcut_after_actions_de_explorization.rb b/db/migrate/20201230005555_update_startpage_shortcut_after_actions_de_explorization.rb index eb8082f8..08628a61 100644 --- a/db/migrate/20201230005555_update_startpage_shortcut_after_actions_de_explorization.rb +++ b/db/migrate/20201230005555_update_startpage_shortcut_after_actions_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateStartpageShortcutAfterActionsDeExplorization < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210105011714_update_policy_startpage_url_after_de_explorization.rb b/db/migrate/20210105011714_update_policy_startpage_url_after_de_explorization.rb index ef47b401..bf8403d7 100644 --- a/db/migrate/20210105011714_update_policy_startpage_url_after_de_explorization.rb +++ b/db/migrate/20210105011714_update_policy_startpage_url_after_de_explorization.rb @@ -1,6 +1,6 @@ class UpdatePolicyStartpageUrlAfterDeExplorization < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210106180202_update_policy_rsop_startpage_url.rb b/db/migrate/20210106180202_update_policy_rsop_startpage_url.rb index e69d93a6..880d0304 100644 --- a/db/migrate/20210106180202_update_policy_rsop_startpage_url.rb +++ b/db/migrate/20210106180202_update_policy_rsop_startpage_url.rb @@ -1,6 +1,6 @@ class UpdatePolicyRsopStartpageUrl < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210106200226_update_policy_export_startpage_url.rb b/db/migrate/20210106200226_update_policy_export_startpage_url.rb index c0efb904..febb2d1e 100644 --- a/db/migrate/20210106200226_update_policy_export_startpage_url.rb +++ b/db/migrate/20210106200226_update_policy_export_startpage_url.rb @@ -1,6 +1,6 @@ class UpdatePolicyExportStartpageUrl < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210106201124_update_policy_log_startpage_url.rb b/db/migrate/20210106201124_update_policy_log_startpage_url.rb index 106d93f8..7b03d44a 100644 --- a/db/migrate/20210106201124_update_policy_log_startpage_url.rb +++ b/db/migrate/20210106201124_update_policy_log_startpage_url.rb @@ -1,6 +1,6 @@ class UpdatePolicyLogStartpageUrl < ActiveRecord::Migration[5.2] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210112000610_update_alerts_startpage_url_after_de_explorization.rb b/db/migrate/20210112000610_update_alerts_startpage_url_after_de_explorization.rb index 99d08851..5071c661 100644 --- a/db/migrate/20210112000610_update_alerts_startpage_url_after_de_explorization.rb +++ b/db/migrate/20210112000610_update_alerts_startpage_url_after_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateAlertsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210112001749_update_alert_profiles_startpage_url_after_de_explorization.rb b/db/migrate/20210112001749_update_alert_profiles_startpage_url_after_de_explorization.rb index dcee24f7..826a2074 100644 --- a/db/migrate/20210112001749_update_alert_profiles_startpage_url_after_de_explorization.rb +++ b/db/migrate/20210112001749_update_alert_profiles_startpage_url_after_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateAlertProfilesStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210112003720_update_events_startpage_url_after_de_explorization.rb b/db/migrate/20210112003720_update_events_startpage_url_after_de_explorization.rb index 69aea8ae..3c45f6f1 100644 --- a/db/migrate/20210112003720_update_events_startpage_url_after_de_explorization.rb +++ b/db/migrate/20210112003720_update_events_startpage_url_after_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateEventsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210112004301_update_conditions_startpage_url_after_de_explorization.rb b/db/migrate/20210112004301_update_conditions_startpage_url_after_de_explorization.rb index 06cef353..ae9a2757 100644 --- a/db/migrate/20210112004301_update_conditions_startpage_url_after_de_explorization.rb +++ b/db/migrate/20210112004301_update_conditions_startpage_url_after_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateConditionsStartpageUrlAfterDeExplorization < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20210315161230_update_automation_provider_startpage.rb b/db/migrate/20210315161230_update_automation_provider_startpage.rb index 03ef60d3..98f0b837 100644 --- a/db/migrate/20210315161230_update_automation_provider_startpage.rb +++ b/db/migrate/20210315161230_update_automation_provider_startpage.rb @@ -1,6 +1,6 @@ class UpdateAutomationProviderStartpage < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20220629110748_update_startpage_shortcut_after_services_de_explorization.rb b/db/migrate/20220629110748_update_startpage_shortcut_after_services_de_explorization.rb index f0a56061..e2f06601 100644 --- a/db/migrate/20220629110748_update_startpage_shortcut_after_services_de_explorization.rb +++ b/db/migrate/20220629110748_update_startpage_shortcut_after_services_de_explorization.rb @@ -1,6 +1,6 @@ class UpdateStartpageShortcutAfterServicesDeExplorization < ActiveRecord::Migration[6.0] class User < ActiveRecord::Base - serialize :settings, Hash + serialize :settings, :type => Hash end def up diff --git a/db/migrate/20230525200407_fix_vpc_provision_instance_type.rb b/db/migrate/20230525200407_fix_vpc_provision_instance_type.rb index f6fa6e1b..a067da69 100644 --- a/db/migrate/20230525200407_fix_vpc_provision_instance_type.rb +++ b/db/migrate/20230525200407_fix_vpc_provision_instance_type.rb @@ -11,7 +11,7 @@ class MiqRequest < ActiveRecord::Base self.inheritance_column = :_type_disabled - serialize :options, Hash + serialize :options, :type => Hash end def up diff --git a/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb b/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb index bffe3b99..b662c2fa 100644 --- a/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb +++ b/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb @@ -1,21 +1,17 @@ module Dummy module SerializePositionalToKwargsBridge def serialize(*args, **options) - return super if Rails.version < "7.1" || options[:coder] + return super if Rails.version >= "7.1" - # If class_name_or_coder second argument is a class, set the type - if args[1].respond_to?(:new) - options = options.merge(coder: YAML, type: args[1]) - # If no class or coder provided, assume YAML coder and Object (legacy defaults / no validation) - elsif args[1].blank? - options = options.merge(coder: YAML, type: Object) - else - # otherwise, it's a coder which should only define dump/load, so set coder - options = options.merge(coder: args[1], type: Object) + # For rails 7.0.x, convert 7.1+ kwargs for coder/type into the positional argument + # class_name_or_coder + if options[:coder] + args << options.delete(:coder) + elsif options[:type] + args << options.delete(:type) end - # pass the first argument (drop the second) and forward the updated kwargs - super(args[0], **options) + super(*args, **options) end end end From f3d700260ee3e227b50a91fd9a29b7029b1f3697 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 4 Oct 2024 14:40:33 -0400 Subject: [PATCH 17/21] Behaviour is deprecated/removed in 7.1/7.2, use Behavior See https://www.github.com/rails/rails/pull/45180 --- spec/lib/generators/migration_generator_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/lib/generators/migration_generator_spec.rb b/spec/lib/generators/migration_generator_spec.rb index 45a589cb..8d5c07bc 100644 --- a/spec/lib/generators/migration_generator_spec.rb +++ b/spec/lib/generators/migration_generator_spec.rb @@ -3,7 +3,12 @@ require 'generators/migration/migration_generator' describe ManageIQ::Schema::MigrationGenerator do - include Rails::Generators::Testing::Behaviour + if Rails.version >= "7.1" + include Rails::Generators::Testing::Behavior + else + include Rails::Generators::Testing::Behaviour + end + include Rails::Generators::Testing::SetupAndTeardown include Rails::Generators::Testing::Assertions include FileUtils From 16b6d7e729e4456013bdc5d151ea84bf99bb375c Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 4 Oct 2024 15:58:19 -0400 Subject: [PATCH 18/21] Rails 7.2 refactored schema_migration metadata/context to the pool See: https://www.github.com/rails/rails/pull/51162 --- spec/support/migration_helper.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/spec/support/migration_helper.rb b/spec/support/migration_helper.rb index 90660b20..03c443cf 100644 --- a/spec/support/migration_helper.rb +++ b/spec/support/migration_helper.rb @@ -108,8 +108,7 @@ def suppress_migration_messages def migrate_to(version) suppress_migration_messages do migration_dir = Rails.application.config.paths["db/migrate"] - migration_conn = ::ActiveRecord::Base.connection.schema_migration - ActiveRecord::MigrationContext.new(migration_dir, migration_conn).migrate(version) + ActiveRecord::MigrationContext.new(migration_dir, schema_migration).migrate(version) end end @@ -126,16 +125,24 @@ def previous_migration_version def run_migrate migration_dir = Rails.application.config.paths["db/migrate"] - migration_conn = ::ActiveRecord::Base.connection.schema_migration - context = ActiveRecord::MigrationContext.new(migration_dir, migration_conn) + context = ActiveRecord::MigrationContext.new(migration_dir, schema_migration) context.run(migration_direction, this_migration_version) end + def schema_migration + # Rails 7.2 refactored the schema_migration metadata and context to the pool + # https://www.github.com/rails/rails/pull/51162 + if Rails.version >= "7.2" + ::ActiveRecord::Base.connection.pool.schema_migration + else + ::ActiveRecord::Base.connection.schema_migration + end + end + def schema_migrations migration_dir = Rails.application.config.paths["db/migrate"] - migration_conn = ::ActiveRecord::Base.connection.schema_migration - ActiveRecord::MigrationContext.new(migration_dir, migration_conn).migrations + ActiveRecord::MigrationContext.new(migration_dir, schema_migration).migrations end def migrations_and_index From 157860a0f3c71b9e439286daade101c4a5e9dea2 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Thu, 10 Oct 2024 12:34:38 -0400 Subject: [PATCH 19/21] Bump id_regions to support rails 7.1+ --- manageiq-schema.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-schema.gemspec b/manageiq-schema.gemspec index ceaecc22..9c888e40 100644 --- a/manageiq-schema.gemspec +++ b/manageiq-schema.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "ancestry" - spec.add_dependency "activerecord-id_regions", "~> 0.4.0" + spec.add_dependency "activerecord-id_regions", "~> 0.5.0" spec.add_dependency "manageiq-password", ">= 1.2.0", "< 2" spec.add_dependency "more_core_extensions", ">= 3.5", "< 5" spec.add_dependency "pg" From a3eb361d4f3d2fea7a39a97fcc798f8dd2190029 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Thu, 10 Oct 2024 16:23:22 -0400 Subject: [PATCH 20/21] Move SerializePositionalToKwargsBridge to the plugin itself --- lib/manageiq/schema/engine.rb | 3 ++- .../serialize_positional_to_kwargs_bridge.rb | 19 +++++++++++++++++++ .../serialize_positional_to_kwargs_bridge.rb | 19 ------------------- 3 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 lib/manageiq/schema/serialize_positional_to_kwargs_bridge.rb delete mode 100644 spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb diff --git a/lib/manageiq/schema/engine.rb b/lib/manageiq/schema/engine.rb index 6d214276..fa34dd22 100644 --- a/lib/manageiq/schema/engine.rb +++ b/lib/manageiq/schema/engine.rb @@ -9,12 +9,13 @@ class Engine < ::Rails::Engine ActiveSupport.on_load(:active_record) do require_relative 'migrate_with_cleared_schema_cache' + require_relative 'serialize_positional_to_kwargs_bridge' require_relative 'schema_statements' require_relative 'command_recorder' require_relative 'schema_dumper' ActiveRecord::Migration.prepend(MigrateWithClearedSchemaCache) - + ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, ManageIQ::Schema::SerializePositionalToKwargsBridge) ActiveRecord::ConnectionAdapters::AbstractAdapter.include(SchemaStatements) ActiveRecord::Migration::CommandRecorder.include(CommandRecorder) ActiveRecord::ConnectionAdapters::SchemaDumper.prepend(SchemaDumper) diff --git a/lib/manageiq/schema/serialize_positional_to_kwargs_bridge.rb b/lib/manageiq/schema/serialize_positional_to_kwargs_bridge.rb new file mode 100644 index 00000000..3af48bc8 --- /dev/null +++ b/lib/manageiq/schema/serialize_positional_to_kwargs_bridge.rb @@ -0,0 +1,19 @@ +module ManageIQ + module Schema + module SerializePositionalToKwargsBridge + def serialize(*args, **options) + return super if Rails.version >= "7.1" + + # For rails 7.0.x, convert 7.1+ kwargs for coder/type into the positional argument + # class_name_or_coder + if options[:coder] + args << options.delete(:coder) + elsif options[:type] + args << options.delete(:type) + end + + super(*args, **options) + end + end + end +end diff --git a/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb b/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb deleted file mode 100644 index b662c2fa..00000000 --- a/spec/dummy/config/initializers/serialize_positional_to_kwargs_bridge.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Dummy - module SerializePositionalToKwargsBridge - def serialize(*args, **options) - return super if Rails.version >= "7.1" - - # For rails 7.0.x, convert 7.1+ kwargs for coder/type into the positional argument - # class_name_or_coder - if options[:coder] - args << options.delete(:coder) - elsif options[:type] - args << options.delete(:type) - end - - super(*args, **options) - end - end -end - -ActiveRecord::AttributeMethods::Serialization::ClassMethods.send(:prepend, Dummy::SerializePositionalToKwargsBridge) From 742841cf8954be1cb5843dca33945b5fc001cf8d Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Thu, 24 Oct 2024 12:19:26 -0400 Subject: [PATCH 21/21] Handle cases where the database connection does not use a password --- ...41017013023_reencrypt_password_scramsha.rb | 2 ++ ...013023_reencrypt_password_scramsha_spec.rb | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/db/migrate/20241017013023_reencrypt_password_scramsha.rb b/db/migrate/20241017013023_reencrypt_password_scramsha.rb index 4595dd7e..8764fd10 100644 --- a/db/migrate/20241017013023_reencrypt_password_scramsha.rb +++ b/db/migrate/20241017013023_reencrypt_password_scramsha.rb @@ -2,6 +2,8 @@ class ReencryptPasswordScramsha < ActiveRecord::Migration[6.1] def up say_with_time('Reencrypting database user password with scram-sha-256') do db_config = ActiveRecord::Base.connection_db_config.configuration_hash + return if db_config[:username].blank? || db_config[:password].blank? + username = db_config[:username] password = connection.raw_connection.encrypt_password(db_config[:password], username, "scram-sha-256") diff --git a/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb b/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb index 1f293931..5bacb2f7 100644 --- a/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb +++ b/spec/migrations/20241017013023_reencrypt_password_scramsha_spec.rb @@ -5,18 +5,31 @@ describe ReencryptPasswordScramsha do migration_context :up do it "Ensures that the user password is stored as scram-sha-256" do - migrate + allow(ActiveRecord::Base.connection).to receive(:execute).and_call_original username = ActiveRecord::Base.connection_db_config.configuration_hash[:username] - users_and_passwords = ActiveRecord::Base.connection.execute <<-SQL - SELECT rolname, rolpassword FROM pg_authid WHERE rolcanlogin; - SQL + expect(ActiveRecord::Base.connection_db_config).to receive(:configuration_hash).exactly(10).times.and_call_original + expect(ActiveRecord::Base.connection_db_config).to receive(:configuration_hash).and_wrap_original do |original_method, *args, &block| + original_method.call(*args, &block).dup.tap { |i| i[:password] ||= "abc" } + end + expect(ActiveRecord::Base.connection).to receive(:execute).with(a_string_matching(/ALTER ROLE #{username} WITH PASSWORD \'SCRAM-SHA-256.*\'\;/)) + + migrate + end + + it "Handles connections with no password" do + allow(ActiveRecord::Base.connection).to receive(:execute).and_call_original + + username = ActiveRecord::Base.connection_db_config.configuration_hash[:username] - record = users_and_passwords.to_a.detect { |i| i["rolname"] == username } + expect(ActiveRecord::Base.connection_db_config).to receive(:configuration_hash).exactly(10).times.and_call_original + expect(ActiveRecord::Base.connection_db_config).to receive(:configuration_hash).and_wrap_original do |original_method, *args, &block| + original_method.call(*args, &block).dup.tap { |i| i.delete(:password) } + end + expect(ActiveRecord::Base.connection).not_to receive(:execute).with(a_string_matching(/ALTER ROLE.*\'\;/)) - expect(record["rolname"]).to eq(username) - expect(record["rolpassword"]).to match(/^SCRAM-SHA-256.*/) + migrate end end end