Fix: Respect the project configuration if the forward-only suffix was not set in the bot's config

Author: izeigerman

sqlmesh/integrations/github/cicd/config.py

@@ -33,9 +33,7 @@ class GithubCICDBotConfig(BaseConfig):
     pr_environment_name: t.Optional[str] = None
     pr_min_intervals: t.Optional[int] = None
     prod_branch_names_: t.Optional[str] = Field(default=None, alias="prod_branch_name")
-    forward_only_branch_suffix_: t.Optional[str] = Field(
-        default=None, alias="forward_only_branch_suffix"
-    )
+    forward_only_branch_suffix: t.Optional[str] = None
 
     @model_validator(mode="before")
     @classmethod
@@ -76,10 +74,6 @@ def skip_pr_backfill(self) -> bool:
             return True
         return self.skip_pr_backfill_
 
-    @property
-    def forward_only_branch_suffix(self) -> str:
-        return self.forward_only_branch_suffix_ or "-forward-only"
-
     FIELDS_FOR_ANALYTICS: t.ClassVar[t.Set[str]] = {
         "invalidate_environment_after_deploy",
         "enable_deploy_command",

sqlmesh/integrations/github/cicd/controller.py

@@ -478,11 +478,13 @@ def pr_targets_prod_branch(self) -> bool:
         return self._pull_request.base.ref in self.bot_config.prod_branch_names
 
     @property
-    def forward_only_plan(self) -> bool:
-        head_ref = self._pull_request.head.ref
-        if isinstance(head_ref, str):
-            return head_ref.endswith(self.bot_config.forward_only_branch_suffix)
-        return False
+    def forward_only_plan(self) -> t.Optional[bool]:
+        if self.bot_config.forward_only_branch_suffix is not None:
+            head_ref = self._pull_request.head.ref
+            if isinstance(head_ref, str):
+                return head_ref.endswith(self.bot_config.forward_only_branch_suffix)
+            return False
+        return None
 
     @classmethod
     def _append_output(cls, key: str, value: str) -> None: