Fix mypy errors for google.cloud_build (#20234)

Part of #19891
apache · Dec 21, 2021 · d4c4f9e · d4c4f9e
1 parent daeeb7d
commit d4c4f9e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 38 deletions.
diff --git a/airflow/providers/google/cloud/hooks/cloud_build.py b/airflow/providers/google/cloud/hooks/cloud_build.py
@@ -98,7 +98,7 @@ def cancel_build(
  project_id: str = PROVIDE_PROJECT_ID,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> Build:
  """
  Cancels a build in progress.
@@ -124,9 +124,11 @@ def cancel_build(
  self.log.info("Start cancelling build: %s.", id_)
 
  build = client.cancel_build(
- request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
+ request={'project_id': project_id, 'id': id_},
+ retry=retry,
+ timeout=timeout,
+ metadata=metadata,
  )
-
  self.log.info("Build has been cancelled: %s.", id_)
 
  return build
@@ -139,7 +141,7 @@ def create_build(
  wait: bool = True,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> Build:
  """
  Starts a build with the specified configuration.
@@ -192,7 +194,7 @@ def create_build_trigger(
  project_id: str = PROVIDE_PROJECT_ID,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> BuildTrigger:
  """
  Creates a new BuildTrigger.
@@ -236,7 +238,7 @@ def delete_build_trigger(
  project_id: str = PROVIDE_PROJECT_ID,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> None:
  """
  Deletes a BuildTrigger by its project ID and trigger ID.
@@ -275,7 +277,7 @@ def get_build(
  project_id: str = PROVIDE_PROJECT_ID,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> Build:
  """
  Returns information about a previously requested build.
@@ -301,7 +303,10 @@ def get_build(
  self.log.info("Start retrieving build: %s.", id_)
 
  build = client.get_build(
- request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
+ request={'project_id': project_id, 'id': id_},
+ retry=retry,
+ timeout=timeout,
+ metadata=metadata,
  )
 
  self.log.info("Build has been retrieved: %s.", id_)
@@ -315,7 +320,7 @@ def get_build_trigger(
  project_id: str = PROVIDE_PROJECT_ID,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> BuildTrigger:
  """
  Returns information about a BuildTrigger.
@@ -360,7 +365,7 @@ def list_build_triggers(
  page_token: Optional[str] = None,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> List[BuildTrigger]:
  """
  Lists existing BuildTriggers.
@@ -417,7 +422,7 @@ def list_builds(
  filter_: Optional[str] = None,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> List[Build]:
  """
  Lists previously requested builds.
@@ -475,7 +480,7 @@ def retry_build(
  wait: bool = True,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> Build:
  """
  Creates a new build based on the specified build. This method creates a new build
@@ -504,7 +509,10 @@ def retry_build(
  self.log.info("Start retrying build: %s.", id_)
 
  operation = client.retry_build(
- request={'project_id': project_id, 'id': id_}, retry=retry, timeout=timeout, metadata=metadata
+ request={'project_id': project_id, 'id': id_},
+ retry=retry,
+ timeout=timeout,
+ metadata=metadata,
  )
 
  id_ = self._get_build_id_from_operation(Operation)
@@ -527,7 +535,7 @@ def run_build_trigger(
  wait: bool = True,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> Build:
  """
  Runs a BuildTrigger at a particular source revision.
@@ -583,7 +591,7 @@ def update_build_trigger(
  project_id: str,
  retry: Optional[Retry] = None,
  timeout: Optional[float] = None,
- metadata: Optional[Sequence[Tuple[str, str]]] = None,
+ metadata: Sequence[Tuple[str, str]] = (),
  ) -> BuildTrigger:
  """
  Updates a BuildTrigger by its project ID and trigger ID.

diff --git a/airflow/providers/google/cloud/operators/cloud_build.py b/airflow/providers/google/cloud/operators/cloud_build.py
@@ -909,8 +909,6 @@ class BuildProcessor:
  """
 
  def __init__(self, build: Union[Dict, Build]) -> None:
- if isinstance(build, Build):
- self.build = Build(build)
  self.build = deepcopy(build)
 
  def _verify_source(self) -> None:
@@ -1012,7 +1010,7 @@ def _convert_storage_url_to_dict(storage_url: str) -> Dict[str, Any]:
  "gs://bucket-name/object-name.tar.gz#24565443"
  )
 
- source_dict = {
+ source_dict: Dict[str, Any] = {
  "bucket": url_parts.hostname,
  "object_": url_parts.path[1:],
  }

diff --git a/tests/providers/google/cloud/hooks/test_cloud_build.py b/tests/providers/google/cloud/hooks/test_cloud_build.py
@@ -79,7 +79,7 @@ def test_cancel_build(self, get_conn):
  self.hook.cancel_build(id_=BUILD_ID, project_id=PROJECT_ID)
 
  get_conn.return_value.cancel_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -94,13 +94,13 @@ def test_create_build_with_wait(self, get_conn, wait_time, mock_get_id_from_oper
  self.hook.create_build(build=BUILD, project_id=PROJECT_ID)
 
  get_conn.return_value.create_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=()
  )
 
  get_conn.return_value.create_build.return_value.result.assert_called_once_with()
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -112,11 +112,11 @@ def test_create_build_without_wait(self, get_conn, mock_get_id_from_operation):
  self.hook.create_build(build=BUILD, project_id=PROJECT_ID, wait=False)
 
  get_conn.return_value.create_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'build': BUILD}, retry=None, timeout=None, metadata=()
  )
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -127,7 +127,7 @@ def test_create_build_trigger(self, get_conn):
  request={'project_id': PROJECT_ID, 'trigger': BUILD_TRIGGER},
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -138,15 +138,15 @@ def test_delete_build_trigger(self, get_conn):
  request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID},
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
  def test_get_build(self, get_conn):
  self.hook.get_build(id_=BUILD_ID, project_id=PROJECT_ID)
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -157,7 +157,7 @@ def test_get_build_trigger(self, get_conn):
  request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID},
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -168,7 +168,7 @@ def test_list_build_triggers(self, get_conn):
  request={'parent': PARENT, 'project_id': PROJECT_ID, 'page_size': None, 'page_token': None},
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -185,7 +185,7 @@ def test_list_builds(self, get_conn):
  },
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -200,13 +200,13 @@ def test_retry_build_with_wait(self, get_conn, wait_time, mock_get_id_from_opera
  self.hook.retry_build(id_=BUILD_ID, project_id=PROJECT_ID)
 
  get_conn.return_value.retry_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  get_conn.return_value.retry_build.return_value.result.assert_called_once_with()
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -218,11 +218,11 @@ def test_retry_build_without_wait(self, get_conn, mock_get_id_from_operation):
  self.hook.retry_build(id_=BUILD_ID, project_id=PROJECT_ID, wait=False)
 
  get_conn.return_value.retry_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -246,13 +246,13 @@ def test_run_build_trigger_with_wait(self, get_conn, wait_time, mock_get_id_from
  },
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  get_conn.return_value.run_build_trigger.return_value.result.assert_called_once_with()
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook._get_build_id_from_operation")
@@ -273,11 +273,11 @@ def test_run_build_trigger_without_wait(self, get_conn, mock_get_id_from_operati
  },
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )
 
  get_conn.return_value.get_build.assert_called_once_with(
- request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=None
+ request={'project_id': PROJECT_ID, 'id': BUILD_ID}, retry=None, timeout=None, metadata=()
  )
 
  @patch("airflow.providers.google.cloud.hooks.cloud_build.CloudBuildHook.get_conn")
@@ -288,5 +288,5 @@ def test_update_build_trigger(self, get_conn):
  request={'project_id': PROJECT_ID, 'trigger_id': TRIGGER_ID, 'trigger': BUILD_TRIGGER},
  retry=None,
  timeout=None,
- metadata=None,
+ metadata=(),
  )