ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-15 11:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

address multiple issues found by pylint (#206)

Browse Source
This commit is contained in:
bmc-msft
2020-10-26 12:24:50 -04:00
committed by GitHub
parent 5e891bcf7a
commit d4c584342a
14 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/api-service/__app__/onefuzzlib/extension.py
View File

@ -28,19 +28,19 @@ from .reports import get_report
# return commands
def generic_extensions(region: Region, os: OS) -> List[Extension]:
extensions = [monitor_extension(region, os)]
depedency = dependency_extension(region, os)
def generic_extensions(region: Region, vm_os: OS) -> List[Extension]:
extensions = [monitor_extension(region, vm_os)]
depedency = dependency_extension(region, vm_os)
if depedency:
extensions.append(depedency)
return extensions
def monitor_extension(region: Region, os: OS) -> Extension:
def monitor_extension(region: Region, vm_os: OS) -> Extension:
settings = get_monitor_settings()
if os == OS.windows:
if vm_os == OS.windows:
return {
"name": "OMSExtension",
"publisher": "Microsoft.EnterpriseCloud.Monitoring",
@ -51,7 +51,7 @@ def monitor_extension(region: Region, os: OS) -> Extension:
"settings": {"workspaceId": settings["id"]},
"protectedSettings": {"workspaceKey": settings["key"]},
}
elif os == OS.linux:
elif vm_os == OS.linux:
return {
"name": "OMSExtension",
"publisher": "Microsoft.EnterpriseCloud.Monitoring",
@ -62,11 +62,11 @@ def monitor_extension(region: Region, os: OS) -> Extension:
"settings": {"workspaceId": settings["id"]},
"protectedSettings": {"workspaceKey": settings["key"]},
}
raise NotImplementedError("unsupported os: %s" % os)
raise NotImplementedError("unsupported os: %s" % vm_os)
def dependency_extension(region: Region, os: OS) -> Optional[Extension]:
if os == OS.windows:
def dependency_extension(region: Region, vm_os: OS) -> Optional[Extension]:
if vm_os == OS.windows:
extension = {
"name": "DependencyAgentWindows",
"publisher": "Microsoft.Azure.Monitoring.DependencyAgent",
@ -90,13 +90,13 @@ def dependency_extension(region: Region, os: OS) -> Optional[Extension]:
def build_pool_config(pool_name: str) -> str:
agent_config = AgentConfig(
config = AgentConfig(
pool_name=pool_name,
onefuzz_url=get_instance_url(),
instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
heartbeat_queue=get_queue_sas(
"node-heartbeat",
account_id=os.environ["ONEFUZZ_FUNC_STORAGE"],
account_id=get_func_storage(),
add=True,
),
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
@ -105,7 +105,7 @@ def build_pool_config(pool_name: str) -> str:
save_blob(
"vm-scripts",
"%s/config.json" % pool_name,
agent_config.json(),
config.json(),
account_id=get_func_storage(),
)
@ -117,7 +117,7 @@ def build_pool_config(pool_name: str) -> str:
)
def update_managed_scripts(mode: AgentMode) -> None:
def update_managed_scripts() -> None:
commands = [
"azcopy sync '%s' instance-specific-setup"
% (
@ -151,14 +151,14 @@ def update_managed_scripts(mode: AgentMode) -> None:
def agent_config(
region: Region, os: OS, mode: AgentMode, *, urls: Optional[List[str]] = None
region: Region, vm_os: OS, mode: AgentMode, *, urls: Optional[List[str]] = None
) -> Extension:
update_managed_scripts(mode)
update_managed_scripts()
if urls is None:
urls = []
if os == OS.windows:
if vm_os == OS.windows:
urls += [
get_file_sas_url(
"vm-scripts",
@ -200,7 +200,7 @@ def agent_config(
"protectedSettings": {},
}
return extension
elif os == OS.linux:
elif vm_os == OS.linux:
urls += [
get_file_sas_url(
"vm-scripts",
@ -235,13 +235,13 @@ def agent_config(
}
return extension
raise NotImplementedError("unsupported OS: %s" % os)
raise NotImplementedError("unsupported OS: %s" % vm_os)
def fuzz_extensions(region: Region, os: OS, pool_name: str) -> List[Extension]:
def fuzz_extensions(region: Region, vm_os: OS, pool_name: str) -> List[Extension]:
urls = [build_pool_config(pool_name)]
fuzz_extension = agent_config(region, os, AgentMode.fuzz, urls=urls)
extensions = generic_extensions(region, os)
fuzz_extension = agent_config(region, vm_os, AgentMode.fuzz, urls=urls)
extensions = generic_extensions(region, vm_os)
extensions += [fuzz_extension]
return extensions