Merge ca25f60 into fd24c7a

src/backup/after_backup_action_handler.py

@@ -4,10 +4,10 @@
 import webapp2
 
 from src.big_query.big_query_table_metadata import BigQueryTableMetadata
-from commons.decorators.retry import retry
-from commons.exceptions import JsonNotParseableException, \
+from src.commons.decorators.retry import retry
+from src.commons.exceptions import JsonNotParseableException, \
     WrongJsonFormatException
-from commons.json_handler import JsonHandler
+from src.commons.json_handler import JsonHandler
 from src.backup.copy_job_async.copy_job_result import CopyJobResult
 from src.backup.datastore.Backup import Backup
 from src.backup.datastore.Table import Table

src/backup/backup_id_creator.py

@@ -1,4 +1,4 @@
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 
 
 class BackupIdCreator(object):

src/backup/copy_job_async/copy_job/copy_job_service.py

@@ -1,7 +1,7 @@
 import logging
 
 from apiclient.errors import HttpError
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 from src.backup.copy_job_async.task_creator import TaskCreator
 from src.backup.copy_job_async.result_check.result_check_request import ResultCheckRequest
 from src.big_query.big_query import BigQuery

src/backup/dataset_id_creator.py

@@ -1,4 +1,4 @@
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 
 
 class DatasetIdCreator(object):

src/backup/datastore/Backup.py

@@ -3,7 +3,7 @@
 import datetime
 from google.appengine.ext import ndb
 
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 
 
 class Backup(ndb.Model):

src/backup/datastore/Table.py

@@ -3,7 +3,7 @@
 from datetime import timedelta, date
 from google.appengine.ext import ndb
 
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 from src.backup.datastore.Backup import Backup
 from src.table_reference import TableReference
 

src/backup/datastore/backup_finder.py

@@ -1,7 +1,7 @@
 import logging
 from datetime import datetime
 
-from commons.exceptions import NotFoundException
+from src.commons.exceptions import NotFoundException
 from src.backup.datastore.Table import Table
 
 

src/bbq_authenticated_handler.py

@@ -1,4 +1,4 @@
-from commons.secured_handler import SecuredHandler
+from src.commons.secured_handler import SecuredHandler
 from src.configuration import configuration
 
 

src/big_query/big_query.py

@@ -6,9 +6,9 @@
 from apiclient.errors import HttpError, Error
 from oauth2client.client import GoogleCredentials
 
-from commons.decorators.cached import cached
-from commons.decorators.log_time import log_time, measure_time_and_log
-from commons.decorators.retry import retry
+from src.commons.decorators.cached import cached
+from src.commons.decorators.log_time import log_time, measure_time_and_log
+from src.commons.decorators.retry import retry
 from src.big_query.big_query_table import BigQueryTable
 from src.configuration import configuration
 from src.table_reference import TableReference

src/big_query/big_query_table_metadata.py

@@ -3,7 +3,7 @@
 from types import NoneType
 
 
-from commons.decorators.cached import cached
+from src.commons.decorators.cached import cached
 from src.error_reporting import ErrorReporting
 from src.table_reference import TableReference
 from src.big_query.big_query import BigQuery

commons/json_handler.py → src/commons/json_handler.py

@@ -4,7 +4,7 @@
 import webapp2
 from googleapiclient.errors import HttpError
 
-from commons.exceptions import ParameterValidationException, \
+from src.commons.exceptions import ParameterValidationException, \
     JsonNotParseableException, WrongJsonFormatException, NotFoundException
 
 

commons/oauth2_account.py → src/commons/oauth2_account.py

@@ -4,7 +4,7 @@
 
 from googleapiclient.errors import HttpError
 
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 
 
 class OAuth2Account(object):

src/error_reporting.py

@@ -6,7 +6,7 @@
 from oauth2client.client import GoogleCredentials
 
 from environment import Environment
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 
 from google.appengine.api.app_identity import app_identity
 

src/google_cloud_storage_client.py

