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

Adding New Default Image Config Value to IC. (#2434)

Browse Source 
* Adding New Default Image Config Value to IC.

* Removing forced image setting.

* Updating Webhook Events.

* Removing typo.

* Updating webhook_events again.

* Syncing webhook events.

* Fixing check for os type.

* Fixing import.

* PR Suggestions.

* Fix C# Model Typo.

* Removing other refs to images.

* Removing remaining refs to images outside of models.

* Removing hardcoded image values from tests.

* Update Default Proxy and Repro Images.

Co-authored-by: Marc Greisen <mgreisen@microsoft.com>
This commit is contained in:
Noah McGregor Harper
2022-09-23 10:40:44 -07:00
committed by GitHub
parent dc2c4649c8
commit 3f35d81f4b
15 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/onefuzz/api.py
View File

@ -48,9 +48,6 @@ ONEFUZZ_GUID_NAMESPACE = uuid.UUID("27f25e3f-6544-4b69-b309-9b096c5a9cbc")
ONE_HOUR_IN_SECONDS = 3600
DEFAULT_LINUX_IMAGE = "Canonical:UbuntuServer:18.04-LTS:latest"
DEFAULT_WINDOWS_IMAGE = "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest"
REPRO_SSH_FORWARD = "1337:127.0.0.1:1337"
UUID_RE = r"^[a-f0-9]{8}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{12}\Z"
@ -1424,15 +1421,6 @@ class Scaleset(Endpoint):
if tags is None:
tags = {}
if image is None:
pool = self.onefuzz.pools.get(pool_name)
if pool.os == enums.OS.linux:
image = DEFAULT_LINUX_IMAGE
elif pool.os == enums.OS.windows:
image = DEFAULT_WINDOWS_IMAGE
else:
raise NotImplementedError
auto_scale = requests.AutoScaleOptions(
min=min_instances,
max=max_size,

9
src/cli/onefuzz/templates/__init__.py
View File

@ -16,8 +16,6 @@ from onefuzztypes.primitives import Container, Directory, File
from ..job_templates.job_monitor import JobMonitor
ELF_MAGIC = b"\x7fELF"
DEFAULT_LINUX_IMAGE = "Canonical:UbuntuServer:18.04-LTS:latest"
DEFAULT_WINDOWS_IMAGE = "MicrosoftWindowsDesktop:Windows-10:win10-21h2-pro:latest"
class StoppedEarly(Exception):
@ -177,13 +175,6 @@ class JobHelper:
self.containers[ContainerType.inputs], Directory(tmp_dir)
)
@classmethod
def get_image(_cls, platform: OS) -> str:
if platform == OS.linux:
return DEFAULT_LINUX_IMAGE
else:
return DEFAULT_WINDOWS_IMAGE
@classmethod
def get_platform(_cls, target_exe: File) -> OS:
with open(target_exe, "rb") as handle: