Merge branch 'main' into release-8.2.0

microsoft · May 24, 2023 · 041c50c · 041c50c
2 parents eb5bab8 + dc0e7f7
commit 041c50c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/cli/onefuzz/templates/libfuzzer.py b/src/cli/onefuzz/templates/libfuzzer.py
@@ -66,7 +66,6 @@ def _create_tasks(
         colocate_all_tasks: bool = False,
         colocate_secondary_tasks: bool = True,
         check_fuzzer_help: bool = False,
-        no_check_fuzzer_help: bool = False,
         expect_crash_on_failure: bool = False,
         minimized_stack_depth: Optional[int] = None,
         module_allowlist: Optional[str] = None,
@@ -76,15 +75,7 @@ def _create_tasks(
         analyzer_env: Optional[Dict[str, str]] = None,
         tools: Optional[Container] = None,
     ) -> None:
-        if check_fuzzer_help:
-            self.logger.warning(
-                "--check_fuzzer_help is the default and does not need to be set; this parameter will be removed in a future version"
-            )
-        check_fuzzer_help = not no_check_fuzzer_help
-        del no_check_fuzzer_help
-
         target_options = target_options or []
-
         regression_containers = [
             (ContainerType.setup, containers[ContainerType.setup]),
             (ContainerType.crashes, containers[ContainerType.crashes]),

diff --git a/src/pytypes/onefuzztypes/models.py b/src/pytypes/onefuzztypes/models.py
@@ -271,7 +271,7 @@ class ADOTemplate(BaseModel):
     ado_fields: Dict[str, str]
     on_duplicate: ADODuplicateTemplate
 
-    # validator needed for backward compatibility
+    # validator needed to convert auth_token to SecretData
     @validator("auth_token", pre=True, always=True)
     def validate_auth_token(cls, v: Any) -> SecretData:
         if isinstance(v, str):
@@ -287,7 +287,7 @@ def validate_auth_token(cls, v: Any) -> SecretData:
 class TeamsTemplate(BaseModel):
     url: SecretData[str]
 
-    # validator needed for backward compatibility
+    # validator needed to convert url to SecretData
     @validator("url", pre=True, always=True)
     def validate_url(cls, v: Any) -> SecretData:
         if isinstance(v, str):
@@ -495,7 +495,7 @@ class GithubIssueTemplate(BaseModel):
     labels: List[str]
     on_duplicate: GithubIssueDuplicate
 
-    # validator needed for backward compatibility
+    # validator needed to convert auth to SecretData
     @validator("auth", pre=True, always=True)
     def validate_auth(cls, v: Any) -> SecretData:
         def try_parse_GithubAuth(x: dict) -> Optional[GithubAuth]: