ACCOUNT_ID moved to moto.core, MOTO_ACCOUNT_ID env var override

moto/acm/models.py

@@ -13,7 +13,7 @@ import cryptography.hazmat.primitives.asymmetric.rsa
 from cryptography.hazmat.primitives import serialization, hashes
 from cryptography.hazmat.backends import default_backend
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 
 
 GOOGLE_ROOT_CA = b"""-----BEGIN CERTIFICATE-----

moto/athena/models.py

@@ -4,7 +4,7 @@ import time
 import boto3
 from moto.core import BaseBackend, BaseModel
 
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 class TaggableResourceMixin(object):

moto/awslambda/models.py

@@ -42,7 +42,7 @@ from .utils import make_function_arn, make_function_ver_arn
 from moto.sqs import sqs_backends
 from moto.dynamodb2 import dynamodb_backends2
 from moto.dynamodbstreams import dynamodbstreams_backends
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 logger = logging.getLogger(__name__)
 

moto/batch/models.py

@@ -28,7 +28,7 @@ from .utils import (
 from moto.ec2.exceptions import InvalidSubnetIdError
 from moto.ec2.models import INSTANCE_TYPES as EC2_INSTANCE_TYPES
 from moto.iam.exceptions import IAMNotFoundException
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 
 _orig_adapter_send = requests.adapters.HTTPAdapter.send
 logger = logging.getLogger(__name__)

moto/cloudformation/parsing.py

@@ -27,7 +27,7 @@ from moto.route53 import models as route53_models
 from moto.s3 import models as s3_models
 from moto.sns import models as sns_models
 from moto.sqs import models as sqs_models
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from .utils import random_suffix
 from .exceptions import (
     ExportNotFound,

moto/cloudformation/responses.py

@@ -7,7 +7,7 @@ from six.moves.urllib.parse import urlparse
 from moto.core.responses import BaseResponse
 from moto.core.utils import amzn_request_id
 from moto.s3 import s3_backend
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from .models import cloudformation_backends
 from .exceptions import ValidationError
 

moto/cloudformation/utils.py

@@ -7,7 +7,7 @@ import os
 import string
 
 from cfnlint import decode, core
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 def generate_stack_id(stack_name, region="us-east-1", account="123456789"):
     random_id = uuid.uuid4()

moto/cloudwatch/models.py

@@ -8,7 +8,7 @@ from dateutil.tz import tzutc
 from uuid import uuid4
 from .utils import make_arn_for_dashboard
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 
 _EMPTY_LIST = tuple()
 

moto/config/models.py

@@ -45,7 +45,7 @@ from moto.config.exceptions import (
 from moto.core import BaseBackend, BaseModel
 from moto.s3.config import s3_config_query
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 POP_STRINGS = [
     "capitalizeStart",
     "CapitalizeStart",

moto/core/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from .models import BaseModel, BaseBackend, moto_api_backend  # noqa
+from .models import BaseModel, BaseBackend, moto_api_backend, ACCOUNT_ID  # noqa
 from .responses import ActionAuthenticatorMixin
 
 moto_api_backends = {"global": moto_api_backend}

moto/core/access_control.py

@@ -24,7 +24,8 @@ from botocore.awsrequest import AWSRequest
 from botocore.credentials import Credentials
 from six import string_types
 
-from moto.iam.models import ACCOUNT_ID, Policy
+from moto.core import ACCOUNT_ID 
+from moto.iam.models import Policy
 from moto.iam import iam_backend
 from moto.core.exceptions import (
     SignatureDoesNotMatchError,

moto/core/models.py

@@ -23,6 +23,9 @@ from .utils import (
 )
 
 
+ACCOUNT_ID = os.environ.get('MOTO_ACCOUNT_ID','123456789012')
+    
+
 class BaseMockAWS(object):
     nested_count = 0
 

moto/dynamodb/models.py

@@ -6,7 +6,7 @@ import json
 from moto.compat import OrderedDict
 from moto.core import BaseBackend, BaseModel
 from moto.core.utils import unix_time
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from .comparisons import get_comparison_func
 
 

moto/ec2/responses/instances.py

@@ -6,7 +6,7 @@ from moto.core.responses import BaseResponse
 from moto.core.utils import camelcase_to_underscores
 from moto.ec2.utils import filters_from_querystring, dict_from_querystring
 from moto.elbv2 import elbv2_backends
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 class InstanceResponse(BaseResponse):
     def describe_instances(self):

moto/ec2/responses/security_groups.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from moto.core.responses import BaseResponse
 from moto.ec2.utils import filters_from_querystring
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 def try_parse_int(value, default=None):

moto/ec2/responses/vpc_peering_connections.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 class VPCPeeringConnections(BaseResponse):

moto/iam/models.py

@@ -14,7 +14,7 @@ from cryptography.hazmat.backends import default_backend
 from six.moves.urllib.parse import urlparse
 
 from moto.core.exceptions import RESTError
-from moto.core import BaseBackend, BaseModel
+from moto.core import BaseBackend, BaseModel, ACCOUNT_ID
 from moto.core.utils import (
     iso_8601_datetime_without_milliseconds,
     iso_8601_datetime_with_milliseconds,
@@ -45,8 +45,6 @@ from .utils import (
     random_policy_id,
 )
 
-ACCOUNT_ID = '123456789012'
-
 
 class MFADevice(object):
     """MFA Device class."""

moto/kinesis/exceptions.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import json
 from werkzeug.exceptions import BadRequest
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 class ResourceNotFoundError(BadRequest):

moto/kinesis/models.py

@@ -13,7 +13,7 @@ from hashlib import md5
 from moto.compat import OrderedDict
 from moto.core import BaseBackend, BaseModel
 from moto.core.utils import unix_time
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from .exceptions import (
     StreamNotFoundError,
     ShardNotFoundError,

moto/opsworks/models.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from moto.core import BaseBackend, BaseModel
 from moto.ec2 import ec2_backends
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 import uuid
 import datetime
 from random import choice

moto/organizations/utils.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import random
 import string
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 MASTER_ACCOUNT_ID = ACCOUNT_ID

moto/polly/models.py

@@ -8,7 +8,7 @@ from moto.core import BaseBackend, BaseModel
 from .resources import VOICE_DATA
 from .utils import make_arn_for_lexicon
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 
 
 class Lexicon(BaseModel):

moto/redshift/models.py

@@ -27,7 +27,7 @@ from .exceptions import (
 )
 
 
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 
 class TaggableResourceMixin(object):

moto/resourcegroups/models.py

@@ -6,7 +6,7 @@ import json
 import re
 
 from moto.core import BaseBackend, BaseModel
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from .exceptions import BadRequestException
 
 

moto/s3/responses.py

@@ -13,7 +13,7 @@ import xmltodict
 from moto.packages.httpretty.core import HTTPrettyRequest
 from moto.core.responses import _TemplateEnvironmentMixin, ActionAuthenticatorMixin
 from moto.core.utils import path_url
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 
 from moto.s3bucket_path.utils import (
     bucket_name_from_url as bucketpath_bucket_name_from_url,

moto/ses/feedback.py

@@ -1,4 +1,4 @@
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 """
 SES Feedback messages
 Extracted from https://docs.aws.amazon.com/ses/latest/DeveloperGuide/notification-contents.html

