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

Always use the get_*_account helper methods (#226)

Browse Source
This commit is contained in:
bmc-msft
2020-10-28 21:40:21 -04:00
committed by GitHub
parent 0d037f7bf2
commit f4b874e19e
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api-service/__app__/onefuzzlib/proxy.py
View File

@ -5,7 +5,6 @@
import datetime
import logging
import os
from typing import List, Optional, Tuple
from azure.mgmt.compute.models import VirtualMachine
@ -23,6 +22,7 @@ from pydantic import Field
from .__version__ import __version__
from .azure.auth import build_auth
from .azure.containers import get_file_sas_url, save_blob
from .azure.creds import get_func_storage
from .azure.ip import get_public_ip
from .azure.queue import get_queue_sas
from .azure.vm import VM
@ -191,12 +191,12 @@ class Proxy(ORMMixin):
url=get_file_sas_url(
"proxy-configs",
"%s/config.json" % self.region,
account_id=os.environ["ONEFUZZ_FUNC_STORAGE"],
account_id=get_func_storage(),
read=True,
),
notification=get_queue_sas(
"proxy",
account_id=os.environ["ONEFUZZ_FUNC_STORAGE"],
account_id=get_func_storage(),
add=True,
),
forwards=forwards,
@ -207,7 +207,7 @@ class Proxy(ORMMixin):
"proxy-configs",
"%s/config.json" % self.region,
proxy_config.json(),
account_id=os.environ["ONEFUZZ_FUNC_STORAGE"],
account_id=get_func_storage(),
)
@classmethod

4
src/api-service/__app__/onefuzzlib/tasks/config.py
View File

@ -12,7 +12,7 @@ from onefuzztypes.enums import Compare, ContainerPermission, ContainerType, Task
from onefuzztypes.models import TaskConfig, TaskDefinition, TaskUnitConfig
from ..azure.containers import blob_exists, container_exists, get_container_sas_url
from ..azure.creds import get_fuzz_storage, get_instance_url
from ..azure.creds import get_func_storage, get_fuzz_storage, get_instance_url
from ..azure.queue import get_queue_sas
from .defs import TASK_DEFINITIONS
@ -183,7 +183,7 @@ def build_task_config(
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
heartbeat_queue=get_queue_sas(
"task-heartbeat",
account_id=os.environ["ONEFUZZ_FUNC_STORAGE"],
account_id=get_func_storage(),
add=True,
),
back_channel_address="https://%s/api/back_channel" % (get_instance_url()),