Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 041c50c

Browse files
authored
Merge branch 'main' into release-8.2.0
2 parents eb5bab8 + dc0e7f7 commit 041c50c

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

src/cli/onefuzz/templates/libfuzzer.py

-9
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ def _create_tasks(
6666
colocate_all_tasks: bool = False,
6767
colocate_secondary_tasks: bool = True,
6868
check_fuzzer_help: bool = False,
69-
no_check_fuzzer_help: bool = False,
7069
expect_crash_on_failure: bool = False,
7170
minimized_stack_depth: Optional[int] = None,
7271
module_allowlist: Optional[str] = None,
@@ -76,15 +75,7 @@ def _create_tasks(
7675
analyzer_env: Optional[Dict[str, str]] = None,
7776
tools: Optional[Container] = None,
7877
) -> None:
79-
if check_fuzzer_help:
80-
self.logger.warning(
81-
"--check_fuzzer_help is the default and does not need to be set; this parameter will be removed in a future version"
82-
)
83-
check_fuzzer_help = not no_check_fuzzer_help
84-
del no_check_fuzzer_help
85-
8678
target_options = target_options or []
87-
8879
regression_containers = [
8980
(ContainerType.setup, containers[ContainerType.setup]),
9081
(ContainerType.crashes, containers[ContainerType.crashes]),

src/pytypes/onefuzztypes/models.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class ADOTemplate(BaseModel):
271271
ado_fields: Dict[str, str]
272272
on_duplicate: ADODuplicateTemplate
273273

274-
# validator needed for backward compatibility
274+
# validator needed to convert auth_token to SecretData
275275
@validator("auth_token", pre=True, always=True)
276276
def validate_auth_token(cls, v: Any) -> SecretData:
277277
if isinstance(v, str):
@@ -287,7 +287,7 @@ def validate_auth_token(cls, v: Any) -> SecretData:
287287
class TeamsTemplate(BaseModel):
288288
url: SecretData[str]
289289

290-
# validator needed for backward compatibility
290+
# validator needed to convert url to SecretData
291291
@validator("url", pre=True, always=True)
292292
def validate_url(cls, v: Any) -> SecretData:
293293
if isinstance(v, str):
@@ -495,7 +495,7 @@ class GithubIssueTemplate(BaseModel):
495495
labels: List[str]
496496
on_duplicate: GithubIssueDuplicate
497497

498-
# validator needed for backward compatibility
498+
# validator needed to convert auth to SecretData
499499
@validator("auth", pre=True, always=True)
500500
def validate_auth(cls, v: Any) -> SecretData:
501501
def try_parse_GithubAuth(x: dict) -> Optional[GithubAuth]:

0 commit comments

Comments
 (0)