Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Migrate 'amazonec2' driver to AWS SDK #2684

Merged
merged 4 commits into from
Dec 28, 2015
Merged

Conversation

jeanlaurent
Copy link
Member

This takes the PR #1850 from @euank and rebase it on current master. ( fixes #858 )
Oh, btw this fixes #1571 as restart is now properly handled.

This is an LGTM on @euank commits. I added a cleanup commit, which I let @docker/machine-maintainers appreciate.

euank and others added 4 commits December 24, 2015 15:57
This does an almost 1-to-1 translation of API calls.

The differences are as follows:
1. Use the SDK waiter for spot instance request fulfillment
2. Uses the toplevel private/public ip fields instead of the
   networkinterface's fields
3. Recognizes the 'Terminated' state as an error explicitly instead of
   implicitly.
4. Uses filters on DescribeSecurityGroups to find the correct one more
   efficiently and to limit to a given VPC.

Other than that, it really should be identical apart from the perhaps
obvious error message differences.

Signed-off-by: Euan <euank@euank.com>
Signed-off-by: Euan <euank@euank.com>
Deprecated by the conversion to the upstream SDK

Signed-off-by: Euan <euank@euank.com>
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
@dgageot
Copy link
Member

dgageot commented Dec 24, 2015

@jeanlaurent @euank Will review it on Monday

@euank
Copy link
Contributor

euank commented Dec 24, 2015

Your additional change LGTM. Thanks! I would have been happy to make those changes if you asked on my PR, but this works as well.

@jeanlaurent
Copy link
Member Author

@euank I wanted this PR to go with the next release ( next Monday ). And wasn't that comfortable to ask for a quick rebase, considering this is holiday time & we didn't find the time before to handle your PR.

But good to know. I believe there is quite a bunch of PR enhancing the ec2 drivers that will be impacted.

@dgageot
Copy link
Member

dgageot commented Dec 28, 2015

LGTM

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EC2: docker-machine restart does not perform a reboot Replace AWS driver
4 participants