Skip to content

Commit 0e9d8cd

Browse files
authored
Merge pull request #2 from fairagro/feature/split_off_client
Feature/split off client
2 parents 97de815 + fef39d2 commit 0e9d8cd

111 files changed

Lines changed: 291 additions & 12424 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
"disableIp6tables": true,
1313
"version": "28.5.1"
1414
},
15-
// NOTE: this conflicts with out own pre-push git hook.
16-
// Currently we do not need git-lfs in this project, anyway.
17-
// "ghcr.io/devcontainers/features/git-lfs:1": {
18-
// "autoPull": true,
19-
// "installDirectlyFromGitHubRelease": true,
20-
// "version": "3.7.1"
21-
// },
15+
"ghcr.io/devcontainers/features/git-lfs:1": {
16+
"autoPull": true,
17+
"installDirectlyFromGitHubRelease": true,
18+
"version": "3.7.1"
19+
},
2220
"ghcr.io/devcontainers/features/github-cli:1": {
2321
"installDirectlyFromGitHubRelease": true,
2422
"version": "2.82.1"

.github/workflows/docker-build.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
description: 'A JSON string array of components to build'
1919
required: false
2020
type: string
21-
default: '["api"]'
21+
default: '["sql_to_arc"]'
2222
outputs:
2323
version:
2424
description: 'Calculated version'
@@ -145,10 +145,6 @@ jobs:
145145
id: component-meta
146146
run: |
147147
case "${{ matrix.component }}" in
148-
api)
149-
echo "title=FairAgro Advanced Middleware API" >> $GITHUB_OUTPUT
150-
echo "description=Advanced middleware API for FairAgro platform" >> $GITHUB_OUTPUT
151-
;;
152148
sql_to_arc)
153149
echo "title=FairAgro SQL to ARC Converter" >> $GITHUB_OUTPUT
154150
echo "description=Converts SQL database metadata to ARC format for FairAgro platform" >> $GITHUB_OUTPUT

.github/workflows/docker-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
push_to_registry: true
4141
version_bump: ${{ startsWith(github.ref_name, 'feature/') && 'patch' || (github.event.inputs.version_bump || 'patch') }}
42-
components: '["api", "sql_to_arc"]' # Add other components here in the future, e.g., '["api", "worker"]'
42+
components: '["sql_to_arc"]' # Add other components here in the future, e.g., '["worker"]'
4343
secrets: inherit
4444

4545
security-scan-release:

.github/workflows/helm-release.yml

Lines changed: 0 additions & 212 deletions
This file was deleted.

.github/workflows/python-quality.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,22 @@ jobs:
101101
echo "❌ Failing workflow due to HIGH or MEDIUM severity security issues found by bandit."
102102
exit 1
103103
104-
- name: Run unit tests with coverage
104+
- name: Run tests (Unit & Integration)
105105
run: |
106-
uv run pytest middleware/*/tests/unit/ --cov=api --cov=api_client --cov=shared --cov=sql_to_arc --cov-report=xml --cov-report=html --cov-report=term-missing --junitxml=pytest-report.xml
106+
uv run pytest \
107+
middleware/*/tests/unit/ \
108+
middleware/*/tests/integration/ \
109+
--cov=sql_to_arc \
110+
--cov-report=xml \
111+
--cov-report=html \
112+
--cov-report=term-missing \
113+
--junitxml=pytest-report.xml
107114
108115
- name: Upload coverage to Codecov
109116
uses: codecov/codecov-action@v4
110117
with:
111118
file: ./coverage.xml
112-
flags: unittests
119+
flags: tests
113120
name: codecov-umbrella
114121
fail_ci_if_error: false
115122

@@ -134,4 +141,4 @@ jobs:
134141
echo "| pylint | ✅ Code quality | Static analysis (min score: 8.0) |" >> $GITHUB_STEP_SUMMARY
135142
echo "| mypy | ✅ Type checking | Static type analysis |" >> $GITHUB_STEP_SUMMARY
136143
echo "| bandit | ✅ Security | Security vulnerability scan |" >> $GITHUB_STEP_SUMMARY
137-
echo "| pytest | ✅ Unit tests | Test execution with coverage |" >> $GITHUB_STEP_SUMMARY
144+
echo "| pytest | ✅ Unit & Integration tests | Test execution with coverage |" >> $GITHUB_STEP_SUMMARY

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"python.testing.unittestEnabled": false,
88
"python.testing.pytestEnabled": true,
99
"python.testing.autoTestDiscoverOnSaveEnabled": true,
10-
"python.testing.pytestPath": ".venv/bin/pytest",
10+
"python.testing.pytestPath": "${workspaceFolder}/.venv/bin/pytest",
1111
"python.testing.cwd": "${workspaceFolder}",
1212
"python-envs.pythonProjects": [],
1313

@@ -20,7 +20,7 @@
2020
"source.fixAll.ruff": "explicit"
2121
}
2222
},
23-
"python.defaultInterpreterPath": ".venv/bin/python",
23+
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
2424

2525
"sops-edit.onlyUseButtons": false,
2626
"sops-edit.tempFilePreExtension": "decrypted",

dev_environment/compose-external.yaml

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)