Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions .github/workflows/test_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,23 @@ jobs:
--health-timeout 5s
--health-retries 5

env: # <-- Consolidated env block here
env:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_DB: source_collector_test_db
POSTGRES_DB: postgres
POSTGRES_HOST: postgres
POSTGRES_PORT: 5432
DATA_SOURCES_HOST: postgres
DATA_SOURCES_PORT: 5432
DATA_SOURCES_USER: postgres
DATA_SOURCES_PASSWORD: postgres
DATA_SOURCES_DB: test_data_sources_db
FDW_DATA_SOURCES_HOST: postgres
FDW_DATA_SOURCES_PORT: 5432
FDW_DATA_SOURCES_USER: postgres
FDW_DATA_SOURCES_PASSWORD: postgres
FDW_DATA_SOURCES_DB: test_data_sources_db
GOOGLE_API_KEY: TEST
GOOGLE_CSE_ID: TEST

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install PostgreSQL client tools
run: |
apt-get update
apt-get install -y postgresql-client

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
python -m local_database.create_database --use-shell

- name: Run tests
run: |
Expand Down

This file was deleted.

Binary file not shown.
38 changes: 0 additions & 38 deletions local_database/DockerInfos.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from local_database.DTOs import DockerInfo, DockerfileInfo, HealthCheckInfo, VolumeInfo
from local_database.constants import LOCAL_DATA_SOURCES_DB_NAME
from util.helper_functions import get_from_env, project_path


Expand All @@ -26,43 +25,6 @@ def get_database_docker_info() -> DockerInfo:
)
)


def get_data_sources_data_dumper_info() -> DockerInfo:
return DockerInfo(
dockerfile_info=DockerfileInfo(
image_tag="datadumper",
dockerfile_directory=str(project_path(
"local_database",
"DataDumper"
))
),
volume_info=VolumeInfo(
host_path=str(project_path(
"local_database",
"DataDumper",
"dump"
)),
container_path="/dump"
),
name="datadumper",
environment={
"DUMP_HOST": get_from_env("PROD_DATA_SOURCES_HOST"),
"DUMP_USER": get_from_env("PROD_DATA_SOURCES_USER"),
"DUMP_PASSWORD": get_from_env("PROD_DATA_SOURCES_PASSWORD"),
"DUMP_NAME": get_from_env("PROD_DATA_SOURCES_DB"),
"DUMP_PORT": get_from_env("PROD_DATA_SOURCES_PORT"),
"RESTORE_HOST": get_from_env("POSTGRES_HOST"),
"RESTORE_USER": get_from_env("POSTGRES_USER"),
"RESTORE_PORT": get_from_env("POSTGRES_PORT"),
"RESTORE_DB_NAME": LOCAL_DATA_SOURCES_DB_NAME,
"RESTORE_PASSWORD": get_from_env("POSTGRES_PASSWORD"),
"DUMP_FILE": "/dump/data_sources_db_dump.sql",
"DUMP_SCHEMA_ONLY": "true"
},
command="bash"
)


def get_source_collector_data_dumper_info() -> DockerInfo:
return DockerInfo(
dockerfile_info=DockerfileInfo(
Expand Down
1 change: 0 additions & 1 deletion local_database/constants.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
LOCAL_DATA_SOURCES_DB_NAME = "test_data_sources_db"
LOCAL_SOURCE_COLLECTOR_DB_NAME = "source_collector_test_db"

DUMP_SH_DOCKER_PATH = "/usr/local/bin/dump.sh"
Expand Down
Loading