diff --git a/.rubocop.yml b/.rubocop.yml index 821adf02029..225bdac833a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -12,8 +12,10 @@ require: AllCops: Exclude: - 'bin/**/*' - - 'db/migrate/*' + - 'db/primary_migrate/*' - 'db/schema.rb' + - 'db/worker_jobs_migrate/*' + - 'db/worker_jobs_schema.rb' - 'lib/tasks/create_test_accounts.rb' - 'node_modules/**/*' - 'tmp/**/*' diff --git a/app/models/worker_job_application_record.rb b/app/models/worker_job_application_record.rb new file mode 100644 index 00000000000..9d797423691 --- /dev/null +++ b/app/models/worker_job_application_record.rb @@ -0,0 +1,7 @@ +# rubocop:disable Rails/ApplicationRecord +class WorkerJobApplicationRecord < ActiveRecord::Base + self.abstract_class = true + + connects_to database: { writing: :worker_jobs, reading: :worker_jobs } +end +# rubocop:enable Rails/ApplicationRecord diff --git a/config/application.yml.default b/config/application.yml.default index 36a0bf67a26..27db7e60545 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -228,6 +228,10 @@ development: database_readonly_password: '' database_readonly_username: '' database_username: '' + database_worker_jobs_name: '' + database_worker_jobs_username: '' + database_worker_jobs_host: '' + database_worker_jobs_password: '' doc_auth_vendor: 'mock' domain_name: localhost:3000 enable_rate_limiting: 'false' @@ -341,6 +345,10 @@ test: database_readonly_password: '' database_readonly_username: '' database_username: '' + database_worker_jobs_name: '' + database_worker_jobs_username: '' + database_worker_jobs_host: '' + database_worker_jobs_password: '' doc_auth_enable_presigned_s3_urls: 'true' doc_auth_vendor: 'mock' doc_capture_polling_enabled: 'false' diff --git a/config/database.yml b/config/database.yml index ace8021f68e..851b1b8bc92 100644 --- a/config/database.yml +++ b/config/database.yml @@ -24,9 +24,14 @@ defaults: &defaults development: primary: <<: *defaults + migrations_paths: db/primary_migrate read_replica: <<: *defaults replica: true + worker_jobs: + <<: *defaults + database: upaya_worker_jobs_<%= Rails.env %> + migrations_paths: db/worker_jobs_migrate test: primary: &test @@ -36,9 +41,14 @@ test: database: <%= ENV['POSTGRES_DB'] || "upaya_test#{ENV['TEST_ENV_NUMBER']}" %> user: <%= ENV['POSTGRES_USER'] %> password: <%= ENV['POSTGRES_PASSWORD'] %> + migrations_paths: db/primary_migrate read_replica: <<: *test replica: true + worker_jobs: + <<: *test + database: <%= "upaya_worker_jobs_test#{ENV['TEST_ENV_NUMBER']}" %> + migrations_paths: db/worker_jobs_migrate <% pool = if Identity::Hostdata.instance_role == 'worker' @@ -58,6 +68,7 @@ production: pool: <%= pool %> sslmode: 'verify-full' sslrootcert: '/usr/local/share/aws/rds-combined-ca-bundle.pem' + migrations_paths: db/primary_migrate read_replica: <<: *defaults database: <%= IdentityConfig.store.database_name %> @@ -68,3 +79,13 @@ production: sslmode: 'verify-full' sslrootcert: '/usr/local/share/aws/rds-combined-ca-bundle.pem' replica: true + worker_jobs: + <<: *defaults + database: <%= IdentityConfig.store.database_worker_jobs_name %> + username: <%= IdentityConfig.store.database_worker_jobs_username %> + host: <%= IdentityConfig.store.database_worker_jobs_host %> + password: <%= IdentityConfig.store.database_worker_jobs_password %> + pool: <%= pool %> + sslmode: 'verify-full' + sslrootcert: '/usr/local/share/aws/rds-combined-ca-bundle.pem' + migrations_paths: db/worker_jobs_migrate diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb index 3ff83014474..eedb4429c15 100644 --- a/config/initializers/good_job.rb +++ b/config/initializers/good_job.rb @@ -8,6 +8,7 @@ # see config/initializers/job_configurations.rb for cron schedule end + GoodJob.active_record_parent_class = 'WorkerJobApplicationRecord' GoodJob.retry_on_unhandled_error = false GoodJob.on_thread_error = ->(exception) { NewRelic::Agent.notice_error(exception) } end diff --git a/db/migrate/20161219225847_init_schema.rb b/db/primary_migrate/20161219225847_init_schema.rb similarity index 100% rename from db/migrate/20161219225847_init_schema.rb rename to db/primary_migrate/20161219225847_init_schema.rb diff --git a/db/migrate/20170111142846_add_nonce_to_identities.rb b/db/primary_migrate/20170111142846_add_nonce_to_identities.rb similarity index 100% rename from db/migrate/20170111142846_add_nonce_to_identities.rb rename to db/primary_migrate/20170111142846_add_nonce_to_identities.rb diff --git a/db/migrate/20170125153626_add_ial_to_identities_again.rb b/db/primary_migrate/20170125153626_add_ial_to_identities_again.rb similarity index 100% rename from db/migrate/20170125153626_add_ial_to_identities_again.rb rename to db/primary_migrate/20170125153626_add_ial_to_identities_again.rb diff --git a/db/migrate/20170127204804_add_access_token_to_identities.rb b/db/primary_migrate/20170127204804_add_access_token_to_identities.rb similarity index 100% rename from db/migrate/20170127204804_add_access_token_to_identities.rb rename to db/primary_migrate/20170127204804_add_access_token_to_identities.rb diff --git a/db/migrate/20170131172556_add_otp_delivery_preference_to_user.rb b/db/primary_migrate/20170131172556_add_otp_delivery_preference_to_user.rb similarity index 100% rename from db/migrate/20170131172556_add_otp_delivery_preference_to_user.rb rename to db/primary_migrate/20170131172556_add_otp_delivery_preference_to_user.rb diff --git a/db/migrate/20170201154458_add_scope_to_identities.rb b/db/primary_migrate/20170201154458_add_scope_to_identities.rb similarity index 100% rename from db/migrate/20170201154458_add_scope_to_identities.rb rename to db/primary_migrate/20170201154458_add_scope_to_identities.rb diff --git a/db/migrate/20170203150129_add_code_challenge_to_identities.rb b/db/primary_migrate/20170203150129_add_code_challenge_to_identities.rb similarity index 100% rename from db/migrate/20170203150129_add_code_challenge_to_identities.rb rename to db/primary_migrate/20170203150129_add_code_challenge_to_identities.rb diff --git a/db/migrate/20170207192356_remove_unused_encrypted_otp_secret_columns.rb b/db/primary_migrate/20170207192356_remove_unused_encrypted_otp_secret_columns.rb similarity index 100% rename from db/migrate/20170207192356_remove_unused_encrypted_otp_secret_columns.rb rename to db/primary_migrate/20170207192356_remove_unused_encrypted_otp_secret_columns.rb diff --git a/db/migrate/20170207192911_update_encrypted_otp_secret_key_length.rb b/db/primary_migrate/20170207192911_update_encrypted_otp_secret_key_length.rb similarity index 100% rename from db/migrate/20170207192911_update_encrypted_otp_secret_key_length.rb rename to db/primary_migrate/20170207192911_update_encrypted_otp_secret_key_length.rb diff --git a/db/migrate/20170215160237_add_rails_session_id_to_identities.rb b/db/primary_migrate/20170215160237_add_rails_session_id_to_identities.rb similarity index 100% rename from db/migrate/20170215160237_add_rails_session_id_to_identities.rb rename to db/primary_migrate/20170215160237_add_rails_session_id_to_identities.rb diff --git a/db/migrate/20170215175444_create_service_providers.rb b/db/primary_migrate/20170215175444_create_service_providers.rb similarity index 100% rename from db/migrate/20170215175444_create_service_providers.rb rename to db/primary_migrate/20170215175444_create_service_providers.rb diff --git a/db/migrate/20170222182714_add_native_to_service_provider.rb b/db/primary_migrate/20170222182714_add_native_to_service_provider.rb similarity index 100% rename from db/migrate/20170222182714_add_native_to_service_provider.rb rename to db/primary_migrate/20170222182714_add_native_to_service_provider.rb diff --git a/db/migrate/20170306214524_add_usps_confirmations.rb b/db/primary_migrate/20170306214524_add_usps_confirmations.rb similarity index 100% rename from db/migrate/20170306214524_add_usps_confirmations.rb rename to db/primary_migrate/20170306214524_add_usps_confirmations.rb diff --git a/db/migrate/20170321170516_create_service_provider_requests.rb b/db/primary_migrate/20170321170516_create_service_provider_requests.rb similarity index 100% rename from db/migrate/20170321170516_create_service_provider_requests.rb rename to db/primary_migrate/20170321170516_create_service_provider_requests.rb diff --git a/db/migrate/20170321170517_drop_plaintext_columns.rb b/db/primary_migrate/20170321170517_drop_plaintext_columns.rb similarity index 100% rename from db/migrate/20170321170517_drop_plaintext_columns.rb rename to db/primary_migrate/20170321170517_drop_plaintext_columns.rb diff --git a/db/migrate/20170413152832_add_profile_phone_confirmed.rb b/db/primary_migrate/20170413152832_add_profile_phone_confirmed.rb similarity index 100% rename from db/migrate/20170413152832_add_profile_phone_confirmed.rb rename to db/primary_migrate/20170413152832_add_profile_phone_confirmed.rb diff --git a/db/migrate/20170512214024_add_requested_attributes_to_service_provider_request.rb b/db/primary_migrate/20170512214024_add_requested_attributes_to_service_provider_request.rb similarity index 100% rename from db/migrate/20170512214024_add_requested_attributes_to_service_provider_request.rb rename to db/primary_migrate/20170512214024_add_requested_attributes_to_service_provider_request.rb diff --git a/db/migrate/20170531204549_add_multiple_redirect_uris_to_service_providers.rb b/db/primary_migrate/20170531204549_add_multiple_redirect_uris_to_service_providers.rb similarity index 100% rename from db/migrate/20170531204549_add_multiple_redirect_uris_to_service_providers.rb rename to db/primary_migrate/20170531204549_add_multiple_redirect_uris_to_service_providers.rb diff --git a/db/migrate/20170621202836_create_otp_requests_tracker.rb b/db/primary_migrate/20170621202836_create_otp_requests_tracker.rb similarity index 100% rename from db/migrate/20170621202836_create_otp_requests_tracker.rb rename to db/primary_migrate/20170621202836_create_otp_requests_tracker.rb diff --git a/db/migrate/20170626205402_remove_encrypted_phone_from_otp_requests_tracker.rb b/db/primary_migrate/20170626205402_remove_encrypted_phone_from_otp_requests_tracker.rb similarity index 100% rename from db/migrate/20170626205402_remove_encrypted_phone_from_otp_requests_tracker.rb rename to db/primary_migrate/20170626205402_remove_encrypted_phone_from_otp_requests_tracker.rb diff --git a/db/migrate/20170905144239_create_usps_confirmation_codes.rb b/db/primary_migrate/20170905144239_create_usps_confirmation_codes.rb similarity index 100% rename from db/migrate/20170905144239_create_usps_confirmation_codes.rb rename to db/primary_migrate/20170905144239_create_usps_confirmation_codes.rb diff --git a/db/migrate/20171016185939_drop_redirect_uri_from_service_providers.rb b/db/primary_migrate/20171016185939_drop_redirect_uri_from_service_providers.rb similarity index 100% rename from db/migrate/20171016185939_drop_redirect_uri_from_service_providers.rb rename to db/primary_migrate/20171016185939_drop_redirect_uri_from_service_providers.rb diff --git a/db/migrate/20171122194214_add_unique_index_to_identities_and_users.rb b/db/primary_migrate/20171122194214_add_unique_index_to_identities_and_users.rb similarity index 100% rename from db/migrate/20171122194214_add_unique_index_to_identities_and_users.rb rename to db/primary_migrate/20171122194214_add_unique_index_to_identities_and_users.rb diff --git a/db/migrate/20171129194911_remove_vendor_from_profile.rb b/db/primary_migrate/20171129194911_remove_vendor_from_profile.rb similarity index 100% rename from db/migrate/20171129194911_remove_vendor_from_profile.rb rename to db/primary_migrate/20171129194911_remove_vendor_from_profile.rb diff --git a/db/migrate/20171130190756_remove_app_setting.rb b/db/primary_migrate/20171130190756_remove_app_setting.rb similarity index 100% rename from db/migrate/20171130190756_remove_app_setting.rb rename to db/primary_migrate/20171130190756_remove_app_setting.rb diff --git a/db/migrate/20171219042656_add_totp_timestamp_to_users.rb b/db/primary_migrate/20171219042656_add_totp_timestamp_to_users.rb similarity index 100% rename from db/migrate/20171219042656_add_totp_timestamp_to_users.rb rename to db/primary_migrate/20171219042656_add_totp_timestamp_to_users.rb diff --git a/db/migrate/20180124123749_create_agencies.rb b/db/primary_migrate/20180124123749_create_agencies.rb similarity index 100% rename from db/migrate/20180124123749_create_agencies.rb rename to db/primary_migrate/20180124123749_create_agencies.rb diff --git a/db/migrate/20180124123836_create_agency_identities.rb b/db/primary_migrate/20180124123836_create_agency_identities.rb similarity index 100% rename from db/migrate/20180124123836_create_agency_identities.rb rename to db/primary_migrate/20180124123836_create_agency_identities.rb diff --git a/db/migrate/20180125101934_add_agency_id_to_service_providers.rb b/db/primary_migrate/20180125101934_add_agency_id_to_service_providers.rb similarity index 100% rename from db/migrate/20180125101934_add_agency_id_to_service_providers.rb rename to db/primary_migrate/20180125101934_add_agency_id_to_service_providers.rb diff --git a/db/migrate/20180125230905_change_totp_timestamp_to_integer.rb b/db/primary_migrate/20180125230905_change_totp_timestamp_to_integer.rb similarity index 100% rename from db/migrate/20180125230905_change_totp_timestamp_to_integer.rb rename to db/primary_migrate/20180125230905_change_totp_timestamp_to_integer.rb diff --git a/db/migrate/20180201161105_add_verified_attributes_to_identities.rb b/db/primary_migrate/20180201161105_add_verified_attributes_to_identities.rb similarity index 100% rename from db/migrate/20180201161105_add_verified_attributes_to_identities.rb rename to db/primary_migrate/20180201161105_add_verified_attributes_to_identities.rb diff --git a/db/migrate/20180409193120_add_x509_dn_uuid_to_users_table.rb b/db/primary_migrate/20180409193120_add_x509_dn_uuid_to_users_table.rb similarity index 100% rename from db/migrate/20180409193120_add_x509_dn_uuid_to_users_table.rb rename to db/primary_migrate/20180409193120_add_x509_dn_uuid_to_users_table.rb diff --git a/db/migrate/20180518153201_add_password_digest_to_user.rb b/db/primary_migrate/20180518153201_add_password_digest_to_user.rb similarity index 100% rename from db/migrate/20180518153201_add_password_digest_to_user.rb rename to db/primary_migrate/20180518153201_add_password_digest_to_user.rb diff --git a/db/migrate/20180521155700_change_password_digest_to_encrypted_password_digest.rb b/db/primary_migrate/20180521155700_change_password_digest_to_encrypted_password_digest.rb similarity index 100% rename from db/migrate/20180521155700_change_password_digest_to_encrypted_password_digest.rb rename to db/primary_migrate/20180521155700_change_password_digest_to_encrypted_password_digest.rb diff --git a/db/migrate/20180601145643_add_encrypted_recovery_code_digest_to_user.rb b/db/primary_migrate/20180601145643_add_encrypted_recovery_code_digest_to_user.rb similarity index 100% rename from db/migrate/20180601145643_add_encrypted_recovery_code_digest_to_user.rb rename to db/primary_migrate/20180601145643_add_encrypted_recovery_code_digest_to_user.rb diff --git a/db/migrate/20180607144007_create_remote_settings.rb b/db/primary_migrate/20180607144007_create_remote_settings.rb similarity index 100% rename from db/migrate/20180607144007_create_remote_settings.rb rename to db/primary_migrate/20180607144007_create_remote_settings.rb diff --git a/db/migrate/20180619145839_create_password_metrics.rb b/db/primary_migrate/20180619145839_create_password_metrics.rb similarity index 100% rename from db/migrate/20180619145839_create_password_metrics.rb rename to db/primary_migrate/20180619145839_create_password_metrics.rb diff --git a/db/migrate/20180620233914_create_account_reset_requests.rb b/db/primary_migrate/20180620233914_create_account_reset_requests.rb similarity index 100% rename from db/migrate/20180620233914_create_account_reset_requests.rb rename to db/primary_migrate/20180620233914_create_account_reset_requests.rb diff --git a/db/migrate/20180709141748_drop_encrypted_password_column_from_user.rb b/db/primary_migrate/20180709141748_drop_encrypted_password_column_from_user.rb similarity index 100% rename from db/migrate/20180709141748_drop_encrypted_password_column_from_user.rb rename to db/primary_migrate/20180709141748_drop_encrypted_password_column_from_user.rb diff --git a/db/migrate/20180720152009_create_phone_configurations_table.rb b/db/primary_migrate/20180720152009_create_phone_configurations_table.rb similarity index 100% rename from db/migrate/20180720152009_create_phone_configurations_table.rb rename to db/primary_migrate/20180720152009_create_phone_configurations_table.rb diff --git a/db/migrate/20180723091143_add_phone_confirmed_to_otp_requests_tracker.rb b/db/primary_migrate/20180723091143_add_phone_confirmed_to_otp_requests_tracker.rb similarity index 100% rename from db/migrate/20180723091143_add_phone_confirmed_to_otp_requests_tracker.rb rename to db/primary_migrate/20180723091143_add_phone_confirmed_to_otp_requests_tracker.rb diff --git a/db/migrate/20180724154947_drop_personal_key_columns_from_user.rb b/db/primary_migrate/20180724154947_drop_personal_key_columns_from_user.rb similarity index 100% rename from db/migrate/20180724154947_drop_personal_key_columns_from_user.rb rename to db/primary_migrate/20180724154947_drop_personal_key_columns_from_user.rb diff --git a/db/migrate/20180728122856_add_failure_to_proof_url_to_service_provider.rb b/db/primary_migrate/20180728122856_add_failure_to_proof_url_to_service_provider.rb similarity index 100% rename from db/migrate/20180728122856_add_failure_to_proof_url_to_service_provider.rb rename to db/primary_migrate/20180728122856_add_failure_to_proof_url_to_service_provider.rb diff --git a/db/migrate/20180805121236_create_doc_auths.rb b/db/primary_migrate/20180805121236_create_doc_auths.rb similarity index 100% rename from db/migrate/20180805121236_create_doc_auths.rb rename to db/primary_migrate/20180805121236_create_doc_auths.rb diff --git a/db/migrate/20180827225542_create_webauthn_configurations_table.rb b/db/primary_migrate/20180827225542_create_webauthn_configurations_table.rb similarity index 100% rename from db/migrate/20180827225542_create_webauthn_configurations_table.rb rename to db/primary_migrate/20180827225542_create_webauthn_configurations_table.rb diff --git a/db/migrate/20180906181420_create_email_address_table.rb b/db/primary_migrate/20180906181420_create_email_address_table.rb similarity index 100% rename from db/migrate/20180906181420_create_email_address_table.rb rename to db/primary_migrate/20180906181420_create_email_address_table.rb diff --git a/db/migrate/20181011152323_add_email_fingerprint_index.rb b/db/primary_migrate/20181011152323_add_email_fingerprint_index.rb similarity index 100% rename from db/migrate/20181011152323_add_email_fingerprint_index.rb rename to db/primary_migrate/20181011152323_add_email_fingerprint_index.rb diff --git a/db/migrate/20181015153200_add_remember_device_revoked_at_to_user.rb b/db/primary_migrate/20181015153200_add_remember_device_revoked_at_to_user.rb similarity index 100% rename from db/migrate/20181015153200_add_remember_device_revoked_at_to_user.rb rename to db/primary_migrate/20181015153200_add_remember_device_revoked_at_to_user.rb diff --git a/db/migrate/20181029203754_add_aal_and_ial_to_service_provider.rb b/db/primary_migrate/20181029203754_add_aal_and_ial_to_service_provider.rb similarity index 100% rename from db/migrate/20181029203754_add_aal_and_ial_to_service_provider.rb rename to db/primary_migrate/20181029203754_add_aal_and_ial_to_service_provider.rb diff --git a/db/migrate/20181114213758_create_backup_code_configurations.rb b/db/primary_migrate/20181114213758_create_backup_code_configurations.rb similarity index 100% rename from db/migrate/20181114213758_create_backup_code_configurations.rb rename to db/primary_migrate/20181114213758_create_backup_code_configurations.rb diff --git a/db/migrate/20181121223714_add_piv_cac_to_service_provider.rb b/db/primary_migrate/20181121223714_add_piv_cac_to_service_provider.rb similarity index 100% rename from db/migrate/20181121223714_add_piv_cac_to_service_provider.rb rename to db/primary_migrate/20181121223714_add_piv_cac_to_service_provider.rb diff --git a/db/migrate/20181122100307_add_bounced_at_to_usps_confirmation_code.rb b/db/primary_migrate/20181122100307_add_bounced_at_to_usps_confirmation_code.rb similarity index 100% rename from db/migrate/20181122100307_add_bounced_at_to_usps_confirmation_code.rb rename to db/primary_migrate/20181122100307_add_bounced_at_to_usps_confirmation_code.rb diff --git a/db/migrate/20190110145734_add_pkce_to_service_provider.rb b/db/primary_migrate/20190110145734_add_pkce_to_service_provider.rb similarity index 100% rename from db/migrate/20190110145734_add_pkce_to_service_provider.rb rename to db/primary_migrate/20190110145734_add_pkce_to_service_provider.rb diff --git a/db/migrate/20190111231134_create_devices.rb b/db/primary_migrate/20190111231134_create_devices.rb similarity index 100% rename from db/migrate/20190111231134_create_devices.rb rename to db/primary_migrate/20190111231134_create_devices.rb diff --git a/db/migrate/20190126105161_create_doc_captures.rb b/db/primary_migrate/20190126105161_create_doc_captures.rb similarity index 100% rename from db/migrate/20190126105161_create_doc_captures.rb rename to db/primary_migrate/20190126105161_create_doc_captures.rb diff --git a/db/migrate/20190212163140_drop_password_metrics.rb b/db/primary_migrate/20190212163140_drop_password_metrics.rb similarity index 100% rename from db/migrate/20190212163140_drop_password_metrics.rb rename to db/primary_migrate/20190212163140_drop_password_metrics.rb diff --git a/db/migrate/20190225005651_add_expired_to_usps_confirmation_codes.rb b/db/primary_migrate/20190225005651_add_expired_to_usps_confirmation_codes.rb similarity index 100% rename from db/migrate/20190225005651_add_expired_to_usps_confirmation_codes.rb rename to db/primary_migrate/20190225005651_add_expired_to_usps_confirmation_codes.rb diff --git a/db/migrate/20190306114813_create_account_recovery_requests.rb b/db/primary_migrate/20190306114813_create_account_recovery_requests.rb similarity index 100% rename from db/migrate/20190306114813_create_account_recovery_requests.rb rename to db/primary_migrate/20190306114813_create_account_recovery_requests.rb diff --git a/db/migrate/20190306143757_add_disavowal_token_fingerprint_to_events.rb b/db/primary_migrate/20190306143757_add_disavowal_token_fingerprint_to_events.rb similarity index 100% rename from db/migrate/20190306143757_add_disavowal_token_fingerprint_to_events.rb rename to db/primary_migrate/20190306143757_add_disavowal_token_fingerprint_to_events.rb diff --git a/db/migrate/20190407103634_create_throttles.rb b/db/primary_migrate/20190407103634_create_throttles.rb similarity index 100% rename from db/migrate/20190407103634_create_throttles.rb rename to db/primary_migrate/20190407103634_create_throttles.rb diff --git a/db/migrate/20190422200501_add_made_default_at_to_phone_configurations.rb b/db/primary_migrate/20190422200501_add_made_default_at_to_phone_configurations.rb similarity index 100% rename from db/migrate/20190422200501_add_made_default_at_to_phone_configurations.rb rename to db/primary_migrate/20190422200501_add_made_default_at_to_phone_configurations.rb diff --git a/db/migrate/20190502143706_create_job_runs.rb b/db/primary_migrate/20190502143706_create_job_runs.rb similarity index 100% rename from db/migrate/20190502143706_create_job_runs.rb rename to db/primary_migrate/20190502143706_create_job_runs.rb diff --git a/db/migrate/20190503155016_add_made_default_at_index_to_phone_configurations.rb b/db/primary_migrate/20190503155016_add_made_default_at_index_to_phone_configurations.rb similarity index 100% rename from db/migrate/20190503155016_add_made_default_at_index_to_phone_configurations.rb rename to db/primary_migrate/20190503155016_add_made_default_at_index_to_phone_configurations.rb diff --git a/db/migrate/20190506152241_create_push_account_deletes.rb b/db/primary_migrate/20190506152241_create_push_account_deletes.rb similarity index 100% rename from db/migrate/20190506152241_create_push_account_deletes.rb rename to db/primary_migrate/20190506152241_create_push_account_deletes.rb diff --git a/db/migrate/20190509144212_add_push_notification_url_to_service_provider.rb b/db/primary_migrate/20190509144212_add_push_notification_url_to_service_provider.rb similarity index 100% rename from db/migrate/20190509144212_add_push_notification_url_to_service_provider.rb rename to db/primary_migrate/20190509144212_add_push_notification_url_to_service_provider.rb diff --git a/db/migrate/20190510202639_add_last_signed_in_at_to_email_addresses.rb b/db/primary_migrate/20190510202639_add_last_signed_in_at_to_email_addresses.rb similarity index 100% rename from db/migrate/20190510202639_add_last_signed_in_at_to_email_addresses.rb rename to db/primary_migrate/20190510202639_add_last_signed_in_at_to_email_addresses.rb diff --git a/db/migrate/20190510202920_drop_role_from_user.rb b/db/primary_migrate/20190510202920_drop_role_from_user.rb similarity index 100% rename from db/migrate/20190510202920_drop_role_from_user.rb rename to db/primary_migrate/20190510202920_drop_role_from_user.rb diff --git a/db/migrate/20190524205306_add_index_to_backup_code_configuration.rb b/db/primary_migrate/20190524205306_add_index_to_backup_code_configuration.rb similarity index 100% rename from db/migrate/20190524205306_add_index_to_backup_code_configuration.rb rename to db/primary_migrate/20190524205306_add_index_to_backup_code_configuration.rb diff --git a/db/migrate/20190529120309_fix_backup_code_configuration_index.rb b/db/primary_migrate/20190529120309_fix_backup_code_configuration_index.rb similarity index 100% rename from db/migrate/20190529120309_fix_backup_code_configuration_index.rb rename to db/primary_migrate/20190529120309_fix_backup_code_configuration_index.rb diff --git a/db/migrate/20190604110233_fix_phone_configuration_index.rb b/db/primary_migrate/20190604110233_fix_phone_configuration_index.rb similarity index 100% rename from db/migrate/20190604110233_fix_phone_configuration_index.rb rename to db/primary_migrate/20190604110233_fix_phone_configuration_index.rb diff --git a/db/migrate/20190620204206_add_confirmation_token_index_to_email_address.rb b/db/primary_migrate/20190620204206_add_confirmation_token_index_to_email_address.rb similarity index 100% rename from db/migrate/20190620204206_add_confirmation_token_index_to_email_address.rb rename to db/primary_migrate/20190620204206_add_confirmation_token_index_to_email_address.rb diff --git a/db/migrate/20190720132736_create_registration_logs.rb b/db/primary_migrate/20190720132736_create_registration_logs.rb similarity index 100% rename from db/migrate/20190720132736_create_registration_logs.rb rename to db/primary_migrate/20190720132736_create_registration_logs.rb diff --git a/db/migrate/20190725211433_drop_email_fingerprint_index.rb b/db/primary_migrate/20190725211433_drop_email_fingerprint_index.rb similarity index 100% rename from db/migrate/20190725211433_drop_email_fingerprint_index.rb rename to db/primary_migrate/20190725211433_drop_email_fingerprint_index.rb diff --git a/db/migrate/20190805215030_create_monthly_auth_counts.rb b/db/primary_migrate/20190805215030_create_monthly_auth_counts.rb similarity index 100% rename from db/migrate/20190805215030_create_monthly_auth_counts.rb rename to db/primary_migrate/20190805215030_create_monthly_auth_counts.rb diff --git a/db/migrate/20190826141526_add_throttled_count_to_throttles.rb b/db/primary_migrate/20190826141526_add_throttled_count_to_throttles.rb similarity index 100% rename from db/migrate/20190826141526_add_throttled_count_to_throttles.rb rename to db/primary_migrate/20190826141526_add_throttled_count_to_throttles.rb diff --git a/db/migrate/20190830220344_create_doc_auth_logs.rb b/db/primary_migrate/20190830220344_create_doc_auth_logs.rb similarity index 100% rename from db/migrate/20190830220344_create_doc_auth_logs.rb rename to db/primary_migrate/20190830220344_create_doc_auth_logs.rb diff --git a/db/migrate/20190907063344_create_proofing_costs.rb b/db/primary_migrate/20190907063344_create_proofing_costs.rb similarity index 100% rename from db/migrate/20190907063344_create_proofing_costs.rb rename to db/primary_migrate/20190907063344_create_proofing_costs.rb diff --git a/db/migrate/20190914191524_create_sp_return_logs.rb b/db/primary_migrate/20190914191524_create_sp_return_logs.rb similarity index 100% rename from db/migrate/20190914191524_create_sp_return_logs.rb rename to db/primary_migrate/20190914191524_create_sp_return_logs.rb diff --git a/db/migrate/20190920104246_create_proofing_components.rb b/db/primary_migrate/20190920104246_create_proofing_components.rb similarity index 100% rename from db/migrate/20190920104246_create_proofing_components.rb rename to db/primary_migrate/20190920104246_create_proofing_components.rb diff --git a/db/migrate/20190920122649_add_proofing_components_to_profiles.rb b/db/primary_migrate/20190920122649_add_proofing_components_to_profiles.rb similarity index 100% rename from db/migrate/20190920122649_add_proofing_components_to_profiles.rb rename to db/primary_migrate/20190920122649_add_proofing_components_to_profiles.rb diff --git a/db/migrate/20190922124029_add_misc_to_doc_auth_logs.rb b/db/primary_migrate/20190922124029_add_misc_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20190922124029_add_misc_to_doc_auth_logs.rb rename to db/primary_migrate/20190922124029_add_misc_to_doc_auth_logs.rb diff --git a/db/migrate/20190924133911_add_usps_letter_submit_to_doc_auth_logs.rb b/db/primary_migrate/20190924133911_add_usps_letter_submit_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20190924133911_add_usps_letter_submit_to_doc_auth_logs.rb rename to db/primary_migrate/20190924133911_add_usps_letter_submit_to_doc_auth_logs.rb diff --git a/db/migrate/20190924180727_add_help_text_to_service_providers.rb b/db/primary_migrate/20190924180727_add_help_text_to_service_providers.rb similarity index 100% rename from db/migrate/20190924180727_add_help_text_to_service_providers.rb rename to db/primary_migrate/20190924180727_add_help_text_to_service_providers.rb diff --git a/db/migrate/20191015123431_add_hybrid_steps_to_doc_auth_logs.rb b/db/primary_migrate/20191015123431_add_hybrid_steps_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20191015123431_add_hybrid_steps_to_doc_auth_logs.rb rename to db/primary_migrate/20191015123431_add_hybrid_steps_to_doc_auth_logs.rb diff --git a/db/migrate/20191022134041_add_uniqueness_constraint_to_unconfirmed_emails.rb b/db/primary_migrate/20191022134041_add_uniqueness_constraint_to_unconfirmed_emails.rb similarity index 100% rename from db/migrate/20191022134041_add_uniqueness_constraint_to_unconfirmed_emails.rb rename to db/primary_migrate/20191022134041_add_uniqueness_constraint_to_unconfirmed_emails.rb diff --git a/db/migrate/20191110211632_create_piv_cac_configurations.rb b/db/primary_migrate/20191110211632_create_piv_cac_configurations.rb similarity index 100% rename from db/migrate/20191110211632_create_piv_cac_configurations.rb rename to db/primary_migrate/20191110211632_create_piv_cac_configurations.rb diff --git a/db/migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb b/db/primary_migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb similarity index 100% rename from db/migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb rename to db/primary_migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb diff --git a/db/migrate/20191229204109_create_auth_app_configurations.rb b/db/primary_migrate/20191229204109_create_auth_app_configurations.rb similarity index 100% rename from db/migrate/20191229204109_create_auth_app_configurations.rb rename to db/primary_migrate/20191229204109_create_auth_app_configurations.rb diff --git a/db/migrate/20200103170411_add_allow_prompt_login_to_service_providers.rb b/db/primary_migrate/20200103170411_add_allow_prompt_login_to_service_providers.rb similarity index 100% rename from db/migrate/20200103170411_add_allow_prompt_login_to_service_providers.rb rename to db/primary_migrate/20200103170411_add_allow_prompt_login_to_service_providers.rb diff --git a/db/migrate/20200109065722_create_sp_costs.rb b/db/primary_migrate/20200109065722_create_sp_costs.rb similarity index 100% rename from db/migrate/20200109065722_create_sp_costs.rb rename to db/primary_migrate/20200109065722_create_sp_costs.rb diff --git a/db/migrate/20200115142141_add_ial_to_sp_costs.rb b/db/primary_migrate/20200115142141_add_ial_to_sp_costs.rb similarity index 100% rename from db/migrate/20200115142141_add_ial_to_sp_costs.rb rename to db/primary_migrate/20200115142141_add_ial_to_sp_costs.rb diff --git a/db/migrate/20200210235313_drop_service_provider_requests.rb b/db/primary_migrate/20200210235313_drop_service_provider_requests.rb similarity index 100% rename from db/migrate/20200210235313_drop_service_provider_requests.rb rename to db/primary_migrate/20200210235313_drop_service_provider_requests.rb diff --git a/db/migrate/20200220230641_add_ial2_quota_to_service_providers.rb b/db/primary_migrate/20200220230641_add_ial2_quota_to_service_providers.rb similarity index 100% rename from db/migrate/20200220230641_add_ial2_quota_to_service_providers.rb rename to db/primary_migrate/20200220230641_add_ial2_quota_to_service_providers.rb diff --git a/db/migrate/20200220235113_add_verified_at_to_identities.rb b/db/primary_migrate/20200220235113_add_verified_at_to_identities.rb similarity index 100% rename from db/migrate/20200220235113_add_verified_at_to_identities.rb rename to db/primary_migrate/20200220235113_add_verified_at_to_identities.rb diff --git a/db/migrate/20200221215702_add_signed_response_message_requested_to_service_provider.rb b/db/primary_migrate/20200221215702_add_signed_response_message_requested_to_service_provider.rb similarity index 100% rename from db/migrate/20200221215702_add_signed_response_message_requested_to_service_provider.rb rename to db/primary_migrate/20200221215702_add_signed_response_message_requested_to_service_provider.rb diff --git a/db/migrate/20200303202931_add_last_consented_at_to_identities.rb b/db/primary_migrate/20200303202931_add_last_consented_at_to_identities.rb similarity index 100% rename from db/migrate/20200303202931_add_last_consented_at_to_identities.rb rename to db/primary_migrate/20200303202931_add_last_consented_at_to_identities.rb diff --git a/db/migrate/20200305201944_add_ial_at_to_identities.rb b/db/primary_migrate/20200305201944_add_ial_at_to_identities.rb similarity index 100% rename from db/migrate/20200305201944_add_ial_at_to_identities.rb rename to db/primary_migrate/20200305201944_add_ial_at_to_identities.rb diff --git a/db/migrate/20200312110645_create_monthly_sp_auth_counts.rb b/db/primary_migrate/20200312110645_create_monthly_sp_auth_counts.rb similarity index 100% rename from db/migrate/20200312110645_create_monthly_sp_auth_counts.rb rename to db/primary_migrate/20200312110645_create_monthly_sp_auth_counts.rb diff --git a/db/migrate/20200319233723_add_deleted_at_to_identities.rb b/db/primary_migrate/20200319233723_add_deleted_at_to_identities.rb similarity index 100% rename from db/migrate/20200319233723_add_deleted_at_to_identities.rb rename to db/primary_migrate/20200319233723_add_deleted_at_to_identities.rb diff --git a/db/migrate/20200321210321_drop_ssn_uniqueness_constraint.rb b/db/primary_migrate/20200321210321_drop_ssn_uniqueness_constraint.rb similarity index 100% rename from db/migrate/20200321210321_drop_ssn_uniqueness_constraint.rb rename to db/primary_migrate/20200321210321_drop_ssn_uniqueness_constraint.rb diff --git a/db/migrate/20200326160855_create_pii_fingerprint.rb b/db/primary_migrate/20200326160855_create_pii_fingerprint.rb similarity index 100% rename from db/migrate/20200326160855_create_pii_fingerprint.rb rename to db/primary_migrate/20200326160855_create_pii_fingerprint.rb diff --git a/db/migrate/20200405233913_add_no_sp_tracking_to_doc_auth_logs.rb b/db/primary_migrate/20200405233913_add_no_sp_tracking_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20200405233913_add_no_sp_tracking_to_doc_auth_logs.rb rename to db/primary_migrate/20200405233913_add_no_sp_tracking_to_doc_auth_logs.rb diff --git a/db/migrate/20200408213043_add_liveness_check_to_proofing_components.rb b/db/primary_migrate/20200408213043_add_liveness_check_to_proofing_components.rb similarity index 100% rename from db/migrate/20200408213043_add_liveness_check_to_proofing_components.rb rename to db/primary_migrate/20200408213043_add_liveness_check_to_proofing_components.rb diff --git a/db/migrate/20200409075651_add_liveness_checking_required_to_service_providers.rb b/db/primary_migrate/20200409075651_add_liveness_checking_required_to_service_providers.rb similarity index 100% rename from db/migrate/20200409075651_add_liveness_checking_required_to_service_providers.rb rename to db/primary_migrate/20200409075651_add_liveness_checking_required_to_service_providers.rb diff --git a/db/migrate/20200416154923_add_logo_key_to_service_provider.rb b/db/primary_migrate/20200416154923_add_logo_key_to_service_provider.rb similarity index 100% rename from db/migrate/20200416154923_add_logo_key_to_service_provider.rb rename to db/primary_migrate/20200416154923_add_logo_key_to_service_provider.rb diff --git a/db/migrate/20200421124317_create_service_provider_quota_limits.rb b/db/primary_migrate/20200421124317_create_service_provider_quota_limits.rb similarity index 100% rename from db/migrate/20200421124317_create_service_provider_quota_limits.rb rename to db/primary_migrate/20200421124317_create_service_provider_quota_limits.rb diff --git a/db/migrate/20200508192702_add_deal_data_to_service_providers.rb b/db/primary_migrate/20200508192702_add_deal_data_to_service_providers.rb similarity index 100% rename from db/migrate/20200508192702_add_deal_data_to_service_providers.rb rename to db/primary_migrate/20200508192702_add_deal_data_to_service_providers.rb diff --git a/db/migrate/20200530185607_add_proofing_with_cac_steps_to_doc_auth_logs.rb b/db/primary_migrate/20200530185607_add_proofing_with_cac_steps_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20200530185607_add_proofing_with_cac_steps_to_doc_auth_logs.rb rename to db/primary_migrate/20200530185607_add_proofing_with_cac_steps_to_doc_auth_logs.rb diff --git a/db/migrate/20200601215509_create_deleted_users.rb b/db/primary_migrate/20200601215509_create_deleted_users.rb similarity index 100% rename from db/migrate/20200601215509_create_deleted_users.rb rename to db/primary_migrate/20200601215509_create_deleted_users.rb diff --git a/db/migrate/20200601235647_add_liveness_steps_to_doc_auth_logs.rb b/db/primary_migrate/20200601235647_add_liveness_steps_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20200601235647_add_liveness_steps_to_doc_auth_logs.rb rename to db/primary_migrate/20200601235647_add_liveness_steps_to_doc_auth_logs.rb diff --git a/db/migrate/20200619121722_add_app_id_to_service_providers.rb b/db/primary_migrate/20200619121722_add_app_id_to_service_providers.rb similarity index 100% rename from db/migrate/20200619121722_add_app_id_to_service_providers.rb rename to db/primary_migrate/20200619121722_add_app_id_to_service_providers.rb diff --git a/db/migrate/20200629132954_add_issuer_to_doc_auth_logs.rb b/db/primary_migrate/20200629132954_add_issuer_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20200629132954_add_issuer_to_doc_auth_logs.rb rename to db/primary_migrate/20200629132954_add_issuer_to_doc_auth_logs.rb diff --git a/db/migrate/20200721204303_create_security_events.rb b/db/primary_migrate/20200721204303_create_security_events.rb similarity index 100% rename from db/migrate/20200721204303_create_security_events.rb rename to db/primary_migrate/20200721204303_create_security_events.rb diff --git a/db/migrate/20200721220357_remove_user_id_index_from_email_address.rb b/db/primary_migrate/20200721220357_remove_user_id_index_from_email_address.rb similarity index 100% rename from db/migrate/20200721220357_remove_user_id_index_from_email_address.rb rename to db/primary_migrate/20200721220357_remove_user_id_index_from_email_address.rb diff --git a/db/migrate/20200723214611_add_unique_indexes_to_security_events.rb b/db/primary_migrate/20200723214611_add_unique_indexes_to_security_events.rb similarity index 100% rename from db/migrate/20200723214611_add_unique_indexes_to_security_events.rb rename to db/primary_migrate/20200723214611_add_unique_indexes_to_security_events.rb diff --git a/db/migrate/20200803211123_add_acuant_result_to_proofing_costs.rb b/db/primary_migrate/20200803211123_add_acuant_result_to_proofing_costs.rb similarity index 100% rename from db/migrate/20200803211123_add_acuant_result_to_proofing_costs.rb rename to db/primary_migrate/20200803211123_add_acuant_result_to_proofing_costs.rb diff --git a/db/migrate/20200803211145_backfill_add_acuant_result_to_proofing_costs.rb b/db/primary_migrate/20200803211145_backfill_add_acuant_result_to_proofing_costs.rb similarity index 100% rename from db/migrate/20200803211145_backfill_add_acuant_result_to_proofing_costs.rb rename to db/primary_migrate/20200803211145_backfill_add_acuant_result_to_proofing_costs.rb diff --git a/db/migrate/20200811144552_create_document_capture_sessions.rb b/db/primary_migrate/20200811144552_create_document_capture_sessions.rb similarity index 100% rename from db/migrate/20200811144552_create_document_capture_sessions.rb rename to db/primary_migrate/20200811144552_create_document_capture_sessions.rb diff --git a/db/migrate/20200814144213_add_last_document_error_to_doc_auth_logs.rb b/db/primary_migrate/20200814144213_add_last_document_error_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20200814144213_add_last_document_error_to_doc_auth_logs.rb rename to db/primary_migrate/20200814144213_add_last_document_error_to_doc_auth_logs.rb diff --git a/db/migrate/20200821173230_add_occurred_at_to_security_events.rb b/db/primary_migrate/20200821173230_add_occurred_at_to_security_events.rb similarity index 100% rename from db/migrate/20200821173230_add_occurred_at_to_security_events.rb rename to db/primary_migrate/20200821173230_add_occurred_at_to_security_events.rb diff --git a/db/migrate/20200828162147_remove_redundant_indices.rb b/db/primary_migrate/20200828162147_remove_redundant_indices.rb similarity index 100% rename from db/migrate/20200828162147_remove_redundant_indices.rb rename to db/primary_migrate/20200828162147_remove_redundant_indices.rb diff --git a/db/migrate/20200901134021_add_requested_at_to_document_capture_session.rb b/db/primary_migrate/20200901134021_add_requested_at_to_document_capture_session.rb similarity index 100% rename from db/migrate/20200901134021_add_requested_at_to_document_capture_session.rb rename to db/primary_migrate/20200901134021_add_requested_at_to_document_capture_session.rb diff --git a/db/migrate/20200909135409_add_x509_issuer_to_piv_cac_configurations.rb b/db/primary_migrate/20200909135409_add_x509_issuer_to_piv_cac_configurations.rb similarity index 100% rename from db/migrate/20200909135409_add_x509_issuer_to_piv_cac_configurations.rb rename to db/primary_migrate/20200909135409_add_x509_issuer_to_piv_cac_configurations.rb diff --git a/db/migrate/20200918154850_add_liveness_enabled_fields_to_document_capture_sessions.rb b/db/primary_migrate/20200918154850_add_liveness_enabled_fields_to_document_capture_sessions.rb similarity index 100% rename from db/migrate/20200918154850_add_liveness_enabled_fields_to_document_capture_sessions.rb rename to db/primary_migrate/20200918154850_add_liveness_enabled_fields_to_document_capture_sessions.rb diff --git a/db/migrate/20200922144112_add_liveness_enabled_fields_to_doc_captures.rb b/db/primary_migrate/20200922144112_add_liveness_enabled_fields_to_doc_captures.rb similarity index 100% rename from db/migrate/20200922144112_add_liveness_enabled_fields_to_doc_captures.rb rename to db/primary_migrate/20200922144112_add_liveness_enabled_fields_to_doc_captures.rb diff --git a/db/migrate/20200924144755_add_acuant_selfie_to_proofing_costs.rb b/db/primary_migrate/20200924144755_add_acuant_selfie_to_proofing_costs.rb similarity index 100% rename from db/migrate/20200924144755_add_acuant_selfie_to_proofing_costs.rb rename to db/primary_migrate/20200924144755_add_acuant_selfie_to_proofing_costs.rb diff --git a/db/migrate/20201029192324_add_email_language_to_users.rb b/db/primary_migrate/20201029192324_add_email_language_to_users.rb similarity index 100% rename from db/migrate/20201029192324_add_email_language_to_users.rb rename to db/primary_migrate/20201029192324_add_email_language_to_users.rb diff --git a/db/migrate/20201102150543_drop_doc_success_view_from_doc_auth_logs.rb b/db/primary_migrate/20201102150543_drop_doc_success_view_from_doc_auth_logs.rb similarity index 100% rename from db/migrate/20201102150543_drop_doc_success_view_from_doc_auth_logs.rb rename to db/primary_migrate/20201102150543_drop_doc_success_view_from_doc_auth_logs.rb diff --git a/db/migrate/20201118115231_add_document_capture_step_to_doc_auth_logs.rb b/db/primary_migrate/20201118115231_add_document_capture_step_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20201118115231_add_document_capture_step_to_doc_auth_logs.rb rename to db/primary_migrate/20201118115231_add_document_capture_step_to_doc_auth_logs.rb diff --git a/db/migrate/20201207191837_document_capture_sessions_result_id_index.rb b/db/primary_migrate/20201207191837_document_capture_sessions_result_id_index.rb similarity index 100% rename from db/migrate/20201207191837_document_capture_sessions_result_id_index.rb rename to db/primary_migrate/20201207191837_document_capture_sessions_result_id_index.rb diff --git a/db/migrate/20201218142021_drop_doc_capture.rb b/db/primary_migrate/20201218142021_drop_doc_capture.rb similarity index 100% rename from db/migrate/20201218142021_drop_doc_capture.rb rename to db/primary_migrate/20201218142021_drop_doc_capture.rb diff --git a/db/migrate/20210120220857_add_default_aal_to_service_provider.rb b/db/primary_migrate/20210120220857_add_default_aal_to_service_provider.rb similarity index 100% rename from db/migrate/20210120220857_add_default_aal_to_service_provider.rb rename to db/primary_migrate/20210120220857_add_default_aal_to_service_provider.rb diff --git a/db/migrate/20210126181906_remove_aal_from_service_providers.rb b/db/primary_migrate/20210126181906_remove_aal_from_service_providers.rb similarity index 100% rename from db/migrate/20210126181906_remove_aal_from_service_providers.rb rename to db/primary_migrate/20210126181906_remove_aal_from_service_providers.rb diff --git a/db/migrate/20210129150956_drop_remote_settings.rb b/db/primary_migrate/20210129150956_drop_remote_settings.rb similarity index 100% rename from db/migrate/20210129150956_drop_remote_settings.rb rename to db/primary_migrate/20210129150956_drop_remote_settings.rb diff --git a/db/migrate/20210203002937_add_partnerships_data.rb b/db/primary_migrate/20210203002937_add_partnerships_data.rb similarity index 100% rename from db/migrate/20210203002937_add_partnerships_data.rb rename to db/primary_migrate/20210203002937_add_partnerships_data.rb diff --git a/db/migrate/20210218185311_remove_user_id_index_from_events.rb b/db/primary_migrate/20210218185311_remove_user_id_index_from_events.rb similarity index 100% rename from db/migrate/20210218185311_remove_user_id_index_from_events.rb rename to db/primary_migrate/20210218185311_remove_user_id_index_from_events.rb diff --git a/db/migrate/20210223011217_add_uniqueness_to_agency_abbreviation.rb b/db/primary_migrate/20210223011217_add_uniqueness_to_agency_abbreviation.rb similarity index 100% rename from db/migrate/20210223011217_add_uniqueness_to_agency_abbreviation.rb rename to db/primary_migrate/20210223011217_add_uniqueness_to_agency_abbreviation.rb diff --git a/db/migrate/20210223232534_add_transaction_id_to_sp_costs.rb b/db/primary_migrate/20210223232534_add_transaction_id_to_sp_costs.rb similarity index 100% rename from db/migrate/20210223232534_add_transaction_id_to_sp_costs.rb rename to db/primary_migrate/20210223232534_add_transaction_id_to_sp_costs.rb diff --git a/db/migrate/202102245131_letter_requests_to_usps_ftp_logs.rb b/db/primary_migrate/202102245131_letter_requests_to_usps_ftp_logs.rb similarity index 100% rename from db/migrate/202102245131_letter_requests_to_usps_ftp_logs.rb rename to db/primary_migrate/202102245131_letter_requests_to_usps_ftp_logs.rb diff --git a/db/migrate/20210302110431_add_cancelled_at_to_document_capture_sessions.rb b/db/primary_migrate/20210302110431_add_cancelled_at_to_document_capture_sessions.rb similarity index 100% rename from db/migrate/20210302110431_add_cancelled_at_to_document_capture_sessions.rb rename to db/primary_migrate/20210302110431_add_cancelled_at_to_document_capture_sessions.rb diff --git a/db/migrate/20210302144414_drop_authorizations_table.rb b/db/primary_migrate/20210302144414_drop_authorizations_table.rb similarity index 100% rename from db/migrate/20210302144414_drop_authorizations_table.rb rename to db/primary_migrate/20210302144414_drop_authorizations_table.rb diff --git a/db/migrate/20210303033634_update_partner_accounts_crm_id_type.rb b/db/primary_migrate/20210303033634_update_partner_accounts_crm_id_type.rb similarity index 100% rename from db/migrate/20210303033634_update_partner_accounts_crm_id_type.rb rename to db/primary_migrate/20210303033634_update_partner_accounts_crm_id_type.rb diff --git a/db/migrate/20210303161124_add_null_constraint_to_agencies_abbreviation.rb b/db/primary_migrate/20210303161124_add_null_constraint_to_agencies_abbreviation.rb similarity index 100% rename from db/migrate/20210303161124_add_null_constraint_to_agencies_abbreviation.rb rename to db/primary_migrate/20210303161124_add_null_constraint_to_agencies_abbreviation.rb diff --git a/db/migrate/20210303182041_validate_add_null_constraint_to_agencies_abbreviation.rb b/db/primary_migrate/20210303182041_validate_add_null_constraint_to_agencies_abbreviation.rb similarity index 100% rename from db/migrate/20210303182041_validate_add_null_constraint_to_agencies_abbreviation.rb rename to db/primary_migrate/20210303182041_validate_add_null_constraint_to_agencies_abbreviation.rb diff --git a/db/migrate/20210315144559_create_delayed_jobs.rb b/db/primary_migrate/20210315144559_create_delayed_jobs.rb similarity index 100% rename from db/migrate/20210315144559_create_delayed_jobs.rb rename to db/primary_migrate/20210315144559_create_delayed_jobs.rb diff --git a/db/migrate/20210316082419_add_agreement_steps_to_doc_auth_logs.rb b/db/primary_migrate/20210316082419_add_agreement_steps_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20210316082419_add_agreement_steps_to_doc_auth_logs.rb rename to db/primary_migrate/20210316082419_add_agreement_steps_to_doc_auth_logs.rb diff --git a/db/migrate/20210329162528_add_multiple_certs_to_service_providers.rb b/db/primary_migrate/20210329162528_add_multiple_certs_to_service_providers.rb similarity index 100% rename from db/migrate/20210329162528_add_multiple_certs_to_service_providers.rb rename to db/primary_migrate/20210329162528_add_multiple_certs_to_service_providers.rb diff --git a/db/migrate/20210401192727_add_salted_code_fingerprint_salt_cost_to_backup_code_configurations.rb b/db/primary_migrate/20210401192727_add_salted_code_fingerprint_salt_cost_to_backup_code_configurations.rb similarity index 100% rename from db/migrate/20210401192727_add_salted_code_fingerprint_salt_cost_to_backup_code_configurations.rb rename to db/primary_migrate/20210401192727_add_salted_code_fingerprint_salt_cost_to_backup_code_configurations.rb diff --git a/db/migrate/20210406170306_add_index_on_user_id_salted_code_fingerprint_to_backup_code_configurations.rb b/db/primary_migrate/20210406170306_add_index_on_user_id_salted_code_fingerprint_to_backup_code_configurations.rb similarity index 100% rename from db/migrate/20210406170306_add_index_on_user_id_salted_code_fingerprint_to_backup_code_configurations.rb rename to db/primary_migrate/20210406170306_add_index_on_user_id_salted_code_fingerprint_to_backup_code_configurations.rb diff --git a/db/migrate/20210420112113_add_accepted_terms_at_to_users.rb b/db/primary_migrate/20210420112113_add_accepted_terms_at_to_users.rb similarity index 100% rename from db/migrate/20210420112113_add_accepted_terms_at_to_users.rb rename to db/primary_migrate/20210420112113_add_accepted_terms_at_to_users.rb diff --git a/db/migrate/20210423221651_drop_unused_service_provider_columns.rb b/db/primary_migrate/20210423221651_drop_unused_service_provider_columns.rb similarity index 100% rename from db/migrate/20210423221651_drop_unused_service_provider_columns.rb rename to db/primary_migrate/20210423221651_drop_unused_service_provider_columns.rb diff --git a/db/migrate/20210427184118_drop_users_unlock_token.rb b/db/primary_migrate/20210427184118_drop_users_unlock_token.rb similarity index 100% rename from db/migrate/20210427184118_drop_users_unlock_token.rb rename to db/primary_migrate/20210427184118_drop_users_unlock_token.rb diff --git a/db/migrate/20210427230314_drop_push_account_deletes_table.rb b/db/primary_migrate/20210427230314_drop_push_account_deletes_table.rb similarity index 100% rename from db/migrate/20210427230314_drop_push_account_deletes_table.rb rename to db/primary_migrate/20210427230314_drop_push_account_deletes_table.rb diff --git a/db/migrate/20210428145328_drop_users_unconfirmed_email_encrypted_otp_secret_key.rb b/db/primary_migrate/20210428145328_drop_users_unconfirmed_email_encrypted_otp_secret_key.rb similarity index 100% rename from db/migrate/20210428145328_drop_users_unconfirmed_email_encrypted_otp_secret_key.rb rename to db/primary_migrate/20210428145328_drop_users_unconfirmed_email_encrypted_otp_secret_key.rb diff --git a/db/migrate/20210512141236_usps_confirmation_codes_drop_letter_expired_sent_at.rb b/db/primary_migrate/20210512141236_usps_confirmation_codes_drop_letter_expired_sent_at.rb similarity index 100% rename from db/migrate/20210512141236_usps_confirmation_codes_drop_letter_expired_sent_at.rb rename to db/primary_migrate/20210512141236_usps_confirmation_codes_drop_letter_expired_sent_at.rb diff --git a/db/migrate/20210520172440_devices_cookie_uuid_index.rb b/db/primary_migrate/20210520172440_devices_cookie_uuid_index.rb similarity index 100% rename from db/migrate/20210520172440_devices_cookie_uuid_index.rb rename to db/primary_migrate/20210520172440_devices_cookie_uuid_index.rb diff --git a/db/migrate/20210520180810_add_reproof_at_to_profiles.rb b/db/primary_migrate/20210520180810_add_reproof_at_to_profiles.rb similarity index 100% rename from db/migrate/20210520180810_add_reproof_at_to_profiles.rb rename to db/primary_migrate/20210520180810_add_reproof_at_to_profiles.rb diff --git a/db/migrate/20210520181258_add_index_on_reproof_at_to_profiles.rb b/db/primary_migrate/20210520181258_add_index_on_reproof_at_to_profiles.rb similarity index 100% rename from db/migrate/20210520181258_add_index_on_reproof_at_to_profiles.rb rename to db/primary_migrate/20210520181258_add_index_on_reproof_at_to_profiles.rb diff --git a/db/migrate/20210521141731_add_state_to_doc_auth_logs.rb b/db/primary_migrate/20210521141731_add_state_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20210521141731_add_state_to_doc_auth_logs.rb rename to db/primary_migrate/20210521141731_add_state_to_doc_auth_logs.rb diff --git a/db/migrate/20210526023854_add_null_check_constraint_to_iaa_dates.rb b/db/primary_migrate/20210526023854_add_null_check_constraint_to_iaa_dates.rb similarity index 100% rename from db/migrate/20210526023854_add_null_check_constraint_to_iaa_dates.rb rename to db/primary_migrate/20210526023854_add_null_check_constraint_to_iaa_dates.rb diff --git a/db/migrate/20210526024526_drop_iaa_statuses.rb b/db/primary_migrate/20210526024526_drop_iaa_statuses.rb similarity index 100% rename from db/migrate/20210526024526_drop_iaa_statuses.rb rename to db/primary_migrate/20210526024526_drop_iaa_statuses.rb diff --git a/db/migrate/20210526024753_validate_add_null_check_constraint_to_iaa_dates.rb b/db/primary_migrate/20210526024753_validate_add_null_check_constraint_to_iaa_dates.rb similarity index 100% rename from db/migrate/20210526024753_validate_add_null_check_constraint_to_iaa_dates.rb rename to db/primary_migrate/20210526024753_validate_add_null_check_constraint_to_iaa_dates.rb diff --git a/db/migrate/20210607215515_add_aamva_to_doc_auth_logs.rb b/db/primary_migrate/20210607215515_add_aamva_to_doc_auth_logs.rb similarity index 100% rename from db/migrate/20210607215515_add_aamva_to_doc_auth_logs.rb rename to db/primary_migrate/20210607215515_add_aamva_to_doc_auth_logs.rb diff --git a/db/migrate/20210614145845_add_email_name_id_format_to_service_providers.rb b/db/primary_migrate/20210614145845_add_email_name_id_format_to_service_providers.rb similarity index 100% rename from db/migrate/20210614145845_add_email_name_id_format_to_service_providers.rb rename to db/primary_migrate/20210614145845_add_email_name_id_format_to_service_providers.rb diff --git a/db/migrate/20210622182910_add_use_legacy_name_id_behavior_to_s_ps.rb b/db/primary_migrate/20210622182910_add_use_legacy_name_id_behavior_to_s_ps.rb similarity index 100% rename from db/migrate/20210622182910_add_use_legacy_name_id_behavior_to_s_ps.rb rename to db/primary_migrate/20210622182910_add_use_legacy_name_id_behavior_to_s_ps.rb diff --git a/db/migrate/20210727141056_doc_auth_logs_drop_no_sp_campaign.rb b/db/primary_migrate/20210727141056_doc_auth_logs_drop_no_sp_campaign.rb similarity index 100% rename from db/migrate/20210727141056_doc_auth_logs_drop_no_sp_campaign.rb rename to db/primary_migrate/20210727141056_doc_auth_logs_drop_no_sp_campaign.rb diff --git a/db/migrate/20210804180216_create_good_jobs.rb b/db/primary_migrate/20210804180216_create_good_jobs.rb similarity index 100% rename from db/migrate/20210804180216_create_good_jobs.rb rename to db/primary_migrate/20210804180216_create_good_jobs.rb diff --git a/db/migrate/20210811191107_add_billable_to_sp_return_log.rb b/db/primary_migrate/20210811191107_add_billable_to_sp_return_log.rb similarity index 100% rename from db/migrate/20210811191107_add_billable_to_sp_return_log.rb rename to db/primary_migrate/20210811191107_add_billable_to_sp_return_log.rb diff --git a/db/schema.rb b/db/schema.rb index b7c520684fc..94b92d551ff 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -71,8 +71,8 @@ create_table "backup_code_configurations", force: :cascade do |t| t.integer "user_id", null: false - t.string "encrypted_code", default: "", null: false t.string "code_fingerprint", default: "", null: false + t.string "encrypted_code", default: "", null: false t.datetime "used_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -178,12 +178,12 @@ t.integer "choose_method_view_count", default: 0 t.datetime "present_cac_view_at" t.integer "present_cac_view_count", default: 0 + t.integer "present_cac_submit_count", default: 0 + t.integer "present_cac_error_count", default: 0 t.datetime "enter_info_view_at" t.integer "enter_info_view_count", default: 0 t.datetime "success_view_at" t.integer "success_view_count", default: 0 - t.integer "present_cac_submit_count", default: 0 - t.integer "present_cac_error_count", default: 0 t.datetime "selfie_view_at" t.integer "selfie_view_count", default: 0 t.integer "selfie_submit_count", default: 0 @@ -244,7 +244,7 @@ t.index ["user_id", "last_sign_in_at"], name: "index_email_addresses_on_user_id_and_last_sign_in_at", order: { last_sign_in_at: :desc } end - create_table "events", force: :cascade do |t| + create_table "events", id: :serial, force: :cascade do |t| t.integer "user_id", null: false t.integer "event_type", null: false t.datetime "created_at", null: false @@ -305,7 +305,7 @@ t.check_constraint "start_date IS NOT NULL", name: "iaa_orders_start_date_null" end - create_table "identities", force: :cascade do |t| + create_table "identities", id: :serial, force: :cascade do |t| t.string "service_provider", limit: 255 t.datetime "last_authenticated_at" t.integer "user_id" @@ -399,7 +399,7 @@ t.index ["issuer", "ial", "year_month", "user_id"], name: "index_monthly_sp_auth_counts_on_issuer_ial_month_user_id", unique: true end - create_table "otp_requests_trackers", force: :cascade do |t| + create_table "otp_requests_trackers", id: :serial, force: :cascade do |t| t.datetime "otp_last_sent_at" t.integer "otp_send_count", default: 0 t.string "attribute_cost" @@ -458,7 +458,7 @@ t.index ["x509_dn_uuid"], name: "index_piv_cac_configurations_on_x509_dn_uuid", unique: true end - create_table "profiles", force: :cascade do |t| + create_table "profiles", id: :serial, force: :cascade do |t| t.integer "user_id", null: false t.boolean "active", default: false, null: false t.datetime "verified_at" @@ -544,7 +544,7 @@ t.index ["issuer", "ial"], name: "index_service_provider_quota_limits_on_issuer_and_ial", unique: true end - create_table "service_providers", force: :cascade do |t| + create_table "service_providers", id: :serial, force: :cascade do |t| t.string "issuer", null: false t.string "friendly_name" t.text "description" @@ -572,8 +572,8 @@ t.string "push_notification_url" t.jsonb "help_text", default: {"sign_in"=>{}, "sign_up"=>{}, "forgot_password"=>{}} t.boolean "allow_prompt_login", default: false - t.boolean "signed_response_message_requested", default: false t.integer "ial2_quota" + t.boolean "signed_response_message_requested", default: false t.boolean "liveness_checking_required" t.string "remote_logo_key" t.date "launch_date" @@ -621,7 +621,7 @@ t.index ["user_id", "throttle_type"], name: "index_throttles_on_user_id_and_throttle_type" end - create_table "users", force: :cascade do |t| + create_table "users", id: :serial, force: :cascade do |t| t.string "reset_password_token", limit: 255 t.datetime "reset_password_sent_at" t.datetime "remember_created_at" @@ -665,7 +665,7 @@ create_table "usps_confirmation_codes", force: :cascade do |t| t.integer "profile_id", null: false t.string "otp_fingerprint", null: false - t.datetime "code_sent_at", default: -> { "now()" }, null: false + t.datetime "code_sent_at", default: -> { "CURRENT_TIMESTAMP" }, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.datetime "bounced_at" @@ -673,7 +673,7 @@ t.index ["profile_id"], name: "index_usps_confirmation_codes_on_profile_id" end - create_table "usps_confirmations", force: :cascade do |t| + create_table "usps_confirmations", id: :serial, force: :cascade do |t| t.text "entry", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/db/worker_jobs_migrate/20210809201322_create_good_jobs_separate_database.rb b/db/worker_jobs_migrate/20210809201322_create_good_jobs_separate_database.rb new file mode 100644 index 00000000000..3034b122880 --- /dev/null +++ b/db/worker_jobs_migrate/20210809201322_create_good_jobs_separate_database.rb @@ -0,0 +1,28 @@ +# same as 20210804180216_create_good_jobs.rb but runs in the worker database +class CreateGoodJobsSeparateDatabase < ActiveRecord::Migration[5.2] + def change + enable_extension 'pgcrypto' + + create_table :good_jobs, id: :uuid do |t| + t.text :queue_name + t.integer :priority + t.jsonb :serialized_params + t.timestamp :scheduled_at + t.timestamp :performed_at + t.timestamp :finished_at + t.text :error + + t.timestamps + + t.uuid :active_job_id + t.text :concurrency_key + t.text :cron_key + end + + add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: "index_good_jobs_on_scheduled_at" + add_index :good_jobs, [:queue_name, :scheduled_at], where: "(finished_at IS NULL)", name: :index_good_jobs_on_queue_name_and_scheduled_at + add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at + add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished + add_index :good_jobs, [:cron_key, :created_at], name: :index_good_jobs_on_cron_key_and_created_at + end +end diff --git a/db/worker_jobs_schema.rb b/db/worker_jobs_schema.rb new file mode 100644 index 00000000000..dabe1576486 --- /dev/null +++ b/db/worker_jobs_schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2021_08_09_201322) do + + # These are extensions that must be enabled in order to support this database + enable_extension "pgcrypto" + enable_extension "plpgsql" + + create_table "good_jobs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + t.text "queue_name" + t.integer "priority" + t.jsonb "serialized_params" + t.datetime "scheduled_at" + t.datetime "performed_at" + t.datetime "finished_at" + t.text "error" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.uuid "active_job_id" + t.text "concurrency_key" + t.text "cron_key" + t.index ["active_job_id", "created_at"], name: "index_good_jobs_on_active_job_id_and_created_at" + t.index ["concurrency_key"], name: "index_good_jobs_on_concurrency_key_when_unfinished", where: "(finished_at IS NULL)" + t.index ["cron_key", "created_at"], name: "index_good_jobs_on_cron_key_and_created_at" + t.index ["queue_name", "scheduled_at"], name: "index_good_jobs_on_queue_name_and_scheduled_at", where: "(finished_at IS NULL)" + t.index ["scheduled_at"], name: "index_good_jobs_on_scheduled_at", where: "(finished_at IS NULL)" + end + +end diff --git a/lib/identity_config.rb b/lib/identity_config.rb index ad275220f87..f6f85eebb72 100644 --- a/lib/identity_config.rb +++ b/lib/identity_config.rb @@ -105,6 +105,10 @@ def self.build_store(config_map) config.add(:database_statement_timeout, type: :integer) config.add(:database_timeout, type: :integer) config.add(:database_username, type: :string) + config.add(:database_worker_jobs_name, type: :string) + config.add(:database_worker_jobs_username, type: :string) + config.add(:database_worker_jobs_host, type: :string) + config.add(:database_worker_jobs_password, type: :string) config.add(:deleted_user_accounts_report_configs, type: :json) config.add(:disable_email_sending, type: :boolean) config.add(:disallow_all_web_crawlers, type: :boolean)