Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting fixes

Browse Source
This commit is contained in:
Fabio Dias 2019-12-15 20:11:38 -05:00
parent bc615797b1
commit fb9ebe5a47
8 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/awslambda/models.py
View File

@ -42,11 +42,10 @@ from .utils import make_function_arn, make_function_ver_arn
from moto.sqs import sqs_backends from moto.sqs import sqs_backends
from moto.dynamodb2 import dynamodb_backends2 from moto.dynamodb2 import dynamodb_backends2
from moto.dynamodbstreams import dynamodbstreams_backends from moto.dynamodbstreams import dynamodbstreams_backends
from moto.iam.models import ACCOUNT_ID
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
from moto.iam.models import ACCOUNT_ID
try: try:
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory

4
moto/cloudformation/responses.py
View File

@ -1056,7 +1056,7 @@ DESCRIBE_STACKSET_OPERATION_RESPONSE_TEMPLATE = """<DescribeStackSetOperationRes
<DescribeStackSetOperationResult> <DescribeStackSetOperationResult>
<StackSetOperation> <StackSetOperation>
<ExecutionRoleName>{{ stackset.execution_role }}</ExecutionRoleName> <ExecutionRoleName>{{ stackset.execution_role }}</ExecutionRoleName>
<AdministrationRoleARN>arn:aws:iam::"""+ACCOUNT_ID+""":role/{{ stackset.admin_role }}</AdministrationRoleARN> <AdministrationRoleARN>arn:aws:iam::""" + ACCOUNT_ID + """:role/{{ stackset.admin_role }}</AdministrationRoleARN>
<StackSetId>{{ stackset.id }}</StackSetId> <StackSetId>{{ stackset.id }}</StackSetId>
<CreationTimestamp>{{ operation.CreationTimestamp }}</CreationTimestamp> <CreationTimestamp>{{ operation.CreationTimestamp }}</CreationTimestamp>
<OperationId>{{ operation.OperationId }}</OperationId> <OperationId>{{ operation.OperationId }}</OperationId>
@ -1081,7 +1081,7 @@ LIST_STACK_SET_OPERATION_RESULTS_RESPONSE_TEMPLATE = """<ListStackSetOperationRe
{% for account, region in instance.items() %} {% for account, region in instance.items() %}
<member> <member>
<AccountGateResult> <AccountGateResult>
<StatusReason>Function not found: arn:aws:lambda:us-west-2:"""+ACCOUNT_ID+""":function:AWSCloudFormationStackSetAccountGate</StatusReason> <StatusReason>Function not found: arn:aws:lambda:us-west-2:""" + ACCOUNT_ID + """:function:AWSCloudFormationStackSetAccountGate</StatusReason>
<Status>SKIPPED</Status> <Status>SKIPPED</Status>
</AccountGateResult> </AccountGateResult>
<Region>{{ region }}</Region> <Region>{{ region }}</Region>

18
moto/ec2/responses/instances.py
View File

@ -249,7 +249,7 @@ class InstanceResponse(BaseResponse):
EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/"> EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
<requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
<reservationId>{{ reservation.id }}</reservationId> <reservationId>{{ reservation.id }}</reservationId>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<groupSet> <groupSet>
<item> <item>
<groupId>sg-245f6a01</groupId> <groupId>sg-245f6a01</groupId>
@ -331,7 +331,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
<vpcId>{{ nic.subnet.vpc_id }}</vpcId> <vpcId>{{ nic.subnet.vpc_id }}</vpcId>
{% endif %} {% endif %}
<description>Primary network interface</description> <description>Primary network interface</description>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<status>in-use</status> <status>in-use</status>
<macAddress>1b:2b:3c:4d:5e:6f</macAddress> <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
<privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress> <privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress>
@ -354,7 +354,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>"""+ACCOUNT_ID+"""</ipOwnerId> <ipOwnerId>""" + ACCOUNT_ID + """</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
<privateIpAddressesSet> <privateIpAddressesSet>
@ -364,7 +364,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>"""+ACCOUNT_ID+"""</ipOwnerId> <ipOwnerId>""" + ACCOUNT_ID + """</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
</item> </item>
@ -383,7 +383,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% for reservation in reservations %} {% for reservation in reservations %}
<item> <item>
<reservationId>{{ reservation.id }}</reservationId> <reservationId>{{ reservation.id }}</reservationId>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<groupSet> <groupSet>
{% for group in reservation.dynamic_group_list %} {% for group in reservation.dynamic_group_list %}
<item> <item>
@ -476,7 +476,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% endfor %} {% endfor %}
</blockDeviceMapping> </blockDeviceMapping>
<virtualizationType>{{ instance.virtualization_type }}</virtualizationType> <virtualizationType>{{ instance.virtualization_type }}</virtualizationType>
<clientToken>ABCDE"""+ACCOUNT_ID+"""3</clientToken> <clientToken>ABCDE""" + ACCOUNT_ID + """3</clientToken>
{% if instance.get_tags() %} {% if instance.get_tags() %}
<tagSet> <tagSet>
{% for tag in instance.get_tags() %} {% for tag in instance.get_tags() %}
@ -499,7 +499,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<vpcId>{{ nic.subnet.vpc_id }}</vpcId> <vpcId>{{ nic.subnet.vpc_id }}</vpcId>
{% endif %} {% endif %}
<description>Primary network interface</description> <description>Primary network interface</description>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<status>in-use</status> <status>in-use</status>
<macAddress>1b:2b:3c:4d:5e:6f</macAddress> <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
<privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress> <privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress>
@ -526,7 +526,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>"""+ACCOUNT_ID+"""</ipOwnerId> <ipOwnerId>""" + ACCOUNT_ID + """</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
<privateIpAddressesSet> <privateIpAddressesSet>
@ -536,7 +536,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>"""+ACCOUNT_ID+"""</ipOwnerId> <ipOwnerId>""" + ACCOUNT_ID + """</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
</item> </item>

