From f46b2f75ac7339a0a6a5e33479eec015db08bba6 Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sat, 22 Feb 2025 00:13:38 +0200 Subject: [PATCH 1/8] dump playbooks tags in metadata --- demisto_sdk/commands/content_graph/objects/playbook.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index d60c1da3340..5d44dec5279 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -1,5 +1,5 @@ from pathlib import Path - +from typing import Set from demisto_sdk.commands.common.constants import TEST_PLAYBOOKS_DIR from demisto_sdk.commands.content_graph.common import ContentType from demisto_sdk.commands.content_graph.objects.base_playbook import BasePlaybook @@ -14,3 +14,6 @@ def match(_dict: dict, path: Path) -> bool: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True return False + + def metadata_fields(self) -> Set[str]: + return super().metadata_fields().union({"tags"}) \ No newline at end of file From 29b2d60a359f52651d0f29b3ee610ab70410151f Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sat, 22 Feb 2025 00:16:51 +0200 Subject: [PATCH 2/8] changelog --- .changelog/4827.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .changelog/4827.yml diff --git a/.changelog/4827.yml b/.changelog/4827.yml new file mode 100644 index 00000000000..8b8f9dbce6e --- /dev/null +++ b/.changelog/4827.yml @@ -0,0 +1,4 @@ +changes: +- description: Added playbook tags into pack's "metadata.json". + type: +pr_number: 4827 From e6a212a9e633ee37b1e47c96bc9d79aa53a7e72c Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sat, 22 Feb 2025 00:18:27 +0200 Subject: [PATCH 3/8] changelog --- .changelog/4827.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/4827.yml b/.changelog/4827.yml index 8b8f9dbce6e..cd25e23e2d7 100644 --- a/.changelog/4827.yml +++ b/.changelog/4827.yml @@ -1,4 +1,4 @@ changes: - description: Added playbook tags into pack's "metadata.json". - type: + type: feature pr_number: 4827 From f06179c130084e275d847ce5c17728ed563dee9b Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sat, 22 Feb 2025 01:22:55 +0200 Subject: [PATCH 4/8] precommit --- demisto_sdk/commands/content_graph/objects/playbook.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index 5d44dec5279..33092de1742 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -1,5 +1,6 @@ from pathlib import Path from typing import Set + from demisto_sdk.commands.common.constants import TEST_PLAYBOOKS_DIR from demisto_sdk.commands.content_graph.common import ContentType from demisto_sdk.commands.content_graph.objects.base_playbook import BasePlaybook @@ -14,6 +15,6 @@ def match(_dict: dict, path: Path) -> bool: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True return False - + def metadata_fields(self) -> Set[str]: - return super().metadata_fields().union({"tags"}) \ No newline at end of file + return super().metadata_fields().union({"tags"}) From 98e09a8ee7af5e74a885cc5ea995b3e3148ba2df Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sun, 23 Feb 2025 10:54:03 +0200 Subject: [PATCH 5/8] dump playbook tags in metadata --- .../commands/content_graph/objects/base_playbook.py | 13 ++++++++++++- .../commands/content_graph/objects/playbook.py | 5 +---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/demisto_sdk/commands/content_graph/objects/base_playbook.py b/demisto_sdk/commands/content_graph/objects/base_playbook.py index bf253886f55..9d2623f92b1 100644 --- a/demisto_sdk/commands/content_graph/objects/base_playbook.py +++ b/demisto_sdk/commands/content_graph/objects/base_playbook.py @@ -1,5 +1,5 @@ from functools import cached_property -from typing import Callable, Dict, List, Optional +from typing import Callable, Dict, List, Optional, Set import demisto_client from pydantic import BaseModel, Field @@ -221,3 +221,14 @@ def readme(self) -> ReadmeRelatedFile: @cached_property def image(self) -> ImageRelatedFile: return ImageRelatedFile(self.path, git_sha=self.git_sha) + + def metadata_fields(self) -> Set[str]: + return ( + super() + .metadata_fields() + .union( + { + "tags" + } + ) + ) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index 33092de1742..2b59776eae5 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -14,7 +14,4 @@ def match(_dict: dict, path: Path) -> bool: if "tasks" in _dict: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True - return False - - def metadata_fields(self) -> Set[str]: - return super().metadata_fields().union({"tags"}) + return False \ No newline at end of file From 5d17412f1f9853d6784028578c27730e9da60f2f Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sun, 23 Feb 2025 10:54:49 +0200 Subject: [PATCH 6/8] revert redundancies --- demisto_sdk/commands/content_graph/objects/playbook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index 2b59776eae5..81d8c3323fa 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -1,5 +1,4 @@ from pathlib import Path -from typing import Set from demisto_sdk.commands.common.constants import TEST_PLAYBOOKS_DIR from demisto_sdk.commands.content_graph.common import ContentType @@ -14,4 +13,5 @@ def match(_dict: dict, path: Path) -> bool: if "tasks" in _dict: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True - return False \ No newline at end of file + return False + \ No newline at end of file From 9dd39423f220efa056ca574d8e08d5d6cd5b4440 Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sun, 23 Feb 2025 10:55:17 +0200 Subject: [PATCH 7/8] revert redundancies --- demisto_sdk/commands/content_graph/objects/playbook.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index 81d8c3323fa..031c229e566 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -13,5 +13,4 @@ def match(_dict: dict, path: Path) -> bool: if "tasks" in _dict: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True - return False - \ No newline at end of file + return False \ No newline at end of file From b3623961cdfbcd66ec09ef439b4553904da5810a Mon Sep 17 00:00:00 2001 From: barryyosi-panw Date: Sun, 23 Feb 2025 11:05:36 +0200 Subject: [PATCH 8/8] precommit --- .../commands/content_graph/objects/base_playbook.py | 10 +--------- demisto_sdk/commands/content_graph/objects/playbook.py | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/demisto_sdk/commands/content_graph/objects/base_playbook.py b/demisto_sdk/commands/content_graph/objects/base_playbook.py index 9d2623f92b1..629cd4446ec 100644 --- a/demisto_sdk/commands/content_graph/objects/base_playbook.py +++ b/demisto_sdk/commands/content_graph/objects/base_playbook.py @@ -223,12 +223,4 @@ def image(self) -> ImageRelatedFile: return ImageRelatedFile(self.path, git_sha=self.git_sha) def metadata_fields(self) -> Set[str]: - return ( - super() - .metadata_fields() - .union( - { - "tags" - } - ) - ) + return super().metadata_fields().union({"tags"}) diff --git a/demisto_sdk/commands/content_graph/objects/playbook.py b/demisto_sdk/commands/content_graph/objects/playbook.py index 031c229e566..d60c1da3340 100644 --- a/demisto_sdk/commands/content_graph/objects/playbook.py +++ b/demisto_sdk/commands/content_graph/objects/playbook.py @@ -13,4 +13,4 @@ def match(_dict: dict, path: Path) -> bool: if "tasks" in _dict: if TEST_PLAYBOOKS_DIR not in path.parts and path.suffix == ".yml": return True - return False \ No newline at end of file + return False