Skip to content

Use st2common meta safe YAML helpers in clone_action_files #6405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kateolenya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use st2common meta safe YAML helpers in clone_action_files #6405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Fixed
Changed
~~~~~~~
* Removed Python 3.8 and 3.9 from testing and CI/CD.
* Use the existing `st2common.constants.meta` safe YAML helpers in `clone_action_files`
* Removed mongodb 7.0, rabbitmq 3.13 and redis 8.0
* Replaced deprecated `pkg_resources` module with `importlib-metadata` and `importlib-resources`.
* Replaced abandoned `flex` module by `openapi-spec-validator`
Expand Down
7 changes: 4 additions & 3 deletions st2common/st2common/services/packs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
from six.moves import range
from oslo_config import cfg
import shutil
import yaml

from st2common import log as logging
from st2common.constants.meta import yaml_safe_dump
from st2common.constants.meta import yaml_safe_load
from st2common.content.utils import get_pack_base_path
from st2common.exceptions.content import ResourceDiskFilesRemovalError
from st2common.models.db.stormbase import UIDFieldMixin
Expand Down Expand Up @@ -385,15 +386,15 @@ def clone_action_files(source_action_db, dest_action_db, dest_pack_base_path):
)

with open(dest_metadata_file_path) as df:
doc = yaml.load(df, Loader=yaml.FullLoader)
doc = yaml_safe_load(df)

doc["name"] = dest_action_db["name"]
if "pack" in doc:
doc["pack"] = dest_action_db["pack"]
doc["entry_point"] = dest_entry_point

with open(dest_metadata_file_path, "w") as df:
yaml.dump(doc, df, default_flow_style=False, sort_keys=False)
yaml_safe_dump(doc, stream=df, default_flow_style=False, sort_keys=False)


def clone_action_db(source_action_db, dest_pack, dest_action):
Expand Down
Loading