Merge pull request #7487 from opsmill/pog-add-status-to-branch

Add status field as response option in Branch query

Author: ogenstad

backend/infrahub/core/branch/enums.py

@@ -4,5 +4,4 @@
 class BranchStatus(InfrahubStringEnum):
     OPEN = "OPEN"
     NEED_REBASE = "NEED_REBASE"
-    CLOSED = "CLOSED"
     DELETING = "DELETING"

backend/infrahub/graphql/types/branch.py

@@ -7,6 +7,7 @@
 from infrahub.core.branch import Branch
 from infrahub.core.constants import GLOBAL_BRANCH_NAME
 
+from .enums import InfrahubBranchStatus
 from .standard_node import InfrahubObjectType
 
 if TYPE_CHECKING:
@@ -19,6 +20,7 @@ class BranchType(InfrahubObjectType):
     description = String(required=False)
     origin_branch = String(required=False)
     branched_from = String(required=False)
+    status = InfrahubBranchStatus(required=True)
     created_at = String(required=False)
     sync_with_git = Boolean(required=False)
     is_default = Boolean(required=False)

backend/infrahub/graphql/types/enums.py

@@ -1,6 +1,7 @@
 from graphene import Enum
 
 from infrahub.core import constants
+from infrahub.core.branch.enums import BranchStatus
 from infrahub.permissions import constants as permission_constants
 
 CheckType = Enum.from_enum(constants.CheckType)
@@ -10,3 +11,5 @@
 Severity = Enum.from_enum(constants.Severity)
 
 BranchRelativePermissionDecision = Enum.from_enum(permission_constants.BranchRelativePermissionDecision)
+
+InfrahubBranchStatus = Enum.from_enum(BranchStatus)

schema/schema.graphql

@@ -150,6 +150,7 @@ type Branch {
   is_isolated: Boolean @deprecated(reason: "non isolated mode is not supported anymore")
   name: String!
   origin_branch: String
+  status: BranchStatus!
   sync_with_git: Boolean
 }
 
@@ -318,6 +319,13 @@ enum BranchRelativePermissionDecision {
   DENY
 }
 
+"""An enumeration."""
+enum BranchStatus {
+  DELETING
+  NEED_REBASE
+  OPEN
+}
+
 type BranchUpdate {
   ok: Boolean
 }