Skip to content

Squash migrations#2229

Merged
j-chmielewski merged 19 commits into
devfrom
squash-migrations
Mar 26, 2026
Merged

Squash migrations#2229
j-chmielewski merged 19 commits into
devfrom
squash-migrations

Conversation

@j-chmielewski
Copy link
Copy Markdown
Contributor

@j-chmielewski j-chmielewski commented Mar 9, 2026

  • Squashes all 2.0.0 migrations into one
  • Adds supplementary DB indices
  • Adds gateway-config command that prints gateway configuration

@j-chmielewski j-chmielewski marked this pull request as ready for review March 10, 2026 11:48
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR consolidates a set of 2.0.0-era database migrations into a single “squashed” migration, and refactors gateway configuration generation by centralizing the Configuration mapping in defguard_proto and exposing a CLI subcommand to print a location’s gateway config.

Changes:

  • Squash multiple 2.0.0 migrations into 20251218140442_[2.0.0]_initial.(up|down).sql and remove the previously separate migration files.
  • Add defguard_proto::gateway::Configuration::new(...) and update gateway manager code/tests to use it instead of a local helper.
  • Add Command::GatewayConfig plus defguard_core::gateway_config(...) to output the gateway gRPC configuration for a location.

Reviewed changes

Copilot reviewed 73 out of 73 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
migrations/20260323083929_[2.0.0]_enrollment_settings.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260323083929_[2.0.0]_enrollment_settings.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260323081850_[2.0.0]_more_mjml.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260323081850_[2.0.0]_more_mjml.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260317120000_[2.0.0]_vpn_client_session_preshared_key.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260317120000_[2.0.0]_vpn_client_session_preshared_key.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260317100000_[2.0.0]_activity_log_optional_ip.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260317100000_[2.0.0]_activity_log_optional_ip.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260312110000_[2.0.0]_wireguard_network_allow_all_groups.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260312110000_[2.0.0]_wireguard_network_allow_all_groups.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260312072940_[2.0.0]_rp_id_stats_purge.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260312072940_[2.0.0]_rp_id_stats_purge.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260302142347_[2.0.0]_proxy_enabled.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260302142347_[2.0.0]_proxy_enabled.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260227091211_[2.0.0]_settings_in_db.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260227091211_[2.0.0]_settings_in_db.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260225142454_[2.0.0]_migration_wizard.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260225142454_[2.0.0]_migration_wizard.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260223095641_[2.0.0]_mjml_user_import.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260223095641_[2.0.0]_mjml_user_import.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260223075953_[2.0.0]_mjml_part_2.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260223075953_[2.0.0]_mjml_part_2.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260219113714_[2.0.0]_update_gateway_model.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260219113714_[2.0.0]_update_gateway_model.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260218054705_[2.0.0]_gateway_cascade_delete.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260218054705_[2.0.0]_gateway_cascade_delete.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260213090000_[2.0.0]_gateway_certificate_serial.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260213090000_[2.0.0]_gateway_certificate_serial.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260209083940_[2.0.0]_mjml.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260209083940_[2.0.0]_mjml.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260209080417_[2.0.0]_proxy_certificate.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260209080417_[2.0.0]_proxy_certificate.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260205123151_[2.0.0]_proxy_modified.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260205123151_[2.0.0]_proxy_modified.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260205094812_[2.0.0]_initial_wizard_step_persistence.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260205094812_[2.0.0]_initial_wizard_step_persistence.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260204093536_[2.0.0]_public_proxy_url_in_settings.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260204093536_[2.0.0]_public_proxy_url_in_settings.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260202100252_[2.0.0]_drop_legacy_stats_table.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260202100252_[2.0.0]_drop_legacy_stats_table.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260128121256_[2.0.0]_initial_setup_wizard.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260128121256_[2.0.0]_initial_setup_wizard.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260128082943_[2.0.0]_add_session_mfa_method.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260128082943_[2.0.0]_add_session_mfa_method.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260127094513_[2.0.0]_aclalias_any.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260127094513_[2.0.0]_aclalias_any.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260127085637_[2.0.0]_gateway_common_name.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260127085637_[2.0.0]_gateway_common_name.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260121122631_[2.0.0]_Add_component_versions.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260121122631_[2.0.0]_Add_component_versions.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260119121935_[2.0.0]_vpn_client_sessions.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260119121935_[2.0.0]_vpn_client_sessions.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260116095450_[2.0.0]_proxy_certificates.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260116095450_[2.0.0]_proxy_certificates.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260115123545_[2.0.0]_openid_provider_kind.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260115123545_[2.0.0]_openid_provider_kind.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260113114719_[2.0.0]_proxy_management.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260113114719_[2.0.0]_proxy_management.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260113094304_[2.0.0]_gateway_certificates_management.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260113094304_[2.0.0]_gateway_certificates_management.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260107092015_[2.0.0]_mtu_fwmark.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20260107092015_[2.0.0]_mtu_fwmark.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20251218140442_[2.0.0]_initial.up.sql New “squashed” migration implementing the consolidated 2.0.0 schema changes.
migrations/20251218140442_[2.0.0]_initial.down.sql New rollback migration for the consolidated 2.0.0 schema changes.
migrations/20251218140442_[2.0.0]_core_ca.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20251218140442_[2.0.0]_core_ca.down.sql Removed (squashed into 2.0.0 initial migration).
migrations/20251125072923_network_gateways.up.sql Removed (squashed into 2.0.0 initial migration).
migrations/20251125072923_network_gateways.down.sql Removed (squashed into 2.0.0 initial migration).
crates/defguard_proto/src/lib.rs Adds Configuration::new(...) to centralize config mapping.
crates/defguard_gateway_manager/src/handler.rs Replaces local gen_config with Configuration::new and updates tests/imports.
crates/defguard_core/src/lib.rs Adds gateway_config(...) helper used by CLI, and wires in peer/firewall config fetching.
crates/defguard_common/src/config.rs Adds Command::GatewayConfig and its CLI args.
crates/defguard/src/main.rs Implements GatewayConfig subcommand and moves some initialization earlier.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread crates/defguard_core/src/lib.rs
Comment thread migrations/20251218140442_[2.0.0]_initial.up.sql
Comment thread migrations/20251218140442_[2.0.0]_initial.up.sql
Comment thread migrations/20251218140442_[2.0.0]_initial.up.sql Outdated
Comment thread crates/defguard_core/src/lib.rs Outdated
Comment thread crates/defguard_core/src/lib.rs
@j-chmielewski j-chmielewski merged commit da0b582 into dev Mar 26, 2026
3 checks passed
@j-chmielewski j-chmielewski deleted the squash-migrations branch March 26, 2026 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants