Merge branch 'develop' into Current_Request_Function

beer-garden · Jul 12, 2024 · a1b263c · a1b263c
2 parents c56cdb9 + 923835f
commit a1b263c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ Brewtils Changelog
 TBD
 
 - Exposed a read only feature to provide the current request that is being processed `from brewtils import get_current_request_read_only`
+- Expand Job Export to include Job id
 
 3.26.3
 ------

diff --git a/brewtils/schemas.py b/brewtils/schemas.py
@@ -556,7 +556,6 @@ def __init__(self, *args, **kwargs):
         # exclude fields from a Job that we don't want when we later go to import
         # the Job definition
         self.opts.exclude += (
-            "id",
             "next_run_time",
             "success_count",
             "error_count",

diff --git a/brewtils/test/fixtures.py b/brewtils/test/fixtures.py
@@ -629,7 +629,6 @@ def job_dict_for_import(job_dict):
     """A job dict but some keys and values are missing."""
     dict_copy = copy.deepcopy(job_dict)
     for field in [
-        "id",
         "next_run_time",
         "success_count",
         "error_count",
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ Brewtils Changelog @@
     TBD
     - Exposed a read only feature to provide the current request that is being processed `from brewtils import get_current_request_read_only`
+    - Expand Job Export to include Job id
 .26.3
     ------
@@ Expand Down @@