Upgrade boto to boto3 in deployment scripts

deployment/cloudformation/privatehostedzone.py

@@ -1,9 +1,8 @@
-from boto import route53
-
 from majorkirby import CustomActionNode
 
 import json
-
+import boto3
+import uuid
 
 class R53PrivateHostedZone(CustomActionNode):
     """Represents a Route53 private hosted zone"""
@@ -19,21 +18,32 @@ class R53PrivateHostedZone(CustomActionNode):
 
     def action(self):
         """Creates the zone"""
-        conn = route53.connect_to_region(self.REGION)
+        client = boto3.client('route53', region_name=self.REGION)
         comment = json.dumps(self.get_raw_tags())
 
-        hosted_zones = conn.get_all_hosted_zones()
+        hosted_zones = client.list_hosted_zones()
 
-        for hosted_zone in hosted_zones['ListHostedZonesResponse']['HostedZones']:
+        for hosted_zone in hosted_zones['HostedZones']:
             if ('Comment' in hosted_zone['Config'] and
                     hosted_zone['Config']['Comment'] == comment):
                 self.stack_outputs = {'PrivateHostedZoneId': hosted_zone['Id'].split('/')[-1]}
                 return
-
-        hosted_zone = conn.create_hosted_zone(self.get_input('PrivateHostedZoneName'),
-                                              comment=comment,
-                                              private_zone=True,
-                                              vpc_id=self.get_input('VpcId'),
-                                              vpc_region=self.REGION)
+
+        vpc_config = {
+            'VPCRegion': self.REGION,
+            'VPCId': self.get_input("VpcId")
+        }
+        hosted_zone_config = {
+            'Comment': comment,
+            'PrivateZone': True
+        }
+
+        hosted_zone = client.create_hosted_zone(
+            Name=self.get_input("PrivateHostedZoneName"),
+            CallerReference=str(uuid.uuid4()),
+            HostedZoneConfig=hosted_zone_config,
+            VPC=vpc_config,
+        )
         hosted_zone_id = hosted_zone['CreateHostedZoneResponse']['HostedZone']['Id']
         self.stack_outputs = {'PrivateHostedZoneId': hosted_zone_id.split('/')[-1]}
+

deployment/cloudformation/utils/cfn.py

@@ -1,5 +1,5 @@
 """Helper functions and classes for dealing with cloudformation"""
-import boto
+import boto3
 
 
 class AvailabilityZone(object):
@@ -15,7 +15,6 @@ def __init__(self, availability_zone):
         Args:
         availability_zone (AvailabilityZone): boto object
         """
-
         self.availability_zone = availability_zone
 
     @property
@@ -24,12 +23,12 @@ def cfn_name(self):
         Utility method to return a string appropriate for CloudFormation
         name of a resource (e.g. UsEast1a)
         """
-        return self.availability_zone.name.title().replace('-', '')
+        return self.availability_zone['ZoneName'].title().replace('-', '')
 
     @property
     def name(self):
         """Utility function to return the name of an availability zone (e.g. us-east-1a)"""
-        return self.availability_zone.name
+        return self.availability_zone['ZoneName']
 
 
 def get_availability_zones():
@@ -38,5 +37,5 @@ def get_availability_zones():
     Returns:
       (list of AvailabilityZone): List of availability zones for a given EC2 region
     """
-    conn = boto.connect_ec2()
-    return  [AvailabilityZone(az) for az in conn.get_all_zones()]
+    client = boto3.client('ec2', region_name='us-east-1')
+    return  [AvailabilityZone(az) for az in client.describe_availability_zones()['AvailabilityZones']]

python/cac_tripplanner/deployment_requirements.txt

@@ -1,5 +1,6 @@
-boto==2.49.0
+boto3==1.15.9
 PyYAML==5.3.1
 majorkirby==1.0.0
 requests==2.24.0
 troposphere==3.2.2
+uuid==1.30.0