Skip to content
This repository has been archived by the owner on Nov 11, 2019. It is now read-only.

codecoverage/backend: move project to respect new naming #1566

Merged
merged 2 commits into from Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nix/setup.cfg
Expand Up @@ -19,7 +19,7 @@ sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
known_first_party =
backend_common
cli_common
code_coverage_backend
codecoverage_backend
code_coverage_bot
code_coverage_crawler
mapper_api
Expand Down
Expand Up @@ -6,15 +6,15 @@
from __future__ import absolute_import

import os
import code_coverage_backend.config
import codecoverage_backend.config


def create_app(config=None):
import backend_common

app = backend_common.create_app(
project_name=code_coverage_backend.config.PROJECT_NAME,
app_name=code_coverage_backend.config.APP_NAME,
project_name=codecoverage_backend.config.PROJECT_NAME,
app_name=codecoverage_backend.config.APP_NAME,
config=config,
extensions=[
'log',
Expand Down
Expand Up @@ -9,12 +9,12 @@

from cli_common.phabricator import PhabricatorAPI
from cli_common.phabricator import revision_exists_on_central
from code_coverage_backend import coverage
from code_coverage_backend import coverage_by_changeset_impl
from code_coverage_backend import coverage_for_file_impl
from code_coverage_backend import coverage_summary_by_changeset_impl
from code_coverage_backend import secrets
from code_coverage_backend.worker import conn
from codecoverage_backend import coverage
from codecoverage_backend import coverage_by_changeset_impl
from codecoverage_backend import coverage_for_file_impl
from codecoverage_backend import coverage_summary_by_changeset_impl
from codecoverage_backend import secrets
from codecoverage_backend.worker import conn

q = Queue(connection=conn)

Expand Down
Expand Up @@ -10,7 +10,7 @@ produces:
paths:
/coverage/file:
get:
operationId: "code_coverage_backend.api.coverage_for_file"
operationId: "codecoverage_backend.api.coverage_for_file"
parameters:
- name: changeset
in: query
Expand All @@ -30,7 +30,7 @@ paths:

/coverage/changeset/{changeset}:
get:
operationId: "code_coverage_backend.api.coverage_by_changeset"
operationId: "codecoverage_backend.api.coverage_by_changeset"
parameters:
- name: changeset
in: path
Expand All @@ -45,7 +45,7 @@ paths:

/coverage/changeset_summary/{changeset}:
get:
operationId: "code_coverage_backend.api.coverage_summary_by_changeset"
operationId: "codecoverage_backend.api.coverage_summary_by_changeset"
parameters:
- name: changeset
in: path
Expand All @@ -60,7 +60,7 @@ paths:

/coverage/supported_extensions:
get:
operationId: "code_coverage_backend.api.coverage_supported_extensions"
operationId: "codecoverage_backend.api.coverage_supported_extensions"
responses:
200:
description: File extensions supported for code coverage
Expand All @@ -69,7 +69,7 @@ paths:

/coverage/latest:
get:
operationId: "code_coverage_backend.api.coverage_latest"
operationId: "codecoverage_backend.api.coverage_latest"
responses:
200:
description: Latest coverage builds
Expand All @@ -78,7 +78,7 @@ paths:

/v2/path:
get:
operationId: "code_coverage_backend.v2.coverage_for_path"
operationId: "codecoverage_backend.v2.coverage_for_path"
parameters:
- name: changeset
in: query
Expand All @@ -98,7 +98,7 @@ paths:

/phabricator/base_revision_from_phid/{revision_phid}:
get:
operationId: "code_coverage_backend.api.phabricator_base_revision_from_phid"
operationId: "codecoverage_backend.api.phabricator_base_revision_from_phid"
parameters:
- name: revision_phid
in: path
Expand Down
Expand Up @@ -6,4 +6,4 @@
from __future__ import absolute_import

PROJECT_NAME = 'code-coverage-backend'
APP_NAME = 'code_coverage_backend'
APP_NAME = 'codecoverage_backend'
Expand Up @@ -7,8 +7,8 @@
from cachetools import LRUCache

from cli_common import log
from code_coverage_backend.services import coverage_service
from code_coverage_backend.services.base import CoverageException
from codecoverage_backend.services import coverage_service
from codecoverage_backend.services.base import CoverageException

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -7,10 +7,10 @@

import aiohttp

from code_coverage_backend.coverage import coverage_supported
from code_coverage_backend.coverage import get_coverage_build
from code_coverage_backend.services import coverage_service
from code_coverage_backend.services.base import get_github_commit
from codecoverage_backend.coverage import coverage_supported
from codecoverage_backend.coverage import get_coverage_build
from codecoverage_backend.services import coverage_service
from codecoverage_backend.services.base import get_github_commit


async def generate(changeset):
Expand Down
Expand Up @@ -3,10 +3,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from code_coverage_backend.coverage import coverage_supported
from code_coverage_backend.coverage import get_coverage_build
from code_coverage_backend.services import coverage_service
from code_coverage_backend.services.base import get_github_commit
from codecoverage_backend.coverage import coverage_supported
from codecoverage_backend.coverage import get_coverage_build
from codecoverage_backend.services import coverage_service
from codecoverage_backend.services.base import get_github_commit


async def generate(changeset, path):
Expand Down
Expand Up @@ -5,6 +5,6 @@

from __future__ import absolute_import

import code_coverage_backend
import codecoverage_backend

app = code_coverage_backend.create_app()
app = codecoverage_backend.create_app()
Expand Up @@ -6,11 +6,11 @@
import os

import cli_common.taskcluster
import code_coverage_backend.config
import codecoverage_backend.config

secrets = cli_common.taskcluster.get_secrets(
os.environ.get('TASKCLUSTER_SECRET'),
code_coverage_backend.config.PROJECT_NAME,
codecoverage_backend.config.PROJECT_NAME,
required=['ESFRONTLINE', 'PHABRICATOR_TOKEN'],
existing={x: os.environ.get(x) for x in ['REDIS_URL'] if x in os.environ},
taskcluster_client_id=os.environ.get('TASKCLUSTER_CLIENT_ID'),
Expand Down
Expand Up @@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from cli_common import log
from code_coverage_backend import secrets
from code_coverage_backend.services import coveralls, codecov, active_data
from codecoverage_backend import secrets
from codecoverage_backend.services import coveralls, codecov, active_data

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -11,8 +11,8 @@
from esFrontLine.client.async import AsyncHawkConnection

from cli_common import log
from code_coverage_backend import secrets
from code_coverage_backend.services.base import Coverage
from codecoverage_backend import secrets
from codecoverage_backend.services.base import Coverage

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -8,7 +8,7 @@
import aiohttp
from async_lru import alru_cache

from code_coverage_backend.services import secrets
from codecoverage_backend.services import secrets


class Coverage(ABC):
Expand Down
Expand Up @@ -7,11 +7,11 @@
from async_lru import alru_cache

from cli_common import log
from code_coverage_backend.services import secrets
from code_coverage_backend.services.base import Coverage
from code_coverage_backend.services.base import CoverageException
from code_coverage_backend.services.base import get_github_commit
from code_coverage_backend.services.base import get_mercurial_commit
from codecoverage_backend.services import secrets
from codecoverage_backend.services.base import Coverage
from codecoverage_backend.services.base import CoverageException
from codecoverage_backend.services.base import get_github_commit
from codecoverage_backend.services.base import get_mercurial_commit

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -6,11 +6,11 @@
import aiohttp
from async_lru import alru_cache

from code_coverage_backend.services import secrets
from code_coverage_backend.services.base import Coverage
from code_coverage_backend.services.base import CoverageException
from code_coverage_backend.services.base import get_github_commit
from code_coverage_backend.services.base import get_mercurial_commit
from codecoverage_backend.services import secrets
from codecoverage_backend.services.base import Coverage
from codecoverage_backend.services.base import CoverageException
from codecoverage_backend.services.base import get_github_commit
from codecoverage_backend.services.base import get_mercurial_commit


class CoverallsCoverage(Coverage):
Expand Down
Expand Up @@ -4,8 +4,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from cli_common import log
from flask import abort
from code_coverage_backend.v2.base import active_data, NoResults
from code_coverage_backend.v2.path import coverage_paths
from codecoverage_backend.v2.base import active_data, NoResults
from codecoverage_backend.v2.path import coverage_paths

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -6,8 +6,8 @@
from esFrontLine.client.sync import HawkConnection

from cli_common import log
from code_coverage_backend import secrets
from code_coverage_backend.services.active_data import ActiveDataCoverage
from codecoverage_backend import secrets
from codecoverage_backend.services.active_data import ActiveDataCoverage

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from cli_common import log
from code_coverage_backend.services.active_data import ActiveDataCoverage
from code_coverage_backend.v2.base import active_data
from codecoverage_backend.services.active_data import ActiveDataCoverage
from codecoverage_backend.v2.base import active_data

logger = log.get_logger(__name__)

Expand Down
Expand Up @@ -8,7 +8,7 @@
from rq import Queue
from rq import SimpleWorker

from code_coverage_backend import secrets
from codecoverage_backend import secrets

conn = redis.from_url(secrets.REDIS_URL)

Expand Down
4 changes: 2 additions & 2 deletions src/codecoverage/backend/default.nix
Expand Up @@ -10,7 +10,7 @@ let

python = import ./requirements.nix { inherit (releng_pkgs) pkgs; };
name = "mozilla-code-coverage-backend";
dirname = "code_coverage_backend";
dirname = "codecoverage_backend";

self = mkBackend rec {
inherit python name dirname;
Expand All @@ -29,7 +29,7 @@ let
mkdir -p $out/bin
cp ${src}/launch.sh $out/bin
chmod +x $out/bin/launch.sh
cp ${src}/code_coverage_backend/worker.py $out/bin/code_coverage_backend_worker
cp ${src}/codecoverage_backend/worker.py $out/bin/codecoverage_backend_worker
'';
passthru = {
update = writeScript "update-${name}" ''
Expand Down
6 changes: 3 additions & 3 deletions src/codecoverage/backend/launch.sh
@@ -1,5 +1,5 @@
#!/bin/sh

python /bin/code_coverage_backend_worker &
python /bin/code_coverage_backend_worker &
gunicorn code_coverage_backend.flask:app --log-file -
python /bin/codecoverage_backend_worker &
python /bin/codecoverage_backend_worker &
gunicorn codecoverage_backend.flask:app --log-file -
6 changes: 3 additions & 3 deletions src/codecoverage/backend/settings.py
Expand Up @@ -7,7 +7,7 @@
import os

import cli_common.taskcluster
import code_coverage_backend.config
import codecoverage_backend.config

DEBUG = bool(os.environ.get('DEBUG', False))

Expand All @@ -22,7 +22,7 @@

secrets = cli_common.taskcluster.get_secrets(
os.environ.get('TASKCLUSTER_SECRET'),
code_coverage_backend.config.PROJECT_NAME,
codecoverage_backend.config.PROJECT_NAME,
required=required,
existing={x: os.environ.get(x) for x in required if x in os.environ},
taskcluster_client_id=os.environ.get('TASKCLUSTER_CLIENT_ID'),
Expand All @@ -48,7 +48,7 @@
CACHE['CACHE_DEFAULT_TIMEOUT'] = float(CACHE['CACHE_DEFAULT_TIMEOUT'])

if 'CACHE_KEY_PREFIX' not in CACHE:
CACHE['CACHE_KEY_PREFIX'] = code_coverage_backend.config.PROJECT_NAME + '-'
CACHE['CACHE_KEY_PREFIX'] = codecoverage_backend.config.PROJECT_NAME + '-'

REDIS_URL = secrets['REDIS_URL']
CACHE['CACHE_TYPE'] = 'redis'
Expand Down
2 changes: 1 addition & 1 deletion src/codecoverage/backend/setup.py
Expand Up @@ -30,7 +30,7 @@ def read_requirements(file_):


setup(
name='code_coverage_backend',
name='codecoverage_backend',
version=version,
description='The code behind https://coverage.moz.tools',
author='Mozilla Release Management',
Expand Down
8 changes: 4 additions & 4 deletions src/codecoverage/backend/tests/conftest.py
Expand Up @@ -39,7 +39,7 @@ def mock_secrets():

@pytest.fixture(scope='function')
def mock_secrets_bad_phabricator_token(mock_secrets):
import code_coverage_backend.secrets as s
import codecoverage_backend.secrets as s
old = s.PHABRICATOR_TOKEN
s.PHABRICATOR_TOKEN = 'api-bad-token'
yield
Expand All @@ -49,13 +49,13 @@ def mock_secrets_bad_phabricator_token(mock_secrets):
@pytest.fixture()
def app(mock_secrets):
'''
Load code_coverage_backend app in test mode
Load codecoverage_backend app in test mode
'''
import code_coverage_backend
import codecoverage_backend

config = backend_common.testing.get_app_config({
})
app = code_coverage_backend.create_app(config)
app = codecoverage_backend.create_app(config)

with app.app_context():
backend_common.testing.configure_app(app)
Expand Down