Skip the termination of ec2_stop instances #764
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ebattat
reviewed
Apr 26, 2024
| @@ -92,7 +92,7 @@ def __fetch_stop_instance(self, instance_days: int, delete_instance_days: int, s | |||
| delta_charge = self.get_ebs_cost(resource=block_device_mappings[instance_id], resource_type='ec2', resource_hours=(self.DAILY_HOURS * (self.DELETE_INSTANCE_DAYS-self.DAYS_TO_NOTIFY_ADMINS))) | |||
| stop_cost = self.get_ebs_cost(resource=block_device_mappings[instance_id], resource_type='ec2', resource_hours=(self.DAILY_HOURS * days)) | |||
| self.__trigger_mail(tags=tags, stopped_time=stopped_time, days=days, resource_id=instance_id, image_id=ami_id, ec2_type=ec2_types[instance_id], instance_id=instance_id, message_type='delete', stop_cost=stop_cost, delta_charge=delta_charge) | |||
| self._ec2_client.terminate_instances(InstanceIds=[instance_id]) | |||
| # self._ec2_client.terminate_instances(InstanceIds=[instance_id]) | |||
There was a problem hiding this comment.
Are we going to do snapshot backup ?
There was a problem hiding this comment.
yes, commented ami too.
athiruma
force-pushed
the
not_action_ec2_stop
branch
from
0b193b3 to
d2303c4
Compare
ebattat
reviewed
Apr 26, 2024
| @@ -87,15 +87,15 @@ def __fetch_stop_instance(self, instance_days: int, delete_instance_days: int, s | |||
| tag_specifications = [{'ResourceType': 'image', 'Tags': tags}] | |||
| if sign == ge: | |||
| tag_specifications.append({'ResourceType': 'snapshot', 'Tags': tags}) | |||
| try: | |||
There was a problem hiding this comment.
Pls add also comment why we comment out this part, so we will know the reason.
"Comment out termination code to reduce the risk of unintended terminations"
athiruma
force-pushed
the
not_action_ec2_stop
branch
from
d2303c4 to
b2d9ec9
Compare
ebattat
approved these changes
Apr 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Note: Fill x in []
Description
For security reasons, all pull requests need to be approved first before running any automated CI