Commit 45e7b2c3 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '1-data-manager-with-local-storage-backend' into 'main' 

Resolve "Data manager with local storage backend"

Closes #1

See merge request !5
parents b6347d75 31c954a6

.coveragerc

+3 −0
Original line number Diff line number Diff line 
[report]

omit =

    tests/*

    app/brokers/filesys/*

    app/auth/keycloak.py

    app/main.py
 
 No newline at end of file

.gitlab-ci.yml

+10 −10
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ stages: 


variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-manager-dev"

  CONTAINER_RDM_URL_PROD: "${CI_REGISTRY_IMAGE}/remote-data-manager"

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker-dev"

  CONTAINER_RDM_URL_PROD: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  coverage_report_view: "true"



# This import is for the func_rse_docker_* functions
@@ -30,17 +30,17 @@ lint: 
    - >

      docker build

      -f dockerfiles/Dockerfile

      -t remote-data-manager .

      -t remote-data-broker .

    - >

      docker run --rm remote-data-manager bash -c 

      docker run --rm remote-data-broker bash -c 

      "set -e;

      poetry run isort --filter-files --check-only . ;

      poetry run black --check --diff .;

      poetry run flake8 .;

      poetry run pylint app;

      poetry run pylint app tests;

      poetry run mypy .

      "

    - docker tag remote-data-manager $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker tag remote-data-broker $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker push $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

  tags:

    - rse-multi-builder
@@ -83,8 +83,8 @@ service-build: 
    - >    

      docker build

      -f dockerfiles/Dockerfile --target production

      -t remote-data-manager .

    - docker tag remote-data-manager $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

      -t remote-data-broker .

    - docker tag remote-data-broker $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - docker tag $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:latest

    - docker push $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:latest

    - docker push $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA
@@ -100,7 +100,7 @@ service-integration-tests: 
  script:

    - > 

      docker run --rm -d

      --name remote-data-manager

      --name remote-data-broker

      -p 8090:8000

      $CONTAINER_RDM_URL_PROD/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA

    - sleep 2
@@ -109,7 +109,7 @@ service-integration-tests: 
      -e LOCALHOST

      -v $PWD:/reports

      $CONTAINER_RDM_URL/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA bash -c "poetry run pytest tests/integration --junitxml=/reports/report_int.xml"

    - docker rm -f remote-data-manager

    - docker rm -f remote-data-broker

  artifacts:

    when: always

    reports:

.pre-commit-config.yaml

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ repos: 
      - id: system

        name: Pylint

        description: use pylint to lint

        entry: poetry run pylint app

        entry: poetry run pylint app tests

        pass_filenames: false

        language: system

  - repo: local
@@ -68,6 +68,6 @@ repos: 
      - id: system

        name: Coverage

        description: use pytest to run unit tests with coverage

        entry: poetry run pytest  --cov=app --cov-fail-under=80 tests/unit

        entry: poetry run pytest  --cov=. --cov-fail-under=80 tests/unit

        pass_filenames: false

        language: system
 
 No newline at end of file

README.md

+1 −1
Original line number Diff line number Diff line 
# remote-data-managers

# remote-data-brokers



This is a project for remote data managers that are responsible for data transfers between local storage and a distributed data management solution.

app/auth/__init__.py

0 → 100644
+3 −0
Original line number Diff line number Diff line 
from app.auth.abstract import AuthBroker



__all__ = ["AuthBroker"]