Skip to content

Commit

Permalink
Restore changes needed to run the schema plugin in the dummy app
Browse files Browse the repository at this point in the history
- Remove the Ruby 2.7.4 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
  • Loading branch information
Fryguy committed Nov 4, 2021
1 parent 706cbb7 commit b15f5f5
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 134 deletions.
4 changes: 4 additions & 0 deletions spec/dummy/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,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
1 change: 0 additions & 1 deletion spec/dummy/.ruby-version

This file was deleted.

47 changes: 0 additions & 47 deletions spec/dummy/Gemfile

This file was deleted.

5 changes: 5 additions & 0 deletions spec/dummy/certs/v2_key
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 1 addition & 1 deletion spec/dummy/config/boot.rb
Original file line number Diff line number Diff line change
@@ -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.
23 changes: 23 additions & 0 deletions spec/dummy/config/database.tmpl.yml
Original file line number Diff line number Diff line change
@@ -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
85 changes: 0 additions & 85 deletions spec/dummy/config/database.yml

This file was deleted.

0 comments on commit b15f5f5

Please sign in to comment.