Update AWS configuration names

Author: Octogonapus

axon/client.py

@@ -160,7 +160,7 @@ def ensure_ecs_security_group(region):
     :param region: The region, or `None` to pull the region from the environment.
     :return: The GroupId of the SecurityGroup.
     """
-    sg_name = "axon-ecs-autogenerated"
+    sg_name = "axon-autogenerated-sg-ecs"
     client = make_client("ec2", region)
     sg_id = get_single_security_group(client, sg_name, "Axon autogenerated for ECS.")
     ensure_ecs_gress(sg_id, region)
@@ -173,7 +173,7 @@ def ensure_ec2_security_group(region):
     :param region: The region, or `None` to pull the region from the environment.
     :return: The GroupId of the SecurityGroup.
     """
-    sg_name = "axon-ec2-autogenerated"
+    sg_name = "axon-autogenerated-sg-ec2"
     client = make_client("ec2", region)
     sg_id = get_single_security_group(client, sg_name, "Axon autogenerated for EC2.")
     ensure_ec2_gress(sg_id, region)
@@ -221,7 +221,7 @@ def ensure_task_role(region):
     :param region: The region, or `None` to pull the region from the environment.
     :return: The role Arn.
     """
-    role_name = "axon-ecs-autogenerated-task-role"
+    role_name = "axon-autogenerated-ecs-task-role"
     client = make_client("iam", region)
     role_arn = ensure_role(client, role_name)
     if role_arn is None:
@@ -253,12 +253,10 @@ def ensure_task_role(region):
                                   PolicyArn="arn:aws:iam::aws:policy/AmazonEC2FullAccess")
         client.attach_role_policy(RoleName=role_name,
                                   PolicyArn="arn:aws:iam::aws:policy/AmazonS3FullAccess")
-        client.attach_role_policy(RoleName=role_name,
-                                  PolicyArn="arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess")
     return role_arn
 
 
-def ensure_ec2_role(region, role_name="axon-ec2-autogenerated-role"):
+def ensure_ec2_role(region, role_name="axon-autogenerated-ec2-role"):
     """
     Ensures the EC2 role exists. Creates the role if it does not exist.
 
@@ -295,8 +293,8 @@ def ensure_ec2_role(region, role_name="axon-ec2-autogenerated-role"):
     return role_arn
 
 
-def ensure_ec2_instance_profile(region, profile_name="axon-ec2-autogenerated-instance-profile",
-                                role_name="axon-ec2-autogenerated-role"):
+def ensure_ec2_instance_profile(region, profile_name="axon-autogenerated-ec2-instance-profile",
+                                role_name="axon-autogenerated-ec2-role"):
     """
     Ensures the EC2 instance profile exists and has the EC2 role attached.
 
@@ -656,7 +654,7 @@ def impl_upload_dataset(dataset_name, bucket_name, region):
     :param region: The region, or `None` to pull the region from the environment.
     """
     client = make_client("s3", region)
-    remote_path = "axon-uploaded-datasets/" + os.path.basename(dataset_name)
+    remote_path = "axon-datasets/" + os.path.basename(dataset_name)
     client.upload_file(dataset_name, bucket_name, remote_path)
     print("Uploaded to: {}\n".format(remote_path))
 
@@ -670,7 +668,7 @@ def impl_download_dataset(dataset_name, bucket_name, region):
     :param region: The region, or `None` to pull the region from the environment.
     """
     client = make_client("s3", region)
-    remote_path = "axon-uploaded-datasets/" + os.path.basename(dataset_name)
+    remote_path = "axon-datasets/" + os.path.basename(dataset_name)
     client.download_file(bucket_name, remote_path, dataset_name)
     print("Downloaded from: {}\n".format(remote_path))