Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding check to the key-pair #1058

Merged
merged 1 commit into from Dec 4, 2018
Merged

adding check to the key-pair #1058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions nixops/resources/ec2_keypair.py
View file
Open in desktop
Expand Up @@ -127,3 +127,12 @@ def keypair_used():
self._conn.delete_key_pair(self.keypair_name)

return True

def check(self):
self.connect()
try:
kp = self._conn.get_key_pair(self.keypair_name)
except IndexError as e:
kp = None
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could set the state to missing directly right ?

Suggested change
kp = None
self.state = self.MISSING

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, we need to check if the kp = None even when the IndexError exception wasn't caught. We can take as an example the use case where the get_key_pair returns None without an exception occurring, then we need to set the state to MISSING.

if kp is None:
self.state = self.MISSING