refactor(packaging): rely on gateway runtime defaults (#1415)

* fix(packaging): use gateway TOML config in packages * refactor(packaging): rely on gateway runtime defaults
2026-10-02 07:34:45 +08:00 · 2026-05-18 14:13:19 -07:00
parent 7f16d60ef1
commit f257ed0193
35 changed files with 762 additions and 707 deletions
@@ -51,20 +51,93 @@ def test_generate_homebrew_formula_uses_tagged_macos_driver_asset_without_defaul
        "v0.0.10/openshell-driver-vm-aarch64-apple-darwin.tar.gz"
    ) in formula
    assert 'sha256 "' + "b" * 64 + '"' in formula
-    assert "OPENSHELL_DRIVERS:" not in formula
-    assert "#OPENSHELL_DRIVERS=vm" in formula
-    assert 'OPENSHELL_GATEWAY_CONFIG: "#{var}/openshell/gateway.toml"' in formula
-    assert 'driver_dir = "#{opt_libexec}"' in formula
-    assert 'supervisor_image = "ghcr.io/nvidia/openshell/supervisor:0.0.10"' in formula
+    assert "OPENSHELL_DRIVERS: " not in formula
+    assert 'OPENSHELL_GATEWAY_CONFIG: "#{var}/openshell/gateway.toml"' not in formula
+    assert "init-gateway-config.sh" not in formula
+    assert 'bind_address = "127.0.0.1:17670"' not in formula
+    assert '# compute_drivers = ["vm"]' not in formula
    assert 'run opt_libexec/"openshell-gateway-homebrew-service"' in formula
+    assert 'xdg_config_home="${XDG_CONFIG_HOME:-${HOME}/.config}"' in formula
+    assert 'xdg_gateway_config="${xdg_config_home}/openshell/gateway.toml"' in formula
+    assert 'prefix_gateway_config="#{var}/openshell/gateway.toml"' in formula
    assert (
-        'docker_tls_dir="${OPENSHELL_DOCKER_TLS_DIR:-${HOME}/.local/state/openshell/homebrew/tls}"'
+        'if [ -z "${OPENSHELL_GATEWAY_CONFIG:-}" ] && [ ! -f "${xdg_gateway_config}" ] && [ -f "${prefix_gateway_config}" ]; then'
    ) in formula
-    assert 'guest_tls_ca = "${docker_tls_dir}/ca.crt"' in formula
-    assert 'gateway_env="#{var}/openshell/gateway.env"' in formula
-    assert '. "${gateway_env}"' in formula
+    assert (
+        'exec "#{opt_bin}/openshell-gateway" --config "${prefix_gateway_config}"'
+        in formula
+    )
+    assert 'exec "#{opt_bin}/openshell-gateway"' in formula
+    assert "--db-url" not in formula
+    assert 'docker_tls_dir="${HOME}/.local/state/openshell/homebrew/tls"' in formula
+    assert (
+        'export OPENSHELL_LOCAL_TLS_DIR="${OPENSHELL_LOCAL_TLS_DIR:-${docker_tls_dir}}"'
+        in formula
+    )
+    assert '/usr/bin/install -m 0600 "#{var}/openshell/tls/server/tls.key"' in formula
+    assert "OPENSHELL_CONFIG_" not in formula
+    assert "OPENSHELL_DOCKER_TLS_DIR" not in formula
+    assert 'xdg_gateway_env="${xdg_config_home}/openshell/gateway.env"' in formula
+    assert 'prefix_gateway_env="#{var}/openshell/gateway.env"' in formula
+    assert '. "${xdg_gateway_env}"' in formula
+    assert '. "${prefix_gateway_env}"' in formula
+    assert 'gateway_env = var/"openshell/gateway.env"' not in formula
+    assert "#OPENSHELL_GATEWAY_CONFIG=#{var}/openshell/gateway.toml" not in formula
+    assert "environment_variables(" not in formula
+    assert "      OPENSHELL_BIND_ADDRESS:" not in formula
+    assert "      OPENSHELL_SERVER_PORT:" not in formula
+    assert "      OPENSHELL_TLS_CERT:" not in formula
    assert "OPENSHELL_DRIVER_DIR:" not in formula
    assert "OPENSHELL_DOCKER_SUPERVISOR_IMAGE:" not in formula
    assert 'OPENSHELL_DOCKER_TLS_CA: "#{var}/openshell/tls/ca.crt"' not in formula
    assert "entitlements.atomic_write" in formula
    assert "brew services restart openshell" in formula
+
+
+def test_snap_wrapper_uses_optional_gateway_config_without_generating_toml() -> None:
+    repo_root = Path(__file__).resolve().parents[2]
+    wrapper = (repo_root / "deploy/snap/bin/openshell-gateway-wrapper").read_text(
+        encoding="utf-8"
+    )
+
+    assert "init-gateway-config.sh" not in wrapper
+    assert (
+        'export OPENSHELL_DB_URL="${OPENSHELL_DB_URL:-sqlite:${SNAP_COMMON}/gateway.db?mode=rwc}"'
+        in wrapper
+    )
+    assert 'export OPENSHELL_DISABLE_TLS="${OPENSHELL_DISABLE_TLS:-true}"' in wrapper
+    assert (
+        'exec "${SNAP}/bin/openshell-gateway" --config "$CANONICAL_CONFIG_FILE" "$@"'
+        in wrapper
+    )
+    assert 'exec "${SNAP}/bin/openshell-gateway" "$@"' in wrapper
+
+
+def test_rpm_spec_uses_gateway_defaults_without_config_helper() -> None:
+    repo_root = Path(__file__).resolve().parents[2]
+    spec = (repo_root / "openshell.spec").read_text(encoding="utf-8")
+
+    assert "init-gateway-config.sh" not in spec
+    assert "init-pki.sh" not in spec
+    assert "openshell-gateway generate-certs --output-dir %%S/openshell/tls" in spec
+    assert "EnvironmentFile=-%%E/openshell/gateway.env" in spec
+    assert "Environment=OPENSHELL_DRIVERS" not in spec
+    assert "Environment=OPENSHELL_BIND_ADDRESS" not in spec
+    assert "Environment=OPENSHELL_PODMAN_TLS_CA" not in spec
+    assert "ExecStart=/usr/bin/openshell-gateway" in spec
+    assert "--config" not in spec
+    assert "--db-url" not in spec
+
+
+def test_deb_user_service_uses_gateway_defaults_without_config_helper() -> None:
+    repo_root = Path(__file__).resolve().parents[2]
+    unit = (repo_root / "deploy/deb/openshell-gateway.service").read_text(
+        encoding="utf-8"
+    )
+
+    assert "EnvironmentFile=-%E/openshell/gateway.env" in unit
+    assert "openshell-gateway generate-certs --output-dir %S/openshell/tls" in unit
+    assert "init-gateway-config.sh" not in unit
+    assert "ExecStart=/usr/bin/openshell-gateway" in unit
+    assert "--config" not in unit
+    assert "--db-url" not in unit