From ccd7b861427bceac0b5d122f98c3d408882b5175 Mon Sep 17 00:00:00 2001 From: rom sharon <33751805+romsharon98@users.noreply.github.com> Date: Tue, 22 Oct 2024 08:39:27 +0300 Subject: [PATCH] Remove unnecessary return value from `jenkins_request_with_headers` (#43207) --- .../providers/jenkins/operators/jenkins_job_trigger.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/providers/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py b/providers/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py index c22dbb84de161..1f7237cfcfce1 100644 --- a/providers/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py +++ b/providers/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py @@ -38,7 +38,7 @@ ParamType = Union[str, dict, list, None] -def jenkins_request_with_headers(jenkins_server: Jenkins, req: Request) -> JenkinsRequest | None: +def jenkins_request_with_headers(jenkins_server: Jenkins, req: Request) -> JenkinsRequest: """ Create a Jenkins request from a raw request. @@ -72,7 +72,6 @@ def jenkins_request_with_headers(jenkins_server: Jenkins, req: Request) -> Jenki raise jenkins.TimeoutException(f"Error in request: {e}") except URLError as e: raise JenkinsException(f"Error in request: {e.reason}") - return None class JenkinsJobTriggerOperator(BaseOperator): @@ -117,7 +116,7 @@ def __init__( self.max_try_before_job_appears = max_try_before_job_appears self.allowed_jenkins_states = list(allowed_jenkins_states) if allowed_jenkins_states else ["SUCCESS"] - def build_job(self, jenkins_server: Jenkins, params: ParamType = None) -> JenkinsRequest | None: + def build_job(self, jenkins_server: Jenkins, params: ParamType = None) -> JenkinsRequest: """ Trigger a build job. @@ -207,8 +206,7 @@ def execute(self, context: Mapping[Any, Any]) -> str | None: ) jenkins_server = self.hook.get_jenkins_server() jenkins_response = self.build_job(jenkins_server, self.parameters) - if jenkins_response: - build_number = self.poll_job_in_queue(jenkins_response["headers"]["Location"], jenkins_server) + build_number = self.poll_job_in_queue(jenkins_response["headers"]["Location"], jenkins_server) time.sleep(self.sleep_time) keep_polling_job = True