Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2723 from rossjones/remove-resource-warnings

Browse Source 
Remove ResourceWarnings when loading AMIS and INSTANCE_TYPES
This commit is contained in:
Bert Blommers 2020-02-04 10:52:48 +00:00 committed by GitHub
commit 152ad8b82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moto/ec2/models.py
View File

@ -139,17 +139,22 @@ from .utils import (
rsa_public_key_fingerprint, rsa_public_key_fingerprint,
) )
INSTANCE_TYPES = json.load(
open(resource_filename(__name__, "resources/instance_types.json"), "r") def _load_resource(filename):
with open(filename, "r") as f:
return json.load(f)
INSTANCE_TYPES = _load_resource(
resource_filename(__name__, "resources/instance_types.json")
) )
AMIS = json.load(
open( AMIS = _load_resource(
os.environ.get("MOTO_AMIS_PATH") os.environ.get("MOTO_AMIS_PATH")
or resource_filename(__name__, "resources/amis.json"), or resource_filename(__name__, "resources/amis.json"),
"r",
)
) )
OWNER_ID = "111122223333" OWNER_ID = "111122223333"