diff --git a/moto/acm/models.py b/moto/acm/models.py index f4d1eea18..3df541982 100644 --- a/moto/acm/models.py +++ b/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----- diff --git a/moto/athena/models.py b/moto/athena/models.py index 2704d5277..2f41046a9 100644 --- a/moto/athena/models.py +++ b/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): diff --git a/moto/awslambda/models.py b/moto/awslambda/models.py index a3e7f03ef..b1b8f57a8 100644 --- a/moto/awslambda/models.py +++ b/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__) diff --git a/moto/batch/models.py b/moto/batch/models.py index 023575af2..e12cc8f84 100644 --- a/moto/batch/models.py +++ b/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__) diff --git a/moto/cloudformation/parsing.py b/moto/cloudformation/parsing.py index 10a3413b8..bbe28c6c6 100644 --- a/moto/cloudformation/parsing.py +++ b/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, diff --git a/moto/cloudformation/responses.py b/moto/cloudformation/responses.py index 64481dd41..63429a0a7 100644 --- a/moto/cloudformation/responses.py +++ b/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 diff --git a/moto/cloudformation/utils.py b/moto/cloudformation/utils.py index 807a8ea10..6a53e6e51 100644 --- a/moto/cloudformation/utils.py +++ b/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() diff --git a/moto/cloudwatch/models.py b/moto/cloudwatch/models.py index 5e8f63683..662005237 100644 --- a/moto/cloudwatch/models.py +++ b/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() diff --git a/moto/config/models.py b/moto/config/models.py index 6302500b3..0bf602b88 100644 --- a/moto/config/models.py +++ b/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", diff --git a/moto/core/__init__.py b/moto/core/__init__.py index 4a4dfdfb6..045124fab 100644 --- a/moto/core/__init__.py +++ b/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} diff --git a/moto/core/access_control.py b/moto/core/access_control.py index 9991063f9..971c02212 100644 --- a/moto/core/access_control.py +++ b/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, diff --git a/moto/core/models.py b/moto/core/models.py index 5b19137c3..cfffff383 100644 --- a/moto/core/models.py +++ b/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 diff --git a/moto/dynamodb/models.py b/moto/dynamodb/models.py index 551742642..f5771ec6e 100644 --- a/moto/dynamodb/models.py +++ b/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 diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py index 32fa2e991..621e5abe7 100644 --- a/moto/ec2/responses/instances.py +++ b/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): diff --git a/moto/ec2/responses/security_groups.py b/moto/ec2/responses/security_groups.py index e74dc7157..c2d789ea0 100644 --- a/moto/ec2/responses/security_groups.py +++ b/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): diff --git a/moto/ec2/responses/vpc_peering_connections.py b/moto/ec2/responses/vpc_peering_connections.py index df33ecf77..62ab53401 100644 --- a/moto/ec2/responses/vpc_peering_connections.py +++ b/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): diff --git a/moto/iam/models.py b/moto/iam/models.py index dd598c975..5bbd9235d 100644 --- a/moto/iam/models.py +++ b/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.""" diff --git a/moto/kinesis/exceptions.py b/moto/kinesis/exceptions.py index 403823b6c..1f25d6720 100644 --- a/moto/kinesis/exceptions.py +++ b/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): diff --git a/moto/kinesis/models.py b/moto/kinesis/models.py index 03eadc084..48642f197 100644 --- a/moto/kinesis/models.py +++ b/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, diff --git a/moto/opsworks/models.py b/moto/opsworks/models.py index d456306ce..96d918cc9 100644 --- a/moto/opsworks/models.py +++ b/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 diff --git a/moto/organizations/utils.py b/moto/organizations/utils.py index 0a685c629..e71357ce6 100644 --- a/moto/organizations/utils.py +++ b/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 diff --git a/moto/polly/models.py b/moto/polly/models.py index f35bc1f5c..f91c80c64 100644 --- a/moto/polly/models.py +++ b/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): diff --git a/moto/redshift/models.py b/moto/redshift/models.py index 3c7a608e3..2c57c0f06 100644 --- a/moto/redshift/models.py +++ b/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): diff --git a/moto/resourcegroups/models.py b/moto/resourcegroups/models.py index 4924a7131..7d4d88230 100644 --- a/moto/resourcegroups/models.py +++ b/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 diff --git a/moto/s3/responses.py b/moto/s3/responses.py index ff3bec9cf..820f8e2dd 100644 --- a/moto/s3/responses.py +++ b/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, diff --git a/moto/ses/feedback.py b/moto/ses/feedback.py index c9ab6ed6c..7161a2c37 100644 --- a/moto/ses/feedback.py +++ b/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 diff --git a/moto/sns/models.py b/moto/sns/models.py index e4d2cc3bd..920bdada1 100644 --- a/moto/sns/models.py +++ b/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, diff --git a/moto/sqs/models.py b/moto/sqs/models.py index e9742a3de..5a9c1b031 100644 --- a/moto/sqs/models.py +++ b/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 diff --git a/moto/sts/models.py b/moto/sts/models.py index d3afc9904..12824b2ed 100644 --- a/moto/sts/models.py +++ b/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, diff --git a/moto/sts/responses.py b/moto/sts/responses.py index f6d8647c4..f36799b03 100644 --- a/moto/sts/responses.py +++ b/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 diff --git a/tests/test_acm/test_acm.py b/tests/test_acm/test_acm.py index edc10fb29..52d00b390 100644 --- a/tests/test_acm/test_acm.py +++ b/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") diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py index 186c2f7ff..72f2833c8 100644 --- a/tests/test_apigateway/test_apigateway.py +++ b/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 diff --git a/tests/test_autoscaling/test_launch_configurations.py b/tests/test_autoscaling/test_launch_configurations.py index 139a6dde6..99e078cb3 100644 --- a/tests/test_autoscaling/test_launch_configurations.py +++ b/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 diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud.py b/tests/test_cloudformation/test_cloudformation_stack_crud.py index 28a729b00..75f705ea7 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud.py +++ b/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, diff --git a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py b/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py index 0af1e55e6..b8ea7d8f7 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py +++ b/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", diff --git a/tests/test_cloudformation/test_cloudformation_stack_integration.py b/tests/test_cloudformation/test_cloudformation_stack_integration.py index 16f6279f0..0ae41d7b2 100644 --- a/tests/test_cloudformation/test_cloudformation_stack_integration.py +++ b/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 ( diff --git a/tests/test_cognitoidentity/test_cognitoidentity.py b/tests/test_cognitoidentity/test_cognitoidentity.py index d2bc7851b..33a8aeab1 100644 --- a/tests/test_cognitoidentity/test_cognitoidentity.py +++ b/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(): diff --git a/tests/test_cognitoidp/test_cognitoidp.py b/tests/test_cognitoidp/test_cognitoidp.py index c7ba8ba38..754c11d03 100644 --- a/tests/test_cognitoidp/test_cognitoidp.py +++ b/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 diff --git a/tests/test_config/test_config.py b/tests/test_config/test_config.py index 390e0f8ae..146683c90 100644 --- a/tests/test_config/test_config.py +++ b/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(): diff --git a/tests/test_core/test_auth.py b/tests/test_core/test_auth.py index 60d15cf51..a8fde5d8c 100644 --- a/tests/test_core/test_auth.py +++ b/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 diff --git a/tests/test_ec2/test_spot_fleet.py b/tests/test_ec2/test_spot_fleet.py index 1c1937492..671b31215 100644 --- a/tests/test_ec2/test_spot_fleet.py +++ b/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): diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py index bbfebe309..1becbe2f1 100644 --- a/tests/test_elb/test_elb.py +++ b/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 diff --git a/tests/test_elbv2/test_elbv2.py b/tests/test_elbv2/test_elbv2.py index 20ab5230e..77a908e18 100644 --- a/tests/test_elbv2/test_elbv2.py +++ b/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 diff --git a/tests/test_events/test_events.py b/tests/test_events/test_events.py index 971d32287..57be06f4c 100644 --- a/tests/test_events/test_events.py +++ b/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)"}, diff --git a/tests/test_iam/test_iam.py b/tests/test_iam/test_iam.py index 17f3939a6..81a0b5a34 100644 --- a/tests/test_iam/test_iam.py +++ b/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 diff --git a/tests/test_iam/test_iam_groups.py b/tests/test_iam/test_iam_groups.py index 6e33a4cec..dba331bb9 100644 --- a/tests/test_iam/test_iam_groups.py +++ b/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 = """ { diff --git a/tests/test_kinesis/test_firehose.py b/tests/test_kinesis/test_firehose.py index f5425c563..7ec84bb10 100644 --- a/tests/test_kinesis/test_firehose.py +++ b/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): diff --git a/tests/test_kinesis/test_kinesis.py b/tests/test_kinesis/test_kinesis.py index 77b7873bf..8ae83484b 100644 --- a/tests/test_kinesis/test_kinesis.py +++ b/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 diff --git a/tests/test_redshift/test_redshift.py b/tests/test_redshift/test_redshift.py index 5017529da..aeb04e6a0 100644 --- a/tests/test_redshift/test_redshift.py +++ b/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(): diff --git a/tests/test_ses/test_ses_sns_boto3.py b/tests/test_ses/test_ses_sns_boto3.py index f4b9cd4a5..fc58d88aa 100644 --- a/tests/test_ses/test_ses_sns_boto3.py +++ b/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 diff --git a/tests/test_sns/test_application.py b/tests/test_sns/test_application.py index 209b53c54..e4fe93d53 100644 --- a/tests/test_sns/test_application.py +++ b/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 diff --git a/tests/test_sns/test_application_boto3.py b/tests/test_sns/test_application_boto3.py index 9bc94cdb9..6f9be2926 100644 --- a/tests/test_sns/test_application_boto3.py +++ b/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 diff --git a/tests/test_sns/test_publishing.py b/tests/test_sns/test_publishing.py index 58584bf36..80e61f625 100644 --- a/tests/test_sns/test_publishing.py +++ b/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}' diff --git a/tests/test_sns/test_publishing_boto3.py b/tests/test_sns/test_publishing_boto3.py index dfa7c27e7..c84af9ade 100644 --- a/tests/test_sns/test_publishing_boto3.py +++ b/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}' diff --git a/tests/test_sns/test_server.py b/tests/test_sns/test_server.py index 1d6bdd6b9..78bc147df 100644 --- a/tests/test_sns/test_server.py +++ b/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 diff --git a/tests/test_sns/test_topics.py b/tests/test_sns/test_topics.py index 25f4f8a4c..57bef29f0 100644 --- a/tests/test_sns/test_topics.py +++ b/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 diff --git a/tests/test_sns/test_topics_boto3.py b/tests/test_sns/test_topics_boto3.py index 4e7583378..d06dafcb6 100644 --- a/tests/test_sns/test_topics_boto3.py +++ b/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(): diff --git a/tests/test_sqs/test_sqs.py b/tests/test_sqs/test_sqs.py index 6fa8a3504..0f900f4c2 100644 --- a/tests/test_sqs/test_sqs.py +++ b/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(): diff --git a/tests/test_stepfunctions/test_stepfunctions.py b/tests/test_stepfunctions/test_stepfunctions.py index 91c7df9f7..5c4ba97ae 100644 --- a/tests/test_stepfunctions/test_stepfunctions.py +++ b/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 = ( diff --git a/tests/test_sts/test_sts.py b/tests/test_sts/test_sts.py index 2cb1c49e7..4dee9184f 100644 --- a/tests/test_sts/test_sts.py +++ b/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