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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[submodule "docker/worker/osv-test"]
path = gcp/workers/worker/osv-test
path = gcp/workers/oss_fuzz_worker/osv-test
url = https://github.com/oliverchang/osv-test.git
[submodule "osv-schema"]
path = osv/osv-schema
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Contains deployment setups, workers running in GKE, Cloud Functions, and the use
- **Deployment Target**: **Google Cloud Run** (managed via Cloud Deploy pipeline `osv-website`).

### 3. Workers (`gcp/workers/`)
- **Legacy Importer/Worker (`gcp/workers/importer/`, `gcp/workers/worker/`)**: **Retired**. These are fully replaced by the Go implementations under `go/cmd/`.
- **`worker` (`gcp/workers/worker/`)**: **Base Environment**. Retains shared Poetry dependencies and base Dockerfile for Python workers (`recoverer`, `vanir_signatures`); legacy worker daemon replaced by Go worker under `go/cmd/worker/`.
- **ClusterFuzz Worker (`gcp/workers/oss_fuzz_worker/`, `gcp/workers/oss_fuzz_importer/`)**: **Barely Maintained**. Siloed workloads for OSS-Fuzz integration.
- **Deployment Target**: **GKE** (managed via Cloud Deploy pipeline `oss-fuzz-workers`).
- **`vanir_signatures`**: **Active (Python)**. Used for signature generation/verification.
Expand Down
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ run-cmd := poetry run
lib-tests: ## Run core Python library tests
./run_tests.sh

worker-tests: ## Run legacy Python worker tests
git submodule update --init --recursive
cd gcp/workers/worker && ./run_tests.sh

importer-tests: ## Run legacy Python importer tests
cd gcp/workers/importer && ./run_tests.sh

recoverer-tests: ## Run Python recoverer tests
cd gcp/workers/recoverer && ./run_tests.sh

Expand Down Expand Up @@ -130,7 +123,7 @@ run-api-server-test:
@cd go && go build -o ./api-devserver ./cmd/api-devserver && (GOOGLE_CLOUD_PROJECT=oss-vdb-test OSV_VULNERABILITIES_BUCKET=osv-test-vulnerabilities ./api-devserver $(ARGS); EXIT_CODE=$$?; rm -f ./api-devserver; exit $$EXIT_CODE)

# TODO: API integration tests.
all-tests: lib-tests worker-tests importer-tests recoverer-tests website-tests vulnfeed-tests bindings-tests go-tests ## Run all tests
all-tests: lib-tests recoverer-tests website-tests vulnfeed-tests bindings-tests go-tests ## Run all tests

reimport-tui: ## Run the reimport TUI tool
test -f $(HOME)/.config/gcloud/application_default_credentials.json || (echo "GCP Application Default Credentials not set, try 'gcloud auth application-default login'"; exit 1)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ consists of:
| `gcp/functions` | The Cloud Function for publishing PyPI vulnerabilities (maintained, but not developed) |
| `gcp/indexer` | The determine version `indexer` |
| `gcp/website` | The backend of the osv.dev web interface, with the frontend in `frontend3` <br /> Blog posts (in `blog`) |
| `gcp/workers/` | Workers for bisection and impact analysis (`worker`, `importer`, `alias`) <br /> `cron/` jobs for database backups and processing oss-fuzz records |
| `gcp/workers/` | Python workers (`recoverer`, `vanir_signatures`, and `oss_fuzz_worker`) |
| `go/` | Go module for shared libraries and commands (`cmd/exporter`, `cmd/recordchecker`) |
| `osv/` | The core OSV Python library, used in basically all Python services <br /> OSV ecosystem package versioning helpers in `ecosystems/` <br /> Datastore model definitions in `models.py` |
| `tools/` | Misc scripts/tools, mostly intended for development (datastore stuff, linting) <br /> The `indexer-api-caller` for indexer calling |
Expand Down
1 change: 0 additions & 1 deletion gcp/workers/importer/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions gcp/workers/importer/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions gcp/workers/importer/build.sh

This file was deleted.

Loading
Loading