This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6285

automation: don't create resources when deleting things
ClosedPublic

Authored by indygreg on Apr 19 2019, 8:20 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdd6a9723ae2b: automation: don't create resources when deleting things
Summary

Otherwise running these commands can result in resources being
created. In the case of purge-ec2-resources, we will create
resources only to delete them immediately afterwards!

With this change, purge-ec2-resources now no-ops if no
resources exist.

  1. no-check-commit because foo_bar function name

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 19 2019, 8:20 AM
Closed by commit rHGdd6a9723ae2b: automation: don't create resources when deleting things (authored by indygreg). · Explain WhyMay 15 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15089

contrib/automation/hgautomation/__init__.py

with p.open('w', encoding='ascii') as fh: with p.open('w', encoding='ascii') as fh:
fh.write(password) fh.write(password)
fh.write('\n') fh.write('\n')
p.chmod(0o0600) p.chmod(0o0600)
return password return password
def aws_connection(self, region: str): def aws_connection(self, region: str, ensure_ec2_state: bool=True):
"""Obtain an AWSConnection instance bound to a specific region.""" """Obtain an AWSConnection instance bound to a specific region."""
return AWSConnection(self, region) return AWSConnection(self, region, ensure_ec2_state=ensure_ec2_state)

contrib/automation/hgautomation/aws.py

Write-Output "enabling .NET Framework feature" Write-Output "enabling .NET Framework feature"
Install-WindowsFeature -Name Net-Framework-Core Install-WindowsFeature -Name Net-Framework-Core
''' '''
class AWSConnection: class AWSConnection:
"""Manages the state of a connection with AWS.""" """Manages the state of a connection with AWS."""
def __init__(self, automation, region: str): def __init__(self, automation, region: str, ensure_ec2_state: bool=True):
self.automation = automation self.automation = automation
self.local_state_path = automation.state_path self.local_state_path = automation.state_path
self.prefix = 'hg-' self.prefix = 'hg-'
self.session = boto3.session.Session(region_name=region) self.session = boto3.session.Session(region_name=region)
self.ec2client = self.session.client('ec2') self.ec2client = self.session.client('ec2')
self.ec2resource = self.session.resource('ec2') self.ec2resource = self.session.resource('ec2')
self.iamclient = self.session.client('iam') self.iamclient = self.session.client('iam')
self.iamresource = self.session.resource('iam') self.iamresource = self.session.resource('iam')
self.security_groups = {}
if ensure_ec2_state:
ensure_key_pairs(automation.state_path, self.ec2resource) ensure_key_pairs(automation.state_path, self.ec2resource)
self.security_groups = ensure_security_groups(self.ec2resource) self.security_groups = ensure_security_groups(self.ec2resource)
ensure_iam_state(self.iamresource) ensure_iam_state(self.iamresource)
def key_pair_path_private(self, name): def key_pair_path_private(self, name):
"""Path to a key pair private key file.""" """Path to a key pair private key file."""
return self.local_state_path / 'keys' / ('keypair-%s' % name) return self.local_state_path / 'keys' / ('keypair-%s' % name)
def key_pair_path_public(self, name): def key_pair_path_public(self, name):
return self.local_state_path / 'keys' / ('keypair-%s.pub' % name) return self.local_state_path / 'keys' / ('keypair-%s.pub' % name)

contrib/automation/hgautomation/cli.py

windows.build_wheel(winrm_client, arch, DIST_PATH) windows.build_wheel(winrm_client, arch, DIST_PATH)
windows.purge_hg(winrm_client) windows.purge_hg(winrm_client)
windows.build_inno_installer(winrm_client, arch, DIST_PATH) windows.build_inno_installer(winrm_client, arch, DIST_PATH)
windows.purge_hg(winrm_client) windows.purge_hg(winrm_client)
windows.build_wix_installer(winrm_client, arch, DIST_PATH) windows.build_wix_installer(winrm_client, arch, DIST_PATH)
def terminate_ec2_instances(hga: HGAutomation, aws_region): def terminate_ec2_instances(hga: HGAutomation, aws_region):
c = hga.aws_connection(aws_region) c = hga.aws_connection(aws_region, ensure_ec2_state=False)
aws.terminate_ec2_instances(c.ec2resource) aws.terminate_ec2_instances(c.ec2resource)
def purge_ec2_resources(hga: HGAutomation, aws_region): def purge_ec2_resources(hga: HGAutomation, aws_region):
c = hga.aws_connection(aws_region) c = hga.aws_connection(aws_region, ensure_ec2_state=False)
aws.remove_resources(c) aws.remove_resources(c)
def run_tests_windows(hga: HGAutomation, aws_region, instance_type, def run_tests_windows(hga: HGAutomation, aws_region, instance_type,
python_version, arch, test_flags): python_version, arch, test_flags):
c = hga.aws_connection(aws_region) c = hga.aws_connection(aws_region)
image = aws.ensure_windows_dev_ami(c) image = aws.ensure_windows_dev_ami(c)