moto/sns/models.py

@@ -12,7 +12,6 @@ from boto3 import Session
 
 from moto.compat import OrderedDict
 from moto.core import BaseBackend, BaseModel
-from moto.iam.models import ACCOUNT_ID
 from moto.core.utils import (
     iso_8601_datetime_with_milliseconds,
     camelcase_to_underscores,
@@ -32,7 +31,7 @@ from .exceptions import (
 )
 from .utils import make_arn_for_topic, make_arn_for_subscription, is_e164
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 DEFAULT_PAGE_SIZE = 100
 MAXIMUM_MESSAGE_LENGTH = 262144  # 256 KiB
 
@@ -260,7 +259,7 @@ class Subscription(BaseModel):
             "SignatureVersion": "1",
             "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",
             "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",
-            "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:{}:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55".format(ACCOUNT_ID),
+            "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:{}:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55".format(DEFAULT_ACCOUNT_ID),
         }
         if message_attributes:
             post_data["MessageAttributes"] = message_attributes
@@ -277,7 +276,7 @@ class PlatformApplication(BaseModel):
     @property
     def arn(self):
         return "arn:aws:sns:{region}:{AccountId}:app/{platform}/{name}".format(
-            region=self.region, platform=self.platform, name=self.name, AccountId=ACCOUNT_ID
+            region=self.region, platform=self.platform, name=self.name, AccountId=DEFAULT_ACCOUNT_ID
         )
 
 
@@ -308,7 +307,7 @@ class PlatformEndpoint(BaseModel):
     def arn(self):
         return "arn:aws:sns:{region}:{AccountId}:endpoint/{platform}/{name}/{id}".format(
             region=self.region,
-            AccountId=ACCOUNT_ID,
+            AccountId=DEFAULT_ACCOUNT_ID,
             platform=self.application.platform,
             name=self.application.name,
             id=self.id,

moto/sqs/models.py

@@ -12,7 +12,6 @@ import boto.sqs
 
 from moto.core.exceptions import RESTError
 from moto.core import BaseBackend, BaseModel
-from moto.iam.models import ACCOUNT_ID
 from moto.core.utils import (
     camelcase_to_underscores,
     get_random_message_id,
@@ -33,7 +32,7 @@ from .exceptions import (
     InvalidAttributeName,
 )
 
-from moto.iam.models import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
+from moto.core import ACCOUNT_ID as DEFAULT_ACCOUNT_ID
 DEFAULT_SENDER_ID = "AIDAIT2UOQQY3AUEKVGXU"
 
 MAXIMUM_MESSAGE_LENGTH = 262144  # 256 KiB
@@ -419,7 +418,7 @@ class Queue(BaseModel):
 
     def url(self, request_url):
         return "{0}://{1}/{2}/{3}".format(
-            request_url.scheme, request_url.netloc, ACCOUNT_ID, self.name
+            request_url.scheme, request_url.netloc, DEFAULT_ACCOUNT_ID, self.name
         )
 
     @property

moto/sts/models.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 import datetime
 from moto.core import BaseBackend, BaseModel
 from moto.core.utils import iso_8601_datetime_with_milliseconds
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from moto.sts.utils import (
     random_access_key_id,
     random_secret_access_key,

moto/sts/responses.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 from moto.core.responses import BaseResponse
-from moto.iam.models import ACCOUNT_ID
+from moto.core import ACCOUNT_ID
 from moto.iam import iam_backend
 from .exceptions import STSValidationError
 from .models import sts_backend