mirror of
https://github.com/d9pouces/id_configurator.git
synced 2026-11-09 01:47:21 +01:00
feat: add support for certificate configuration in npm and php modules, update repository URLs in configuration files
Signed-off-by: d9pouces <github@19pouces.net>
This commit is contained in:
@@ -28,6 +28,14 @@ EMPTY_CONFIG = {
|
||||
"organisation": "InterDiode",
|
||||
}
|
||||
|
||||
CONFIG_WITH_CERTIFICATE_ONLY = {
|
||||
"uuid": "12345678-1234-5678-1234-567812345678",
|
||||
"organisation": "InterDiode",
|
||||
"configurations": {
|
||||
"certificates": [{"name": "interdiode-ca", "content": "-----BEGIN...-----"}]
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def make_config(data: dict) -> Configuration:
|
||||
return Configuration.model_validate(data)
|
||||
@@ -38,6 +46,13 @@ def test_is_relevant_false_when_no_repositories(tmp_path) -> None:
|
||||
assert NpmModule().is_relevant(context) is False
|
||||
|
||||
|
||||
def test_is_relevant_true_with_certificate_only(tmp_path) -> None:
|
||||
context = Context(
|
||||
config=make_config(CONFIG_WITH_CERTIFICATE_ONLY), dst=tmp_path / "dst", src=None
|
||||
)
|
||||
assert NpmModule().is_relevant(context) is True
|
||||
|
||||
|
||||
def test_is_relevant_true_with_repository(tmp_path) -> None:
|
||||
context = Context(
|
||||
config=make_config(CONFIG_WITH_REPO), dst=tmp_path / "dst", src=None
|
||||
@@ -69,3 +84,50 @@ def test_apply_writes_additional_repositories_scoped(tmp_path) -> None:
|
||||
"registry=https://example.invalid/\n"
|
||||
"@myorg:registry=https://other.invalid/\n"
|
||||
)
|
||||
|
||||
|
||||
def test_apply_without_certificates_does_not_write_etc_environment(tmp_path) -> None:
|
||||
dst = tmp_path / "dst"
|
||||
context = Context(config=make_config(CONFIG_WITH_REPO), dst=dst, src=None)
|
||||
|
||||
NpmModule().apply(context)
|
||||
|
||||
assert not (dst / "etc/environment").exists()
|
||||
|
||||
|
||||
def test_apply_sets_node_extra_ca_certs_when_certificates_configured(
|
||||
tmp_path,
|
||||
) -> None:
|
||||
dst = tmp_path / "dst"
|
||||
context = Context(
|
||||
config=make_config(CONFIG_WITH_CERTIFICATE_ONLY), dst=dst, src=None
|
||||
)
|
||||
|
||||
NpmModule().apply(context)
|
||||
|
||||
assert not (dst / "usr/local/etc/npmrc").exists()
|
||||
environment = (dst / "etc/environment").read_text(encoding="utf-8")
|
||||
assert environment == "NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt\n"
|
||||
|
||||
|
||||
def test_apply_merges_node_extra_ca_certs_into_existing_etc_environment(
|
||||
tmp_path,
|
||||
) -> None:
|
||||
src = tmp_path / "src"
|
||||
src.mkdir()
|
||||
(src / "etc").mkdir()
|
||||
(src / "etc/environment").write_text(
|
||||
"PATH=/usr/bin\nNODE_EXTRA_CA_CERTS=/old/stale.pem\n", encoding="utf-8"
|
||||
)
|
||||
|
||||
dst = tmp_path / "dst"
|
||||
context = Context(
|
||||
config=make_config(CONFIG_WITH_CERTIFICATE_ONLY), dst=dst, src=src
|
||||
)
|
||||
|
||||
NpmModule().apply(context)
|
||||
|
||||
environment = (dst / "etc/environment").read_text(encoding="utf-8")
|
||||
assert environment == (
|
||||
"PATH=/usr/bin\nNODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt\n"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user