737 Commits

Author SHA1 Message Date
Gordon Irving
6da22f9fa4 fix adding tags to vpc created by cloudformation 2017-12-28 19:04:37 +00:00
Nuwan Goonasekera
c68cd650e7 Make sure invalid or malformed AMIs raise an exception
Closes: https://github.com/spulec/moto/issues/1408
2017-12-22 18:50:22 +05:30
Chris Tomlinson
499857e67f Fix co-operative inheritance for ec2 model (#1383) 2017-12-08 21:00:34 +00:00
William Richard
92f5f7b263 Add cloudformation update from s3 support (#1377)
* Fix variable name typo

* Make it possible to delete EC2 instances from cloudformation json

* Add support for updating a cloudformation stack from an s3 template url
2017-12-08 10:48:29 +00:00
Enis Afgan
0c01c7f495 Allow AMIs to be read from a custom file path (#1379) 2017-12-06 10:14:56 +00:00
Pierre Tardy
d8f6f77a0f Fix prebuilt images usability. (#1375)
- add a better error message when user uses an unknown ami
- add image_location in the default fake images

Fixes #1372
2017-12-05 09:22:13 +00:00
Archa91
474023f9a1 fix EC2 instances ebsOptimized not handled (#1340)
* fix EC2 instances ebsOptimized not handled

* add test_create_instance_ebs_optimized
2017-11-14 14:31:54 +00:00
mickeypash
98fa083586 Merge remote-tracking branch 'upstream/master' 2017-11-13 19:59:51 +00:00
mickeypash
d5b841fb6c Fixing volume.attachment is None 2017-11-13 19:58:21 +00:00
Terry Cain
bd8c1e4567
adding owner id to amis v2 (#1331)
* Adding owner-id/OwnerId to the AMI classes to allow the value to be specified to test filtering images based on owner.

* Added default AMIs and filtering by owner-id

* Fixed some tests

* Fixed more random tests

* Updated MANIFEST

* .
2017-11-12 11:18:25 +00:00
Florent Rivoire
6e199d35b3 Use pkg_resources to keep the package zip-safe (#1308) 2017-11-07 13:29:24 +00:00
Terry Cain
9ddf7fe436
Fixed some tests.
Some subnets were bogus so fixed that. Fixed issue where EC2-Classic was not respected.
RDS Deepcopy was breaking on subnet generator
2017-10-25 19:29:56 +01:00
Terry Cain
5b0e463554
Fixed a few ip issues
Fixes #1175
2017-10-24 23:57:43 +01:00
mickeypash
15a1bc43a9 Merge remote-tracking branch 'upstream/master' 2017-10-23 19:16:08 +01:00
mickeypash
4a402b01cf Correct response when trying to delete a volume that is attached to an EC2 instance. Created a VolumeInUse error and did a simple check on the delete_volume method. 2017-10-23 19:12:49 +01:00
David Morrison
becf0a1d3d fix deep-copy in ec2.models.all_reservations 2017-10-23 09:53:02 -07:00
Terry Cain
f3623e3cd3 Fix for #1258 (#1260)
* Fix for #1258

* Updated doc link
2017-10-12 13:59:02 -07:00
Jack Danger
731bb39fe1 Merge pull request #1239 from terrycain/new_ec2_instance_id_style
Use long format for EC2 instance ID
2017-10-07 20:31:06 -07:00
William Johansson
88fb732302 Support wildcard tag filters on SecurityGroups 2017-10-06 21:55:01 +02:00
David Morrison
3d3d0e916e minor bugfixes and added tests 2017-10-05 18:46:58 -07:00
David Morrison
8ca7ccfcb5 add support for the modify_spot_fleet_request operation 2017-10-05 12:50:42 -07:00
Terry Cain
93b8da0437
Use long format for EC2 instance ID 2017-10-04 01:21:30 +01:00
Alexander Mohr
9008b85299 lambda + SNS enhancements (#1048)
* updates

- support lambda messages from SNS
- run lambda in docker container

* decode output

* populate timeout

* simplify

* whoops

* skeletons of cloudwatchlogs

* impl filter log streams

* fix logging

* PEP fixes

* PEP fixes

* fix reset

* fix reset

* add new endpoint

* fix region name

* add docker

* try to fix tests

* try to fix travis issue with boto

* fix escaping in urls

* fix environment variables

* fix PEP

* more pep

* switch back to precise

* another fix attempt

* fix typo

* fix lambda invoke

* fix more unittests

* work on getting this to work in new scheme

* fix py2

* fix error

* fix tests when running in server mode

* more lambda fixes

* try running with latest docker

adapted from aiodocker

* switch to docker python client

* pep fixes

* switch to docker volume

* fix unittest

* fix invoke from sns

* fix zip2tar

* add hack impl for get_function with zip

* try fix

* fix for py < 3.6

* add volume refcount

* try to fix travis

* docker test

* fix yaml

* try fix

* update endpoints

* fix

* another attempt

* try again

* fix recursive import

* refactor fix

* revert changes with better fix

* more reverts

* wait for service to come up

* add back detached mode

* sleep and add another exception type

* put this back for logging

* put back with note

* whoops :)

* docker in docker!

* fix invalid url

* hopefully last fix!

* fix lambda regions

* fix protocol

* travis!!!!

* just run lambda test for now

* use one print

* fix escaping

* another attempt

* yet another

* re-enable all tests

* fixes

* fix for py2

* revert change

* fix for py2.7

* fix output ordering

* remove this given there's a new unittest that covers it

* changes based on review

- add skeleton logs test file
- switch to docker image that matches test env
- fix mock_logs import

* add readme entry
2017-09-27 16:04:58 -07:00
Jack Danger
53d8d48e88 Revert "Merge pull request #1209 from JackDanger/jack/store-as-python"
This reverts commit 2a3fdf6b642d471391dff23ad06f9b1a74f5939d, reversing
changes made to a06145d7816ca7778b39f792b4fe99439ed0cc41.
2017-09-27 13:58:56 -07:00
Jack Danger
4c1d0c3f5f Store JSON in Python for instance types
This allows it to be bundled in the distributed app more simply
2017-09-27 13:50:48 -07:00
Jack Danger
72243f7b7b Merge pull request #1201 from gvlproject/fix_console_filter_regression
Fix for regression in get_console_output()
2017-09-27 11:07:30 -07:00
Terry Cain
c888d65d6d
Added constant containing instance types 2017-09-27 17:29:58 +01:00
Terry Cain
6feaced0bf
Script to get instance info 2017-09-27 17:27:36 +01:00
Nuwan Goonasekera
5b01071bd4 Fix for regression in get_console_output() 2017-09-27 20:26:45 +05:30
Nuwan Goonasekera
ca56955a97 Added invalid id exceptions when filtering vpcs and subnets 2017-09-18 23:38:39 +05:30
Nuwan Goonasekera
08c4eff0b2 Added invalid id exceptions when filtering snapshots and volumes 2017-09-18 23:38:04 +05:30
Nuwan Goonasekera
298772ca92 Raise InvalidGroup.NotFound in DescribeSecurityGroups 2017-09-18 19:51:01 +05:30
Jack Danger
35feb9feb7 Merge pull request #1150 from gvlproject/refactor_filtering
Refactored handling of unknown filter names
2017-09-16 12:07:13 -07:00
Jack Danger
a7049acf70 Merge pull request #1149 from gvlproject/fix_disassociate_address
Fix for instance public ip not being cleared on eip disassociation
2017-09-16 06:43:45 -07:00
Nuwan Goonasekera
7ed1036ba8 Replaced direct querystring access with inherited _get_param 2017-09-16 19:05:32 +05:30
Nuwan Goonasekera
17d62d9266 Replaced redundant sequence_from_querystring with inherited _get_multi_param 2017-09-16 17:08:21 +05:30
Nuwan Goonasekera
6c7b0bdea0 Refactored handling of unknown filter names 2017-09-16 13:56:07 +05:30
Nuwan Goonasekera
0953ddde51 Fix for instance public ip not being cleared on eip disassociation 2017-09-16 12:26:43 +05:30
Jack Danger
b3ce255eee Merge pull request #1148 from gvlproject/vpc_address_filtering
Improved support for VPC Address filtering
2017-09-15 14:22:21 -07:00
Nuwan Goonasekera
8776129816 Improved support for VPC Address filtering 2017-09-16 01:49:57 +05:30
Nuwan Goonasekera
c116c57eb8 Ensure root device is listed in block device mappings 2017-09-15 21:30:32 +05:30
Nuwan Goonasekera
d0c610c5ac Added keypair filtering 2017-09-14 14:59:13 +05:30
Jack Danger
d2a234f75d falling back to use nic' 2017-09-08 16:30:21 -07:00
Jack Danger
5a03497367 rendering vpc_id in ec2 responses 2017-09-08 15:07:44 -07:00
Daniel Lutsch
1f6b1b8c4a Add list support to filters (#1083)
* initial pass with TODOs

* add list support to get_object_value

* fix group-id filters

* add tests for sg name and id filters
2017-08-25 23:43:29 -07:00
Daniel Lutsch
945b984538 Add private-dns-name filter and fix regional DNS (#1076)
* add private-dns-name to filter_dict_attribute_mapping

* add region_name attribute to Instance and InstanceResponse

* set dns name based on region

* test private-dns-name and network-interface.private-dns-name filters. checking both regional dns formats

* update test_ec2_classic_has_public_ip_address to use correct dns values
2017-08-23 01:39:50 -07:00
Jack Danger
074ff68bf1 Merge pull request #1016 from JackDanger/elb-security-groups
Implementing ELB apply_security_groups_to_load_balancer
2017-07-19 17:41:53 -07:00
Jack Danger
6ed8d12317 Enforcing ELB security groups must be real 2017-07-19 15:58:49 -07:00
Christian Hellman
63b09eae13 Added DescribeAccountAttributes 2017-07-17 23:33:40 +00:00
Jeff Hardy
4e2f775c1f Use region list from Boto.
Boto can be configured with extra regions, but moto will fail to import
if they are not in the hardcoded list in ec2/models.py. Instead, use the
region list from boto to build the ec2_backends dict to ensure all
regions are available.
2017-05-26 12:47:28 -07:00