6
moto/ec2/responses/security_groups.py
View File

@ -177,7 +177,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<securityGroupInfo> <securityGroupInfo>
{% for group in groups %} {% for group in groups %}
<item> <item>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<groupId>{{ group.id }}</groupId> <groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName> <groupName>{{ group.name }}</groupName>
<groupDescription>{{ group.description }}</groupDescription> <groupDescription>{{ group.description }}</groupDescription>
@ -197,7 +197,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<groups> <groups>
{% for source_group in rule.source_groups %} {% for source_group in rule.source_groups %}
<item> <item>
<userId>"""+ACCOUNT_ID+"""</userId> <userId>""" + ACCOUNT_ID + """</userId>
<groupId>{{ source_group.id }}</groupId> <groupId>{{ source_group.id }}</groupId>
<groupName>{{ source_group.name }}</groupName> <groupName>{{ source_group.name }}</groupName>
</item> </item>
@ -226,7 +226,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<groups> <groups>
{% for source_group in rule.source_groups %} {% for source_group in rule.source_groups %}
<item> <item>
<userId>"""+ACCOUNT_ID+"""</userId> <userId>""" + ACCOUNT_ID + """</userId>
<groupId>{{ source_group.id }}</groupId> <groupId>{{ source_group.id }}</groupId>
<groupName>{{ source_group.name }}</groupName> <groupName>{{ source_group.name }}</groupName>
</item> </item>

7
moto/ec2/responses/vpc_peering_connections.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
from moto.iam.models import ACCOUNT_ID from moto.iam.models import ACCOUNT_ID
class VPCPeeringConnections(BaseResponse): class VPCPeeringConnections(BaseResponse):
def create_vpc_peering_connection(self): def create_vpc_peering_connection(self):
peer_region = self._get_param("PeerRegion") peer_region = self._get_param("PeerRegion")
@ -56,7 +57,7 @@ CREATE_VPC_PEERING_CONNECTION_RESPONSE = """
</peeringOptions> </peeringOptions>
</requesterVpcInfo> </requesterVpcInfo>
<accepterVpcInfo> <accepterVpcInfo>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId> <vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId>
</accepterVpcInfo> </accepterVpcInfo>
<status> <status>
@ -82,7 +83,7 @@ DESCRIBE_VPC_PEERING_CONNECTIONS_RESPONSE = """
<cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock> <cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock>
</requesterVpcInfo> </requesterVpcInfo>
<accepterVpcInfo> <accepterVpcInfo>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId> <vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId>
<cidrBlock>{{ vpc_pcx.peer_vpc.cidr_block }}</cidrBlock> <cidrBlock>{{ vpc_pcx.peer_vpc.cidr_block }}</cidrBlock>
<peeringOptions> <peeringOptions>
@ -120,7 +121,7 @@ ACCEPT_VPC_PEERING_CONNECTION_RESPONSE = """
<cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock> <cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock>
</requesterVpcInfo> </requesterVpcInfo>
<accepterVpcInfo> <accepterVpcInfo>
<ownerId>"""+ACCOUNT_ID+"""</ownerId> <ownerId>""" + ACCOUNT_ID + """</ownerId>
<vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId> <vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId>
<cidrBlock>{{ vpc_pcx.peer_vpc.cidr_block }}</cidrBlock> <cidrBlock>{{ vpc_pcx.peer_vpc.cidr_block }}</cidrBlock>
<peeringOptions> <peeringOptions>

2
moto/iam/models.py
View File

@ -45,7 +45,7 @@ from .utils import (
random_policy_id, random_policy_id,
) )
ACCOUNT_ID = '123456789012' #make sure this is a str and not an int ACCOUNT_ID = '123456789012'
class MFADevice(object): class MFADevice(object):

4
moto/organizations/utils.py
View File

@ -2,8 +2,10 @@ from __future__ import unicode_literals
import random import random
import string import string
from moto.iam.models import ACCOUNT_ID
from moto.iam.models import ACCOUNT_ID as MASTER_ACCOUNT_ID
MASTER_ACCOUNT_ID = ACCOUNT_ID
MASTER_ACCOUNT_EMAIL = "master@example.com" MASTER_ACCOUNT_EMAIL = "master@example.com"
DEFAULT_POLICY_ID = "p-FullAWSAccess" DEFAULT_POLICY_ID = "p-FullAWSAccess"
ORGANIZATION_ARN_FORMAT = "arn:aws:organizations::{0}:organization/{1}" ORGANIZATION_ARN_FORMAT = "arn:aws:organizations::{0}:organization/{1}"

2
moto/s3/responses.py
View File

@ -1899,7 +1899,7 @@ S3_ALL_MULTIPARTS = """<?xml version="1.0" encoding="UTF-8"?>
<Key>{{ upload.key_name }}</Key> <Key>{{ upload.key_name }}</Key>
<UploadId>{{ upload.id }}</UploadId> <UploadId>{{ upload.id }}</UploadId>
<Initiator> <Initiator>
<ID>arn:aws:iam::"""+ACCOUNT_ID+""":user/user1-11111a31-17b5-4fb7-9df5-b111111f13de</ID> <ID>arn:aws:iam::""" + ACCOUNT_ID + """:user/user1-11111a31-17b5-4fb7-9df5-b111111f13de</ID>
<DisplayName>user1-11111a31-17b5-4fb7-9df5-b111111f13de</DisplayName> <DisplayName>user1-11111a31-17b5-4fb7-9df5-b111111f13de</DisplayName>
</Initiator> </Initiator>
<Owner> <Owner>