@@ -1,7 +1,7 @@
 import logging
 import cloudstorage as gcs
 
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 
 my_default_retry_params = gcs.RetryParams(
     initial_delay=0.2,

src/restore/after_restore_action_handler.py

@@ -3,9 +3,9 @@
 import webapp2
 from google.appengine.ext import ndb
 
-from commons.exceptions import JsonNotParseableException, \
+from src.commons.exceptions import JsonNotParseableException, \
     WrongJsonFormatException
-from commons.json_handler import JsonHandler
+from src.commons.json_handler import JsonHandler
 from src.backup.copy_job_async.copy_job_result import CopyJobResult
 from src.configuration import configuration
 from src.restore.datastore.restore_item import RestoreItem

src/restore/async_batch_restore_service.py

@@ -2,7 +2,7 @@
 
 from google.appengine.ext import ndb
 
-from commons.decorators.log_time import log_time
+from src.commons.decorators.log_time import log_time
 from src.backup.copy_job_async.copy_job_service_async import CopyJobServiceAsync
 from src.backup.copy_job_async.post_copy_action_request import \
     PostCopyActionRequest

src/restore/dataset/dataset_restore_handler.py

@@ -3,8 +3,8 @@
 
 import webapp2
 
-from commons.exceptions import ParameterValidationException
-from commons.json_handler import JsonHandler
+from src.commons.exceptions import ParameterValidationException
+from src.commons.json_handler import JsonHandler
 from src.bbq_authenticated_handler import BbqAuthenticatedHandler
 from src.big_query import validators
 from src.big_query.validators import WrongDatasetNameException

src/restore/dataset/dataset_restore_items_generator.py

@@ -1,7 +1,7 @@
 import logging
 
-from commons.collections import paginated
-from commons.decorators.log_time import log_time
+from src.commons.collections import paginated
+from src.commons.decorators.log_time import log_time
 from src.backup.datastore.Table import Table
 from src.restore.datastore.restore_item import RestoreItem
 from src.restore.restoration_table_reference import RestoreTableReference

src/restore/dataset/dataset_restore_parameters_validator.py

@@ -1,6 +1,6 @@
 import logging
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from src.backup.datastore.Table import Table
 from src.big_query.big_query import BigQuery
 from src.configuration import configuration

src/restore/list/backup_key_parser.py

@@ -1,7 +1,7 @@
 from google.appengine.ext import ndb
 from google.net.proto.ProtocolBuffer import ProtocolBufferDecodeError
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from binascii import Error
 
 

src/restore/list/backup_list_restore_handler.py

@@ -5,9 +5,9 @@
 
 import webapp2
 
-from commons.exceptions import ParameterValidationException, \
+from src.commons.exceptions import ParameterValidationException, \
     JsonNotParseableException
-from commons.json_handler import JsonHandler
+from src.commons.json_handler import JsonHandler
 from src.bbq_authenticated_handler import BbqAuthenticatedHandler
 from src.big_query import validators
 from src.big_query.validators import WrongDatasetNameException

src/restore/list/backup_list_restore_service.py

@@ -1,10 +1,10 @@
 from google.appengine.api.datastore_errors import BadRequestError, Error
 from google.appengine.ext import ndb
 
-from commons.collections import paginated
-from commons.decorators.log_time import log_time
-from commons.decorators.retry import retry
-from commons.exceptions import ParameterValidationException
+from src.commons.collections import paginated
+from src.commons.decorators.log_time import log_time
+from src.commons.decorators.retry import retry
+from src.commons.exceptions import ParameterValidationException
 from src.backup.datastore.Table import Table
 from src.restore.async_batch_restore_service import AsyncBatchRestoreService
 from src.restore.datastore.restoration_job import RestorationJob

src/restore/status/restoration_job_status_handler.py

@@ -1,6 +1,6 @@
 import webapp2
 
-from commons.json_handler import JsonHandler
+from src.commons.json_handler import JsonHandler
 from src.bbq_authenticated_handler import BbqAuthenticatedHandler
 from src.configuration import configuration
 from src.restore.status.restoration_job_status_service import \

src/restore/status/restoration_job_status_service.py

@@ -2,8 +2,8 @@
 import logging
 from collections import Counter
 
-from commons import camel_case_converter
-from commons.exceptions import NotFoundException
+from src.commons import camel_case_converter
+from src.commons.exceptions import NotFoundException
 from src.environment import Environment
 from src.configuration import configuration
 from src.restore.datastore.restoration_job import RestorationJob

src/restore/table/table_restore_handler.py

@@ -2,8 +2,8 @@
 
 import webapp2
 
-from commons.exceptions import ParameterValidationException
-from commons.json_handler import JsonHandler
+from src.commons.exceptions import ParameterValidationException
+from src.commons.json_handler import JsonHandler
 from src.bbq_authenticated_handler import BbqAuthenticatedHandler
 from src.big_query import validators
 from src.configuration import configuration

src/restore/test/table_randomizer.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 
 from src.big_query.big_query_table_metadata import BigQueryTableMetadata
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 from src.big_query.big_query import BigQuery, RandomizationError
 from src.table_reference import TableReference
 

src/tasks.py

@@ -5,10 +5,10 @@
     UnknownQueueError, Task
 from google.appengine.runtime.apiproxy_errors import DeadlineExceededError
 
-from commons.decorators.retry import retry
+from src.commons.decorators.retry import retry
 from error_reporting import ErrorReporting
 from src import request_correlation_id
-from commons.collections import paginated
+from src.commons.collections import paginated
 
 
 class Tasks(object):

tests/backup/copy_job_async/test_task_creator.py

@@ -6,7 +6,7 @@
 from google.appengine.ext import testbed
 from mock import patch
 
-from commons.test_utils import utils
+from src.commons.test_utils import utils
 from src.backup.copy_job_async.copy_job.copy_job_request import CopyJobRequest
 from src.backup.copy_job_async.copy_job.copy_job_task_name import \
     CopyJobTaskName

tests/backup/test_after_backup_action_handler.py

@@ -22,7 +22,7 @@
 import webtest
 from google.appengine.ext import testbed
 from apiclient.http import HttpMockSequence
-from commons.test_utils import utils
+from src.commons.test_utils import utils
 from src.backup import after_backup_action_handler
 from src.big_query.big_query_table import BigQueryTable
 

tests/backup/test_backup_id_creator.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 
 from src.backup.backup_id_creator import BackupIdCreator
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 
 
 class TestBackupIdCreator(unittest.TestCase):

tests/backup/test_backup_scheduler.py

@@ -5,7 +5,7 @@
 from google.appengine.ext import testbed
 from mock import patch, Mock, mock, call
 
-from commons.test_utils import utils
+from src.commons.test_utils import utils
 from mock.mock import PropertyMock
 from src import request_correlation_id
 from src.backup.backup_scheduler import BackupScheduler

tests/backup/test_dataset_id_creator.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 
 from src.backup.dataset_id_creator import DatasetIdCreator
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 
 
 class TestDatasetIdCreator(unittest.TestCase):

tests/backup/test_organisation_retention_handler.py

@@ -5,7 +5,7 @@
 from google.appengine.ext import testbed
 
 import webtest
-from commons.test_utils import utils
+from src.commons.test_utils import utils
 from mock import patch
 from src.backup.datastore.Table import Table
 from src.retention.organization_retention_handler import \

tests/backup/test_task_creator.py

@@ -4,7 +4,7 @@
 from google.appengine.ext import testbed
 from mock import patch
 
-from commons.test_utils import utils
+from src.commons.test_utils import utils
 from src import request_correlation_id
 from src.backup.task_creator import TaskCreator
 

tests/restore/dataset/test_dataset_restore_handler.py

@@ -2,7 +2,7 @@
 import os
 import uuid
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from src.restore.dataset.dataset_restore_service import DatasetRestoreService
 from src.restore.status.restoration_job_status_service import \
     RestorationJobStatusService

tests/restore/dataset/test_dataset_restore_parameters_validator.py

@@ -4,7 +4,7 @@
 from google.appengine.ext import testbed
 from mock import patch
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from src.restore.dataset.dataset_restore_parameters_validator import \
     DatasetRestoreParametersValidator
 from tests.utils import table_entities_creator

tests/restore/list/test_backup_key_parser.py

@@ -2,7 +2,7 @@
 
 from google.appengine.ext import ndb
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from src.restore.list.backup_key_parser import BackupKeyParser
 
 

tests/restore/list/test_backup_list_restore_service.py

@@ -3,7 +3,7 @@
 from google.appengine.ext import testbed, ndb
 from mock import patch, PropertyMock
 
-from commons.exceptions import ParameterValidationException
+from src.commons.exceptions import ParameterValidationException
 from src.backup.datastore.Backup import Backup
 from src.backup.datastore.Table import Table
 from src.configuration import Configuration

tests/restore/status/test_restoration_job_status_service.py

@@ -4,7 +4,7 @@
 from google.appengine.ext import testbed, ndb
 from mock import patch, PropertyMock
 
-from commons.exceptions import NotFoundException
+from src.commons.exceptions import NotFoundException
 from src.environment import Environment
 from src.configuration import Configuration
 from src.restore.datastore.restoration_job import RestorationJob

tests/restore/table/test_backup_finder.py

@@ -3,7 +3,7 @@
 
 from google.appengine.ext import testbed, ndb
 
-from commons.exceptions import NotFoundException
+from src.commons.exceptions import NotFoundException
 from src.backup.datastore.Table import Table
 from src.backup.datastore.backup_finder import BackupFinder
 from src.table_reference import TableReference

tests/restore/table/test_table_restore_handler.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 
-from commons.exceptions import NotFoundException
+from src.commons.exceptions import NotFoundException
 from src.restore.table import table_restore_handler
 from src.restore.table.table_restore_service import TableRestoreService
 from src.table_reference import TableReference

tests/test_cached_decorator.py

@@ -3,7 +3,7 @@
 from google.appengine.api import memcache
 from google.appengine.ext import testbed
 
-from commons.decorators.cached import cached
+from src.commons.decorators.cached import cached
 from mock import patch, call
 
 RETURNED_VALUE = 'importantString'