From 65f403d997bd84d53c8190f0367363b10b849288 Mon Sep 17 00:00:00 2001 From: Josh Meek Date: Fri, 17 Apr 2020 09:45:32 -0400 Subject: [PATCH 1/3] Tweak server start command to use yaml safe load and dump --- src/prefect/cli/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/prefect/cli/server.py b/src/prefect/cli/server.py index f356fc7ae3cd..8f975f04ebd5 100644 --- a/src/prefect/cli/server.py +++ b/src/prefect/cli/server.py @@ -235,7 +235,7 @@ def start( shutil.copy2(os.path.join(docker_dir, "docker-compose.yml"), temp_path) with open(temp_path, "r") as file: - y = yaml.load(file) + y = yaml.safe_load(file) if no_postgres_port: del y["services"]["postgres"]["ports"] @@ -260,7 +260,7 @@ def start( ] with open(temp_path, "w") as f: - y = yaml.dump(y, f) + y = yaml.safe_dump(y, f) compose_dir_path = temp_dir From 22d8652df6e0dcfdeb09817381ba32adc5fcbf33 Mon Sep 17 00:00:00 2001 From: Josh Meek Date: Fri, 17 Apr 2020 09:47:02 -0400 Subject: [PATCH 2/3] Adjust server start CLI test to use yaml safe_dump --- tests/cli/test_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cli/test_server.py b/tests/cli/test_server.py index 9ccd60a11791..524dbd496540 100644 --- a/tests/cli/test_server.py +++ b/tests/cli/test_server.py @@ -216,7 +216,7 @@ def test_server_start_linux_host(monkeypatch, linux_platform): monkeypatch.setattr("prefect.cli.server.get_docker_ip", get_docker_ip) yaml_dump = MagicMock() - monkeypatch.setattr("yaml.dump", yaml_dump) + monkeypatch.setattr("yaml.safe_dump", yaml_dump) runner = CliRunner() result = runner.invoke(server, ["start", "--skip-pull",],) From dbda480162f63d27e990be866c2a704440f0ecc1 Mon Sep 17 00:00:00 2001 From: Josh Meek Date: Fri, 17 Apr 2020 09:49:10 -0400 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d583c87982..d8f1144b9765 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ These changes are available in the [master branch](https://github.com/PrefectHQ/ - Add option to connect containers created by Docker agent to an existing Docker network - [#2334](https://github.com/PrefectHQ/prefect/pull/2334) - Expose `datefmt` as a configurable logging option in Prefect configuration - [#2340](https://github.com/PrefectHQ/prefect/pull/2340) - The Docker agent configures containers to auto-remove on completion - [#2347](https://github.com/PrefectHQ/prefect/pull/2347) +- Use YAML's safe load and dump commands for the `server start` CLI command - [#2352](https://github.com/PrefectHQ/prefect/pull/2352) ### Task Library