Skip to content

Commit 61592ef

Browse files
committed
chore(golden): satisfy mypy on harness.py
- Type-narrow rtype before passing to RESOURCES_WITH_LOCAL_PATHS.get. - Annotate Translator.translate() return so harness's run_build_pipeline return type is preserved (no_any_return). - Use Optional[str] = None on GoldenS3Uploader keyword args (PEP 484 no-implicit-optional).
1 parent eb1f954 commit 61592ef

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

tests/golden/harness.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import copy
4444
import hashlib
4545
from pathlib import Path
46-
from typing import Any, Dict, List
46+
from typing import Any, Dict, List, Optional
4747

4848
import yaml
4949

@@ -72,6 +72,8 @@ def _walk_artifact_properties(template: Dict[str, Any]) -> List:
7272
if not isinstance(resource, dict):
7373
continue
7474
rtype = resource.get("Type")
75+
if not isinstance(rtype, str):
76+
continue
7577
for prop_paths in (
7678
RESOURCES_WITH_LOCAL_PATHS.get(rtype, []),
7779
RESOURCES_WITH_IMAGE_COMPONENT.get(rtype, []),
@@ -236,11 +238,12 @@ def _run_sam_transform(template: Dict[str, Any], parameter_values: Dict[str, Any
236238
boto_session=None,
237239
)
238240

239-
return sam_translator.translate(
241+
translated: Dict[str, Any] = sam_translator.translate(
240242
sam_template=template_copy,
241243
parameter_values=parameter_values,
242244
get_managed_policy_map=lambda: {},
243245
)
246+
return translated
244247

245248

246249
def run_build_pipeline(template_path: Path, language_extensions: bool) -> Dict[str, Any]:
@@ -279,21 +282,24 @@ def __init__(self, template_dir: str):
279282
self.bucket_name = GOLDEN_BUCKET
280283
self.no_progressbar = True
281284

282-
def upload(self, file_name: str, key: str = None) -> str:
285+
def upload(self, file_name: str, key: Optional[str] = None) -> str:
283286
# Hash the file content so the URI is content-addressed.
284287
with open(file_name, "rb") as f:
285288
digest = hashlib.sha256(f.read()).hexdigest()
286289
return f"s3://{GOLDEN_BUCKET}/{digest}"
287290

288291
def upload_with_dedup(
289-
self, file_name: str, extension: str = None, precomputed_md5: str = None
292+
self,
293+
file_name: str,
294+
extension: Optional[str] = None,
295+
precomputed_md5: Optional[str] = None,
290296
) -> str:
291297
return self.upload(file_name)
292298

293299
def file_exists(self, key: str) -> bool:
294300
return False
295301

296-
def to_path_style_s3_url(self, key: str, version: str = None) -> str:
302+
def to_path_style_s3_url(self, key: str, version: Optional[str] = None) -> str:
297303
return f"https://s3.amazonaws.com/{GOLDEN_BUCKET}/{key}"
298304

299305
def get_version_of_artifact(self, s3_url: str):

0 commit comments

Comments
 (0)