Skip to content

Commit d1b88a7

Browse files
[DOP-22108] Rename backend to server (#174)
1 parent 5be1c5d commit d1b88a7

File tree

181 files changed

+539
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+539
-531
lines changed

.env.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ SYNCMASTER__AUTH__KEYCLOAK__CLIENT_SECRET=generated_by_keycloak
3232
SYNCMASTER__AUTH__KEYCLOAK__REDIRECT_URI=http://localhost:8000/auth/callback
3333
SYNCMASTER__AUTH__KEYCLOAK__SCOPE=email
3434
SYNCMASTER__AUTH__KEYCLOAK__VERIFY_SSL=False
35-
SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.keycloak_provider.KeycloakAuthProvider
35+
SYNCMASTER__AUTH__PROVIDER=syncmaster.server.providers.auth.keycloak_provider.KeycloakAuthProvider
3636

3737
# Dummy Auth
38-
SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.dummy_provider.DummyAuthProvider
38+
SYNCMASTER__AUTH__PROVIDER=syncmaster.server.providers.auth.dummy_provider.DummyAuthProvider
3939
SYNCMASTER__AUTH__ACCESS_TOKEN__SECRET_KEY=secret
4040

4141
# S3

.env.local

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ export SYNCMASTER__AUTH__KEYCLOAK__CLIENT_SECRET=generated_by_keycloak
3232
export SYNCMASTER__AUTH__KEYCLOAK__REDIRECT_URI=http://localhost:8000/auth/callback
3333
export SYNCMASTER__AUTH__KEYCLOAK__SCOPE=email
3434
export SYNCMASTER__AUTH__KEYCLOAK__VERIFY_SSL=False
35-
export SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.keycloak_provider.KeycloakAuthProvider
35+
export SYNCMASTER__AUTH__PROVIDER=syncmaster.server.providers.auth.keycloak_provider.KeycloakAuthProvider
3636

3737
# Dummy Auth
38-
export SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.dummy_provider.DummyAuthProvider
38+
export SYNCMASTER__AUTH__PROVIDER=syncmaster.server.providers.auth.dummy_provider.DummyAuthProvider
3939
export SYNCMASTER__AUTH__ACCESS_TOKEN__SECRET_KEY=secret
4040

4141
export TEST_S3_HOST_FOR_CONFTEST=localhost

.github/labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
description: Add this label to skip changelog file check
1515
color: 04990f
1616

17-
- name: component:backend
18-
description: Backend-related changes
17+
- name: component:server
18+
description: Server-related changes
1919
color: '5319e7'
2020

2121
- name: component:worker

.github/workflows/backend_docker_image.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Backend docker image
1+
name: Server docker image
22

33
on:
44
push:
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
release:
17-
name: Build & push backend image to Dockerhub
17+
name: Build & push server image to Dockerhub
1818
runs-on: ubuntu-latest
1919
if: github.repository == 'MobileTeleSystems/syncmaster' # prevent running on forks
2020

@@ -38,22 +38,22 @@ jobs:
3838
id: set_tag
3939
run: |
4040
if [[ "${{ github.ref_type }}" == "branch" && "${{ github.ref_name }}" == "develop" ]]; then
41-
echo "TAG=mtsrus/syncmaster-backend:develop" >> $GITHUB_ENV
41+
echo "TAG=mtsrus/syncmaster-server:develop" >> $GITHUB_ENV
4242
elif [[ "${{ github.ref_type }}" == "tag" ]]; then
43-
echo "TAG=mtsrus/syncmaster-backend:latest,mtsrus/syncmaster-backend:${{ github.ref_name }}" >> $GITHUB_ENV
43+
echo "TAG=mtsrus/syncmaster-server:latest,mtsrus/syncmaster-server:${{ github.ref_name }}" >> $GITHUB_ENV
4444
fi
4545
46-
- name: Build Backend image
46+
- name: Build Server image
4747
uses: docker/build-push-action@v6
4848
with:
4949
tags: ${{ env.TAG }}
5050
context: .
5151
target: prod
52-
file: docker/Dockerfile.backend
52+
file: docker/Dockerfile.server
5353
pull: true
5454
push: true
5555
cache-to: type=inline
56-
cache-from: mtsrus/syncmaster-backend:develop
56+
cache-from: mtsrus/syncmaster-server:develop
5757
platforms: |
5858
linux/amd64
5959
linux/arm64/v8
@@ -76,6 +76,6 @@ jobs:
7676
username: ${{ secrets.DOCKERHUB_USERNAME }}
7777
# this requires token with read+write+delete permissions. read+write is not enough!
7878
password: ${{ secrets.DOCKERHUB_TOKEN }}
79-
repository: mtsrus/syncmaster-backend
79+
repository: mtsrus/syncmaster-server
8080
short-description: ${{ github.event.repository.description }}
8181
enable-url-completion: true

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: poetry run flake8 syncmaster/
6161

6262
- name: Run mypy
63-
run: poetry run mypy --config-file ./pyproject.toml ./syncmaster/backend
63+
run: poetry run mypy --config-file ./pyproject.toml ./syncmaster/server
6464

6565
codeql:
6666
name: CodeQL

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Generate OpenAPI Schema
5959
run: |
6060
source .env.local
61-
poetry run python -m syncmaster.backend.scripts.export_openapi_schema openapi.json
61+
poetry run python -m syncmaster.server.scripts.export_openapi_schema openapi.json
6262
6363
- name: Fix logo in Readme
6464
run: |

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
source .env.local
5858
poetry run python -m syncmaster.db.migrations upgrade head
59-
poetry run coverage run -m pytest -vvv -s -m "backend or scheduler"
59+
poetry run coverage run -m pytest -vvv -s -m "server or scheduler"
6060
6161
- name: Shutdown
6262
if: always()

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ repos:
3939
- id: chmod
4040
args: ['644']
4141
exclude_types: [shell]
42-
exclude: ^(.*__main__\.py|syncmaster/backend/scripts/export_openapi_schema\.py)$
42+
exclude: ^(.*__main__\.py|syncmaster/server/scripts/export_openapi_schema\.py)$
4343
- id: chmod
4444
args: ['755']
4545
types: [shell]
4646
- id: chmod
4747
args: ['755']
48-
files: ^(.*__main__\.py|syncmaster/backend/scripts/export_openapi_schema\.py)$
48+
files: ^(.*__main__\.py|syncmaster/server/scripts/export_openapi_schema\.py)$
4949
- id: insert-license
5050
files: .*\.py$
51-
exclude: ^(syncmaster/backend/dependencies/stub.py|docs/.*\.py|tests/.*\.py)$
51+
exclude: ^(syncmaster/server/dependencies/stub.py|docs/.*\.py|tests/.*\.py)$
5252
args:
5353
- --license-filepath
5454
- .spdx-license-header.txt
@@ -109,7 +109,7 @@ repos:
109109

110110
- id: mypy
111111
name: mypy
112-
entry: mypy ./syncmaster/backend --config-file ./pyproject.toml
112+
entry: mypy ./syncmaster/server --config-file ./pyproject.toml
113113
language: python
114114
require_serial: true
115115
pass_filenames: false

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ It allows to keep development environment the same for all developers due to usi
5454

5555
There are *extra* dependencies (included into package as optional):
5656

57-
* ``backend`` - for running backend
57+
* ``server`` - for running server
5858
* ``worker`` - for running Celery workers
5959

6060
And *groups* (not included into package, used locally and in CI):
@@ -330,7 +330,7 @@ Examples for adding changelog entries to your Pull Requests
330330
.. code-block:: rst
331331
:caption: docs/changelog/next_release/2345.bugfix.rst
332332
333-
Fixed behavior of ``backend`` -- by :github:user:`someuser`
333+
Fixed behavior of ``server`` -- by :github:user:`someuser`
334334
335335
.. code-block:: rst
336336
:caption: docs/changelog/next_release/3456.feature.rst

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ test-cleanup: ##@Test Cleanup tests dependencies
122122

123123

124124
dev-server: db-start ##@Application Run development server (without docker)
125-
${POETRY} run python -m syncmaster.backend $(ARGS)
125+
${POETRY} run python -m syncmaster.server $(ARGS)
126126

127127
dev-worker: db-start broker-start ##@Application Run development broker (without docker)
128128
${POETRY} run python -m celery -A syncmaster.worker.celery worker --max-tasks-per-child=1 $(ARGS)
129129

130130

131131

132132
prod-build-server: ##@Application Build docker image for server
133-
docker build --progress=plain -t mtsrus/syncmaster-backend:develop -f ./docker/Dockerfile.backend --target=prod $(ARGS) .
133+
docker build --progress=plain -t mtsrus/syncmaster-server:develop -f ./docker/Dockerfile.server --target=prod $(ARGS) .
134134

135135
prod-build-scheduler: ##@Application Build docker image for scheduler
136136
docker build --progress=plain -t mtsrus/syncmaster-scheduler:develop -f ./docker/Dockerfile.scheduler --target=prod $(ARGS) .
@@ -164,4 +164,4 @@ docs-cleanup: ##@Docs Cleanup docs
164164
docs-fresh: docs-cleanup docs-build ##@Docs Cleanup & build docs
165165

166166
openapi: ##@Docs Generate OpenAPI schema
167-
python -m syncmaster.backend.scripts.export_openapi_schema docs/_static/openapi.json
167+
python -m syncmaster.server.scripts.export_openapi_schema docs/_static/openapi.json

0 commit comments

Comments
 (0)