v0.27.1
This commit is contained in:
Mateusz Gruszczyński committed
1 parent
3a2eb4fe79
commit
e0194fbaff
63 files changed
+1553
-379
No files matched your search
+52
-11
@@ -123,7 +123,7 @@ def upgrade_smoke(tmp: Path) -> None:
|
||||
assert backup.is_dir()
|
||||
assert (backup / "src/obsolete.rs").is_file()
|
||||
assert not (target / "src/obsolete.rs").exists()
|
||||
assert 'version = "0.27.0"' in (target / "Cargo.toml").read_text(encoding="utf-8")
|
||||
assert 'version = "0.27.1"' in (target / "Cargo.toml").read_text(encoding="utf-8")
|
||||
assert (target / "data/keep.txt").read_text(encoding="utf-8") == "preserve\n"
|
||||
assert (target / ".env").read_text(encoding="utf-8") == "RUST_PROXY_DEMO=0\n"
|
||||
assert (target / "langs/site.json").is_file()
|
||||
@@ -134,7 +134,7 @@ def upgrade_smoke(tmp: Path) -> None:
|
||||
assert (target / "docker-agent/certificate.go").is_file()
|
||||
assert (target / "docker-agent/server.go").is_file()
|
||||
manifest = json.loads((backup / "upgrade.json").read_text(encoding="utf-8"))
|
||||
assert manifest["to_version"] == "0.27.0"
|
||||
assert manifest["to_version"] == "0.27.1"
|
||||
assert manifest["removed_obsolete_runtime_state"] is True
|
||||
assert not legacy.exists()
|
||||
assert not (backup / "legacy-data").exists()
|
||||
@@ -403,8 +403,37 @@ def ui_contract_smoke() -> None:
|
||||
assert marker in vhosts, marker
|
||||
assert 'rustproxy-backend-table-v1' not in vhosts and 'poolTablePreferenceKey' not in vhosts
|
||||
assert 'window.rustProxyPreferences.update({' in vhosts and 'backend_table_sort' in vhosts and 'backend_table_descending' in vhosts
|
||||
for marker in ['id="vhost-sort"', 'id="vhost-sort-direction"', 'id="docker-vhost-sort"', 'id="docker-vhost-sort-direction"', 'id="redirect-sort"', 'id="redirect-sort-direction"', 'id="notfound-sort"', 'id="notfound-sort-direction"', 'id="stream-sort"', 'id="stream-sort-direction"']:
|
||||
assert marker in html, marker
|
||||
preferences_source = (ROOT / 'src/admin/preferences.rs').read_text(encoding='utf-8')
|
||||
for marker in ['vhost_list_sort', 'docker_vhost_sort', 'redirect_list_sort', 'notfound_list_sort', 'stream_list_sort']:
|
||||
assert marker in preferences_source, marker
|
||||
assert 'vhost_list_sort' in vhosts and 'vhost_list_descending' in vhosts
|
||||
list_sort_sources = {
|
||||
'docker': (ROOT / 'src/admin/web/docker.js').read_text(encoding='utf-8'),
|
||||
'redirects': (ROOT / 'src/admin/web/redirects.js').read_text(encoding='utf-8'),
|
||||
'notfound': (ROOT / 'src/admin/web/host404.js').read_text(encoding='utf-8'),
|
||||
'streams': (ROOT / 'src/admin/web/streams.js').read_text(encoding='utf-8'),
|
||||
}
|
||||
assert 'docker_vhost_sort' in list_sort_sources['docker'] and 'sortServiceRows' in list_sort_sources['docker']
|
||||
assert 'redirect_list_sort' in list_sort_sources['redirects']
|
||||
assert 'notfound_list_sort' in list_sort_sources['notfound']
|
||||
assert 'stream_list_sort' in list_sort_sources['streams']
|
||||
for marker in ['id="pool-search"', 'id="pool-sort"', 'data-pool-column-toggle="vhost"']:
|
||||
assert marker in html, marker
|
||||
for marker in ['https://git.linuxiarz.pl/gru/RustProxy', 'https://rustproxy.linuxiarz.pl/', 'id="about-python-runtime"', 'id="runtime-python"', 'id="acme-runtime-components"']:
|
||||
assert marker in html, marker
|
||||
for language in ['langs/en_US.json', 'langs/pl_pl.json']:
|
||||
text = (ROOT / language).read_text(encoding='utf-8')
|
||||
assert './dev.sh tls deploy' not in text
|
||||
assert '/opt/rustproxy/current/rust-proxy --data-dir /var/lib/rustproxy tls deploy' in text
|
||||
startup_source = (ROOT / 'src/main/admin_runtime.rs').read_text(encoding='utf-8')
|
||||
for marker in ['https://git.linuxiarz.pl/gru/RustProxy', 'https://rustproxy.linuxiarz.pl/', 'join("acme-python")', 'certificate_runtime']:
|
||||
assert marker in startup_source, marker
|
||||
for document in ['docs/RENEWAL.md', 'docs/INSTALL.md', 'docs/API.md']:
|
||||
document_text = (ROOT / document).read_text(encoding='utf-8')
|
||||
assert './dev.sh tls deploy' not in document_text
|
||||
assert '/opt/rustproxy/current/rust-proxy --data-dir /var/lib/rustproxy tls deploy' in document_text
|
||||
style = (ROOT / "src/admin/web/style.css").read_text(encoding="utf-8")
|
||||
for marker in ['--scrollbar-thumb', '*::-webkit-scrollbar-thumb', '.backend-table-tools', '.vhost-quick-toggle', '.dashboard-widget-toggle', '--toolbar-control-height: min(var(--button-min-height), var(--ui-field-min-height))', 'height: var(--toolbar-control-height)']:
|
||||
assert marker in style, marker
|
||||
@@ -428,6 +457,10 @@ def ui_contract_smoke() -> None:
|
||||
assert 'id="certificate-dialog"' not in html and 'id="certificate-close"' not in html
|
||||
for marker in ['function selectTab(name, focus = false, persist = true)', 'log_directories', 'certbotLogs', 'value?.kind?.startsWith("renewal")']:
|
||||
assert marker in acme_ui, marker
|
||||
for marker in ['id="acme-runtime-card"', 'id="acme-runtime-message"', 'id="acme-runtime-state"', 'id="acme-runtime-path"', 'rust-proxy --data-dir ./data admin setup-token', 'rust-proxy --data-dir /var/lib/rustproxy admin setup-token']:
|
||||
assert marker in html, marker
|
||||
for marker in ['function renderRuntime(value)', 'runtimeAvailable', 'certificateRuntimeUnavailable']:
|
||||
assert marker in acme_ui, marker
|
||||
for marker in ['.certificate-operation-card', '.renewal-meta', '#panel-tls .certificate-tabs']:
|
||||
assert marker in css, marker
|
||||
login = (ROOT / "src/admin/web/login.js").read_text(encoding="utf-8")
|
||||
@@ -571,7 +604,7 @@ def source_contract_smoke() -> None:
|
||||
assert marker in admin, marker
|
||||
anonymous_block = admin.split("fn anonymous_allowed", 1)[1].split("const CERTIFICATE_API_KEY_HEADER", 1)[0]
|
||||
assert '"/api/status"' not in anonymous_block
|
||||
assert '"RuntimeInformation"' in openapi_0241 and '"version": "0.27.0"' in openapi_0241
|
||||
assert '"RuntimeInformation"' in openapi_0241 and '"version": "0.27.1"' in openapi_0241
|
||||
assert 'id="panel-logging"' not in html
|
||||
for marker in ['id="settings-tab-logging"', 'id="settings-page-logging"', 'id="logging-form"', 'id="error-log-form"']:
|
||||
assert marker in html, marker
|
||||
@@ -946,6 +979,11 @@ def source_contract_smoke() -> None:
|
||||
assert '/Ubuntu%2014.04%20LTS/' in acl and 'repeated_slashes_are_normalized_for_routing' in acl and 'percent_encoded_spaces_are_valid_request_paths' in policies and 'repeated_slashes_route_normally_but_reach_upstream_unchanged' in policies and 'local_location_response_uses_response_rules_without_opening_backend' in policies and 'local_location_response_still_respects_route_acl' in policies
|
||||
db_source = rust_source(ROOT, "src/db.rs")
|
||||
acme_source = rust_source(ROOT, "src/acme.rs")
|
||||
acme_runtime = (ROOT / "src/acme/runtime_env.rs").read_text(encoding="utf-8")
|
||||
assert 'runtime_setup_once' in acme_source
|
||||
assert 'include!("acme/runtime_env.rs")' in (ROOT / 'src/acme.rs').read_text(encoding='utf-8')
|
||||
for marker in ['CERTBOT_PACKAGES', 'join("acme-python")', 'virtualenv>=20,<21', 'distro_certbot_available', 'acme.runtime_python_missing', 'acme.runtime_pip_missing']:
|
||||
assert marker in acme_runtime, marker
|
||||
assert "SCHEMA_VERSION: i64 = 8" in db_source and "certificate_renewals" in db_source and "0004_admin_preferences.sql" in db_source and "0005_certificate_api.sql" in db_source and "0006_certificate_api_credentials.sql" in db_source and "0007_secret_store.sql" in db_source and "0008_config_history.sql" in db_source
|
||||
runtime_source = rust_source(ROOT, "src/runtime.rs")
|
||||
assert 'replace_as_restore' in db_source and 'config.restore' in db_source and 'source_revision' in db_source
|
||||
@@ -955,6 +993,8 @@ def source_contract_smoke() -> None:
|
||||
for marker in ["pub kind: &'static str", "pub log_directory: String", "pub(crate) fn certbot_log_directory", 'kind: "issue"', '"renewal-dry-run"']:
|
||||
assert marker in acme_source, marker
|
||||
assert '"log_directories":log_directories' in admin and 'crate::acme::certbot_log_directory' in admin
|
||||
assert '"runtime":state.acme.runtime_view()' in admin
|
||||
assert '"certificate_runtime": state.acme.runtime_view()' in rust_source(ROOT, 'src/admin/status.rs')
|
||||
assert "store.load_certificate_renewals().await?" in main and "state.acme.restore_renewals(renewal_observations)" in main
|
||||
assert 'accept-remote-admin-risk' in main and 'hide = true' in main
|
||||
settings_rust = rust_source(ROOT, 'src/settings.rs')
|
||||
@@ -1047,7 +1087,7 @@ def source_contract_smoke() -> None:
|
||||
assert '.managed-update' in main and "flush_hot_to_cold_for_update" in main
|
||||
openapi = (ROOT / "src/admin/openapi.json").read_text(encoding="utf-8")
|
||||
assert '"/api/config/history/restore"' in openapi
|
||||
for marker in ['"version": "0.27.0"', '"memory_preset"', '"cold_preset"', '"memory_budget_bytes"', '"max_inflight"', '"preset"', '"session_days"', '"session_lifetime_seconds"', '"accept_local_listener_risk"', '"backend_header"', '"backend_timing_header"', '"cold_on_age"', '"match_type"', '"regex_insensitive"', '"NotFoundHost"', '"not_found_hosts"', '"PrometheusSettings"', '"allow_trusted_network_without_token"', '"include_docker_vhosts"', '"include_streams"', '"include_logging"']:
|
||||
for marker in ['"version": "0.27.1"', '"memory_preset"', '"cold_preset"', '"memory_budget_bytes"', '"max_inflight"', '"preset"', '"session_days"', '"session_lifetime_seconds"', '"accept_local_listener_risk"', '"backend_header"', '"backend_timing_header"', '"cold_on_age"', '"match_type"', '"regex_insensitive"', '"NotFoundHost"', '"not_found_hosts"', '"PrometheusSettings"', '"allow_trusted_network_without_token"', '"include_docker_vhosts"', '"include_streams"', '"include_logging"']:
|
||||
assert marker in openapi, marker
|
||||
assert '"software_update"' in openapi and '"update_available"' in openapi
|
||||
for marker in ['"/api/certificates/deploy"', '"CertificateDeploy"', '"CertificateDeployResult"', '"/api/certificates/reload"']:
|
||||
@@ -1120,12 +1160,13 @@ def container_contract_smoke() -> None:
|
||||
"cargo generate-lockfile",
|
||||
"cargo build --locked --release",
|
||||
"FROM debian:trixie-slim AS runtime",
|
||||
"python3 -m venv /opt/rustproxy-certbot",
|
||||
"certbot==5.8.0",
|
||||
"certbot-dns-cloudflare==5.8.0",
|
||||
"certbot-dns-ovh==5.8.0",
|
||||
"certbot-dns-rfc2136==5.8.0",
|
||||
"PATH=/opt/rustproxy-certbot/bin:",
|
||||
"python3-venv",
|
||||
"python3-pip",
|
||||
"certbot",
|
||||
"python3-certbot-dns-cloudflare",
|
||||
"python3-certbot-dns-ovh",
|
||||
"python3-certbot-dns-rfc2136",
|
||||
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
"USER rustproxy:rustproxy",
|
||||
'VOLUME ["/var/lib/rustproxy"]',
|
||||
]:
|
||||
@@ -1211,7 +1252,7 @@ def main() -> None:
|
||||
source_contract_smoke()
|
||||
container_contract_smoke()
|
||||
grafana_contract_smoke()
|
||||
print("PASS: 0.27.0 SQLite/upgrade, local-response 404 hosts, Prometheus/Grafana diagnostics, external Debian-packaging separation, cache/dashboard/logging/Nagios, retained admin/H3/stream/TLS contracts and reproducible source archives.")
|
||||
print("PASS: 0.27.1 SQLite/upgrade, local-response 404 hosts, Prometheus/Grafana diagnostics, external Debian-packaging separation, cache/dashboard/logging/Nagios, retained admin/H3/stream/TLS contracts and reproducible source archives.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in new issue
Block a user