ACCOUNT_ID moved to moto.core, MOTO_ACCOUNT_ID env var override

tests/test_acm/test_acm.py

@@ -9,7 +9,7 @@ import uuid
 from botocore.exceptions import ClientError
 
 from moto import mock_acm
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 RESOURCE_FOLDER = os.path.join(os.path.dirname(__file__), "resources")

tests/test_apigateway/test_apigateway.py

@@ -9,7 +9,7 @@ from botocore.exceptions import ClientError
 
 import responses
 from moto import mock_apigateway, settings
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from nose.tools import assert_raises
 
 

tests/test_autoscaling/test_launch_configurations.py

@@ -8,7 +8,7 @@ import sure  # noqa
 
 from moto import mock_autoscaling_deprecated
 from moto import mock_autoscaling
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from tests.helpers import requires_boto_gte
 
 

tests/test_cloudformation/test_cloudformation_stack_crud.py

@@ -14,7 +14,7 @@ import sure  # noqa
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises  # noqa
 from nose.tools import assert_raises
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 from moto import (
     mock_cloudformation_deprecated,

tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py

@@ -11,7 +11,7 @@ import sure  # noqa
 from nose.tools import assert_raises
 
 from moto import mock_cloudformation, mock_s3, mock_sqs, mock_ec2
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 dummy_template = {
     "AWSTemplateFormatVersion": "2010-09-09",

tests/test_cloudformation/test_cloudformation_stack_integration.py

@@ -43,7 +43,7 @@ from moto import (
     mock_sqs_deprecated,
     mock_elbv2,
 )
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from moto.dynamodb2.models import Table
 
 from .fixtures import (

tests/test_cognitoidentity/test_cognitoidentity.py

@@ -6,7 +6,7 @@ from nose.tools import assert_raises
 
 from moto import mock_cognitoidentity
 from moto.cognitoidentity.utils import get_random_identity_id
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 @mock_cognitoidentity
 def test_create_identity_pool():

tests/test_cognitoidp/test_cognitoidp.py

@@ -14,7 +14,7 @@ from jose import jws
 from nose.tools import assert_raises
 
 from moto import mock_cognitoidp
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_cognitoidp

tests/test_config/test_config.py

@@ -7,7 +7,7 @@ from nose.tools import assert_raises
 
 from moto import mock_s3
 from moto.config import mock_config
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 @mock_config
 def test_put_configuration_recorder():

tests/test_core/test_auth.py

@@ -10,7 +10,7 @@ from nose.tools import assert_raises
 
 from moto import mock_iam, mock_ec2, mock_s3, mock_sts, mock_elbv2, mock_rds2
 from moto.core import set_initial_no_auth_action_count
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from uuid import uuid4
 
 

tests/test_ec2/test_spot_fleet.py

@@ -4,7 +4,7 @@ import boto3
 import sure  # noqa
 
 from moto import mock_ec2
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 def get_subnet_id(conn):

tests/test_elb/test_elb.py

@@ -15,7 +15,7 @@ from nose.tools import assert_raises
 import sure  # noqa
 
 from moto import mock_elb, mock_ec2, mock_elb_deprecated, mock_ec2_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_elb_deprecated

tests/test_elbv2/test_elbv2.py

@@ -10,7 +10,7 @@ import sure  # noqa
 
 from moto import mock_elbv2, mock_ec2, mock_acm, mock_cloudformation
 from moto.elbv2 import elbv2_backends
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_elbv2

tests/test_events/test_events.py

@@ -6,7 +6,7 @@ import sure  # noqa
 from moto.events import mock_events
 from botocore.exceptions import ClientError
 from nose.tools import assert_raises
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 RULES = [
     {"Name": "test1", "ScheduleExpression": "rate(5 minutes)"},

tests/test_iam/test_iam.py

@@ -13,7 +13,7 @@ from dateutil.tz import tzutc
 
 from moto import mock_iam, mock_iam_deprecated
 from moto.iam.models import aws_managed_policies
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from nose.tools import assert_raises, assert_equals
 from nose.tools import raises
 

tests/test_iam/test_iam_groups.py

@@ -10,7 +10,7 @@ from nose.tools import assert_raises
 from boto.exception import BotoServerError
 from botocore.exceptions import ClientError
 from moto import mock_iam, mock_iam_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 MOCK_POLICY = """
 {

tests/test_kinesis/test_firehose.py

@@ -7,7 +7,7 @@ import boto3
 import sure  # noqa
 
 from moto import mock_kinesis
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 def create_s3_delivery_stream(client, stream_name):

tests/test_kinesis/test_kinesis.py

@@ -8,7 +8,7 @@ import boto3
 from boto.kinesis.exceptions import ResourceNotFoundException, InvalidArgumentException
 
 from moto import mock_kinesis, mock_kinesis_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_kinesis_deprecated

tests/test_redshift/test_redshift.py

@@ -18,7 +18,7 @@ from moto import mock_ec2
 from moto import mock_ec2_deprecated
 from moto import mock_redshift
 from moto import mock_redshift_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 @mock_redshift
 def test_create_cluster_boto3():

tests/test_ses/test_ses_sns_boto3.py

@@ -10,7 +10,7 @@ import sure  # noqa
 from nose import tools
 from moto import mock_ses, mock_sns, mock_sqs
 from moto.ses.models import SESFeedback
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_ses

tests/test_sns/test_application.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import boto
 from boto.exception import BotoServerError
 from moto import mock_sns_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 import sure  # noqa
 
 

tests/test_sns/test_application_boto3.py

@@ -4,7 +4,7 @@ import boto3
 from botocore.exceptions import ClientError
 from moto import mock_sns
 import sure  # noqa
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_sns

tests/test_sns/test_publishing.py

@@ -7,7 +7,7 @@ from freezegun import freeze_time
 import sure  # noqa
 
 from moto import mock_sns_deprecated, mock_sqs_deprecated
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 MESSAGE_FROM_SQS_TEMPLATE = '{\n  "Message": "%s",\n  "MessageId": "%s",\n  "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n  "SignatureVersion": "1",\n  "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n  "Subject": "%s",\n  "Timestamp": "2015-01-01T12:00:00.000Z",\n  "TopicArn": "arn:aws:sns:%s:'+ACCOUNT_ID+':some-topic",\n  "Type": "Notification",\n  "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:'+ACCOUNT_ID+':some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}'
 

tests/test_sns/test_publishing_boto3.py

@@ -12,7 +12,7 @@ import responses
 from botocore.exceptions import ClientError
 from nose.tools import assert_raises
 from moto import mock_sns, mock_sqs
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 MESSAGE_FROM_SQS_TEMPLATE = '{\n  "Message": "%s",\n  "MessageId": "%s",\n  "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n  "SignatureVersion": "1",\n  "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n  "Subject": "my subject",\n  "Timestamp": "2015-01-01T12:00:00.000Z",\n  "TopicArn": "arn:aws:sns:%s:'+ACCOUNT_ID+':some-topic",\n  "Type": "Notification",\n  "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:'+ACCOUNT_ID+':some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}'
 

tests/test_sns/test_server.py

@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 import sure  # noqa
 

tests/test_sns/test_topics.py

@@ -8,7 +8,7 @@ import sure  # noqa
 from boto.exception import BotoServerError
 from moto import mock_sns_deprecated
 from moto.sns.models import DEFAULT_EFFECTIVE_DELIVERY_POLICY, DEFAULT_PAGE_SIZE
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 @mock_sns_deprecated

tests/test_sns/test_topics_boto3.py

@@ -8,7 +8,7 @@ import sure  # noqa
 from botocore.exceptions import ClientError
 from moto import mock_sns
 from moto.sns.models import DEFAULT_EFFECTIVE_DELIVERY_POLICY, DEFAULT_PAGE_SIZE
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 @mock_sns
 def test_create_and_delete_topic():

tests/test_sqs/test_sqs.py

@@ -21,7 +21,7 @@ from moto import mock_sqs, mock_sqs_deprecated, settings
 from nose import SkipTest
 from nose.tools import assert_raises
 from tests.helpers import requires_boto_gte
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 @mock_sqs
 def test_create_fifo_queue_fail():

tests/test_stepfunctions/test_stepfunctions.py

@@ -9,7 +9,7 @@ from botocore.exceptions import ClientError
 from nose.tools import assert_raises
 
 from moto import mock_sts, mock_stepfunctions
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 region = "us-east-1"
 simple_definition = (

tests/test_sts/test_sts.py

@@ -10,7 +10,7 @@ import sure  # noqa
 
 
 from moto import mock_sts, mock_sts_deprecated, mock_iam, settings
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from moto.sts.responses import MAX_FEDERATION_TOKEN_POLICY_LENGTH