diff --git a/.gitmodules b/.gitmodules index 9f00421120d..eb3647740ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = gcp/api/googleapis url = https://github.com/googleapis/googleapis [submodule "docker/worker/osv-test"] - path = docker/worker/osv-test + path = gcp/workers/worker/osv-test url = https://github.com/oliverchang/osv-test.git [submodule "osv-schema"] path = osv/osv-schema diff --git a/Makefile b/Makefile index b23cdb8a631..11de0ed8e15 100644 --- a/Makefile +++ b/Makefile @@ -20,13 +20,13 @@ lib-tests: worker-tests: git submodule update --init --recursive - cd docker/worker && ./run_tests.sh + cd gcp/workers/worker && ./run_tests.sh importer-tests: - cd docker/importer && ./run_tests.sh + cd gcp/workers/importer && ./run_tests.sh alias-tests: - cd docker/alias && ./run_tests.sh + cd gcp/workers/alias && ./run_tests.sh website-tests: cd gcp/website && ./run_tests.sh diff --git a/README.md b/README.md index f233eba08c7..9ecdc583fa3 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,14 @@ consists of: | directory | what | |-----------------|------| | `deployment/` | Terraform & Cloud Deploy config files
A few Cloud Build config yamls | -| `docker/` | CI docker files (`ci`, `deployment`, `terraform`)
Workers for bisection and impact analysis (`worker`, `importer`, `exporter`, `alias`, `worker-base`)
The determine version `indexer`
`cron/` jobs for database backups and processing oss-fuzz records | +| `docker/` | CI docker files (`ci`, `deployment`, `terraform`)
`worker-base` docker image for `gcp/workers/worker` | | `docs/` | Jekyll files for https://google.github.io/osv.dev/
`build_swagger.py` and `tools.go` | | `gcp/api` | OSV API server files (including files for the local ESP server)
protobuf files in `/v1`| | `gcp/datastore` | The datastore index file (`index.yaml`) | | `gcp/functions` | The Cloud Function for publishing PyPI vulnerabilities (maintained, but not developed) | -| `gcp/website ` | The backend of the osv.dev web interface, with the frontend in `frontend3`
Blog posts (in `blog`) | +| `gcp/indexer` | The determine version `indexer` | +| `gcp/website` | The backend of the osv.dev web interface, with the frontend in `frontend3`
Blog posts (in `blog`) | +| `gcp/workers/` | Workers for bisection and impact analysis (`worker`, `importer`, `exporter`, `alias`)
`cron/` jobs for database backups and processing oss-fuzz records | | `osv/` | The core OSV Python library, used in basically all Python services
OSV ecosystem package versioning helpers in `ecosystems/`
Datastore model definitions in `models.py` | | `tools/` | Misc scripts/tools, mostly intended for development (datastore stuff, linting)
The `indexer-api-caller` for indexer calling | | `vulnfeeds/` | Go module for (mostly) the NVD CVE conversion
The Alpine feed converter (`cmd/alpine`)
The Debian feed converter (`tools/debian`, which is written in Python) | diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 3cba48b125c..ff36d4ff0b1 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -41,7 +41,7 @@ steps: - name: 'gcr.io/oss-vdb/ci' id: 'worker-tests' - dir: docker/worker + dir: gcp/workers/worker args: ['bash', '-ex', 'run_tests.sh'] env: # Each concurrent test that uses the datastore emulator must have a unique port number @@ -51,7 +51,7 @@ steps: - name: 'gcr.io/oss-vdb/ci' id: 'importer-tests' - dir: docker/importer + dir: gcp/workers/importer args: ['bash', '-ex', 'run_tests.sh'] env: - CLOUD_BUILD=1 @@ -62,7 +62,7 @@ steps: - name: 'gcr.io/oss-vdb/ci' id: 'alias-tests' - dir: docker/alias + dir: gcp/workers/alias args: ['bash', '-ex', 'run_tests.sh'] env: # same as worker/importer diff --git a/deployment/build-and-stage.yaml b/deployment/build-and-stage.yaml index 53e1c729320..c8fb5c3143d 100644 --- a/deployment/build-and-stage.yaml +++ b/deployment/build-and-stage.yaml @@ -64,7 +64,7 @@ steps: # Build/push core worker/importer/exporter/alias images. - name: gcr.io/cloud-builders/docker - args: ['build', '-t', 'gcr.io/oss-vdb/worker:latest', '-t', 'gcr.io/oss-vdb/worker:$COMMIT_SHA', '-f', 'docker/worker/Dockerfile', '.'] + args: ['build', '-t', 'gcr.io/oss-vdb/worker:latest', '-t', 'gcr.io/oss-vdb/worker:$COMMIT_SHA', '-f', 'gcp/workers/worker/Dockerfile', '.'] id: 'build-worker' waitFor: ['build-worker-base'] - name: gcr.io/cloud-builders/docker @@ -73,7 +73,7 @@ steps: - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb/importer:latest', '-t', 'gcr.io/oss-vdb/importer:$COMMIT_SHA', '.'] - dir: 'docker/importer' + dir: 'gcp/workers/importer' id: 'build-importer' waitFor: ['build-worker'] - name: gcr.io/cloud-builders/docker @@ -82,7 +82,7 @@ steps: - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb/exporter:latest', '-t', 'gcr.io/oss-vdb/exporter:$COMMIT_SHA', '.'] - dir: 'docker/exporter' + dir: 'gcp/workers/exporter' id: 'build-exporter' waitFor: ['build-worker'] - name: gcr.io/cloud-builders/docker @@ -91,7 +91,7 @@ steps: - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb/alias-computation:latest', '-t', 'gcr.io/oss-vdb/alias-computation:$COMMIT_SHA', '.'] - dir: 'docker/alias' + dir: 'gcp/workers/alias' id: 'build-alias-computation' waitFor: ['build-worker'] - name: gcr.io/cloud-builders/docker @@ -101,7 +101,7 @@ steps: # Build/push staging-api-test images to gcr.io/oss-vdb-test. - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb-test/staging-api-test:latest', '-t', 'gcr.io/oss-vdb-test/staging-api-test:$COMMIT_SHA', '.'] - dir: 'docker/staging_api_test' + dir: 'gcp/workers/staging_api_test' id: 'build-staging-api-test' waitFor: ['build-worker'] - name: gcr.io/cloud-builders/docker @@ -111,7 +111,7 @@ steps: # Build/push cron job images. - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb/cron:latest', '-t', 'gcr.io/oss-vdb/cron:$COMMIT_SHA', '.'] - dir: 'docker/cron' + dir: 'gcp/workers/cron' id: 'build-cron' waitFor: ['build-worker'] - name: gcr.io/cloud-builders/docker @@ -169,7 +169,7 @@ steps: waitFor: ['setup'] - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/oss-vdb/indexer:latest', '-t', 'gcr.io/oss-vdb/indexer:$COMMIT_SHA', '--cache-from', 'gcr.io/oss-vdb/indexer:latest', '--pull', '.'] - dir: 'docker/indexer' + dir: 'gcp/indexer' id: 'build-indexer' waitFor: ['pull-indexer'] - name: gcr.io/cloud-builders/docker diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 7780b4ac888..00000000000 --- a/docker/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -ex -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -pushd worker -./build.sh $1 -popd - -pushd importer -./build.sh $1 -popd - -pushd exporter -./build.sh $1 -popd diff --git a/docker/worker-base/Dockerfile b/docker/worker-base/Dockerfile index d095a729036..103083d500e 100644 --- a/docker/worker-base/Dockerfile +++ b/docker/worker-base/Dockerfile @@ -72,4 +72,4 @@ RUN curl -fsSL https://gvisor.dev/archive.key | gpg --dearmor -o /etc/apt/truste apt-get update && apt-get install -y runsc # Make gVisor the default Docker runtime. -COPY docker/worker/daemon.json /etc/docker/daemon.json +COPY docker/worker-base/daemon.json /etc/docker/daemon.json diff --git a/docker/worker/daemon.json b/docker/worker-base/daemon.json similarity index 100% rename from docker/worker/daemon.json rename to docker/worker-base/daemon.json diff --git a/docs/contributing/architecture.md b/docs/contributing/architecture.md index e3e6cb117a3..a4676e45933 100644 --- a/docs/contributing/architecture.md +++ b/docs/contributing/architecture.md @@ -35,7 +35,7 @@ Workers are Docker containers, which use [gVisor] for sandboxing untrusted workloads. [GKE]: https://cloud.google.com/kubernetes-engine -[workers]: https://github.com/google/osv/tree/master/docker/worker +[workers]: https://github.com/google/osv/tree/master/gcp/workers [gVisor]: https://gvisor.dev/ [Cloud Pub/Sub]: https://cloud.google.com/pubsub diff --git a/docs/faq.md b/docs/faq.md index dac8b0dff2b..5f0d53c74e9 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -140,7 +140,7 @@ If you work on a project (like a Linux distribution) and would like to contribut 1. Version enumeration (for non-SemVer ecosystems where [supporting version enumeration code](https://github.com/google/osv.dev/tree/master/osv/ecosystems) exists) 2. [Package URL](https://github.com/package-url/purl-spec) [computation](https://github.com/google/osv.dev/blob/a751ceb26522f093edf26c0ad167cfd0967716d9/osv/models.py#L361-L365) (if necessary) 3. [Git affected commit enumeration and commit to tag mapping](https://github.com/google/osv.dev/blob/a751ceb26522f093edf26c0ad167cfd0967716d9/osv/impact.py#L422) -4. Repeat [batch](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/alias-computation.yaml) [computation](https://github.com/google/osv.dev/tree/master/docker/alias) of [aliases](https://ossf.github.io/osv-schema/#aliases-field) (**Note**: any time the `aliases` field changes, the record's [`modified`](https://ossf.github.io/osv-schema/#id-modified-fields) field is updated) +4. Repeat [batch](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/alias-computation.yaml) [computation](https://github.com/google/osv.dev/tree/master/gcp/workers/alias) of [aliases](https://ossf.github.io/osv-schema/#aliases-field) (**Note**: any time the `aliases` field changes, the record's [`modified`](https://ossf.github.io/osv-schema/#id-modified-fields) field is updated) Both version and commit enumeration populate the [`affected.versions[]`](https://ossf.github.io/osv-schema/#affectedversions-field) field, which assists with precise version matching. diff --git a/gcp/api/server.py b/gcp/api/server.py index 4748063709a..a4ea321e645 100644 --- a/gcp/api/server.py +++ b/gcp/api/server.py @@ -76,9 +76,7 @@ _BUCKET_SIZE = 512 # This needs to be kept in sync with -# https://github.com/google/osv.dev/blob/ -# 666a43e6ae7690fbfa283e9a6f0b08a986be4d32/ -# docker/indexer/stages/processing/processing.go#L77 +# https://github.com/google/osv.dev/blob/master/docker/indexer/stages/processing/processing.go#L77 _VENDORED_LIB_NAMES = frozenset(( '3rdparty', 'dep', diff --git a/docker/indexer/Dockerfile b/gcp/indexer/Dockerfile similarity index 100% rename from docker/indexer/Dockerfile rename to gcp/indexer/Dockerfile diff --git a/docker/indexer/build.sh b/gcp/indexer/build.sh similarity index 100% rename from docker/indexer/build.sh rename to gcp/indexer/build.sh diff --git a/docker/indexer/config/config.go b/gcp/indexer/config/config.go similarity index 100% rename from docker/indexer/config/config.go rename to gcp/indexer/config/config.go diff --git a/docker/indexer/config/config_test.go b/gcp/indexer/config/config_test.go similarity index 100% rename from docker/indexer/config/config_test.go rename to gcp/indexer/config/config_test.go diff --git a/docker/indexer/config/example.yaml b/gcp/indexer/config/example.yaml similarity index 100% rename from docker/indexer/config/example.yaml rename to gcp/indexer/config/example.yaml diff --git a/docker/indexer/go.mod b/gcp/indexer/go.mod similarity index 98% rename from docker/indexer/go.mod rename to gcp/indexer/go.mod index ddb928d2942..a4a985198c4 100644 --- a/docker/indexer/go.mod +++ b/gcp/indexer/go.mod @@ -1,4 +1,4 @@ -module github.com/google/osv.dev/docker/indexer +module github.com/google/osv.dev/gcp/indexer go 1.23.1 diff --git a/docker/indexer/go.sum b/gcp/indexer/go.sum similarity index 100% rename from docker/indexer/go.sum rename to gcp/indexer/go.sum diff --git a/docker/indexer/indexer.go b/gcp/indexer/indexer.go similarity index 93% rename from docker/indexer/indexer.go rename to gcp/indexer/indexer.go index 9c41bd9f2f5..3e8674b2023 100644 --- a/docker/indexer/indexer.go +++ b/gcp/indexer/indexer.go @@ -22,12 +22,12 @@ import ( "cloud.google.com/go/pubsub" "cloud.google.com/go/storage" - "github.com/google/osv.dev/docker/indexer/config" - "github.com/google/osv.dev/docker/indexer/stages/preparation" - "github.com/google/osv.dev/docker/indexer/stages/processing" + "github.com/google/osv.dev/gcp/indexer/config" + "github.com/google/osv.dev/gcp/indexer/stages/preparation" + "github.com/google/osv.dev/gcp/indexer/stages/processing" log "github.com/golang/glog" - idxStorage "github.com/google/osv.dev/docker/indexer/storage" + idxStorage "github.com/google/osv.dev/gcp/indexer/storage" ) var ( diff --git a/docker/indexer/osv-scanner.toml b/gcp/indexer/osv-scanner.toml similarity index 100% rename from docker/indexer/osv-scanner.toml rename to gcp/indexer/osv-scanner.toml diff --git a/docker/indexer/shared/shared.go b/gcp/indexer/shared/shared.go similarity index 100% rename from docker/indexer/shared/shared.go rename to gcp/indexer/shared/shared.go diff --git a/docker/indexer/stages/preparation/preparation.go b/gcp/indexer/stages/preparation/preparation.go similarity index 98% rename from docker/indexer/stages/preparation/preparation.go rename to gcp/indexer/stages/preparation/preparation.go index 4157d747d77..591459d2330 100644 --- a/docker/indexer/stages/preparation/preparation.go +++ b/gcp/indexer/stages/preparation/preparation.go @@ -32,8 +32,8 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "github.com/google/osv.dev/docker/indexer/config" - "github.com/google/osv.dev/docker/indexer/shared" + "github.com/google/osv.dev/gcp/indexer/config" + "github.com/google/osv.dev/gcp/indexer/shared" "golang.org/x/sync/semaphore" log "github.com/golang/glog" diff --git a/docker/indexer/stages/processing/processing.go b/gcp/indexer/stages/processing/processing.go similarity index 98% rename from docker/indexer/stages/processing/processing.go rename to gcp/indexer/stages/processing/processing.go index 6a786e4ae0c..2d0339537a6 100644 --- a/docker/indexer/stages/processing/processing.go +++ b/gcp/indexer/stages/processing/processing.go @@ -33,8 +33,8 @@ import ( "cloud.google.com/go/pubsub" "cloud.google.com/go/storage" "github.com/go-git/go-git/v5" - "github.com/google/osv.dev/docker/indexer/shared" - "github.com/google/osv.dev/docker/indexer/stages/preparation" + "github.com/google/osv.dev/gcp/indexer/shared" + "github.com/google/osv.dev/gcp/indexer/stages/preparation" log "github.com/golang/glog" ) diff --git a/docker/indexer/stages/processing/processing_test.go b/gcp/indexer/stages/processing/processing_test.go similarity index 100% rename from docker/indexer/stages/processing/processing_test.go rename to gcp/indexer/stages/processing/processing_test.go diff --git a/docker/indexer/storage/storage.go b/gcp/indexer/storage/storage.go similarity index 97% rename from docker/indexer/storage/storage.go rename to gcp/indexer/storage/storage.go index b213c9f36c8..53e4d089b85 100644 --- a/docker/indexer/storage/storage.go +++ b/gcp/indexer/storage/storage.go @@ -24,9 +24,9 @@ import ( "cloud.google.com/go/datastore" "github.com/go-git/go-git/v5/plumbing" - "github.com/google/osv.dev/docker/indexer/shared" - "github.com/google/osv.dev/docker/indexer/stages/preparation" - "github.com/google/osv.dev/docker/indexer/stages/processing" + "github.com/google/osv.dev/gcp/indexer/shared" + "github.com/google/osv.dev/gcp/indexer/stages/preparation" + "github.com/google/osv.dev/gcp/indexer/stages/processing" ) const ( diff --git a/docker/indexer/storage/storage_test.go b/gcp/indexer/storage/storage_test.go similarity index 96% rename from docker/indexer/storage/storage_test.go rename to gcp/indexer/storage/storage_test.go index e4954b65f5c..3e73962ae09 100644 --- a/docker/indexer/storage/storage_test.go +++ b/gcp/indexer/storage/storage_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/osv.dev/docker/indexer/stages/preparation" + "github.com/google/osv.dev/gcp/indexer/stages/preparation" ) func getRepoInfo(t *testing.T) *preparation.Result { diff --git a/docker/alias/Dockerfile b/gcp/workers/alias/Dockerfile similarity index 100% rename from docker/alias/Dockerfile rename to gcp/workers/alias/Dockerfile diff --git a/docker/alias/alias_computation.py b/gcp/workers/alias/alias_computation.py similarity index 100% rename from docker/alias/alias_computation.py rename to gcp/workers/alias/alias_computation.py diff --git a/docker/alias/alias_computation_test.py b/gcp/workers/alias/alias_computation_test.py similarity index 99% rename from docker/alias/alias_computation_test.py rename to gcp/workers/alias/alias_computation_test.py index cf754fe35fe..848d598bb79 100644 --- a/docker/alias/alias_computation_test.py +++ b/gcp/workers/alias/alias_computation_test.py @@ -20,7 +20,7 @@ from google.protobuf import timestamp_pb2 import osv -from docker.alias import alias_computation +import alias_computation from osv import tests TEST_DATA_DIR = os.path.join( diff --git a/docker/alias/build.sh b/gcp/workers/alias/build.sh similarity index 100% rename from docker/alias/build.sh rename to gcp/workers/alias/build.sh diff --git a/docker/alias/run_tests.sh b/gcp/workers/alias/run_tests.sh similarity index 100% rename from docker/alias/run_tests.sh rename to gcp/workers/alias/run_tests.sh diff --git a/docker/cron/Dockerfile b/gcp/workers/cron/Dockerfile similarity index 100% rename from docker/cron/Dockerfile rename to gcp/workers/cron/Dockerfile diff --git a/docker/cron/backup/backup.py b/gcp/workers/cron/backup/backup.py similarity index 100% rename from docker/cron/backup/backup.py rename to gcp/workers/cron/backup/backup.py diff --git a/docker/cron/generate_sitemap/generate_and_upload.sh b/gcp/workers/cron/generate_sitemap/generate_and_upload.sh similarity index 100% rename from docker/cron/generate_sitemap/generate_and_upload.sh rename to gcp/workers/cron/generate_sitemap/generate_and_upload.sh diff --git a/docker/cron/generate_sitemap/generate_sitemap.py b/gcp/workers/cron/generate_sitemap/generate_sitemap.py similarity index 100% rename from docker/cron/generate_sitemap/generate_sitemap.py rename to gcp/workers/cron/generate_sitemap/generate_sitemap.py diff --git a/docker/cron/generate_sitemap/generate_sitemap_test.py b/gcp/workers/cron/generate_sitemap/generate_sitemap_test.py similarity index 100% rename from docker/cron/generate_sitemap/generate_sitemap_test.py rename to gcp/workers/cron/generate_sitemap/generate_sitemap_test.py diff --git a/docker/cron/make_bugs_public/google_issue_tracker/__init__.py b/gcp/workers/cron/make_bugs_public/google_issue_tracker/__init__.py similarity index 100% rename from docker/cron/make_bugs_public/google_issue_tracker/__init__.py rename to gcp/workers/cron/make_bugs_public/google_issue_tracker/__init__.py diff --git a/docker/cron/make_bugs_public/google_issue_tracker/client.py b/gcp/workers/cron/make_bugs_public/google_issue_tracker/client.py similarity index 100% rename from docker/cron/make_bugs_public/google_issue_tracker/client.py rename to gcp/workers/cron/make_bugs_public/google_issue_tracker/client.py diff --git a/docker/cron/make_bugs_public/google_issue_tracker/issue_tracker.py b/gcp/workers/cron/make_bugs_public/google_issue_tracker/issue_tracker.py similarity index 100% rename from docker/cron/make_bugs_public/google_issue_tracker/issue_tracker.py rename to gcp/workers/cron/make_bugs_public/google_issue_tracker/issue_tracker.py diff --git a/docker/cron/make_bugs_public/make_bugs_public.py b/gcp/workers/cron/make_bugs_public/make_bugs_public.py similarity index 100% rename from docker/cron/make_bugs_public/make_bugs_public.py rename to gcp/workers/cron/make_bugs_public/make_bugs_public.py diff --git a/docker/cron/process_results/process_results.py b/gcp/workers/cron/process_results/process_results.py similarity index 100% rename from docker/cron/process_results/process_results.py rename to gcp/workers/cron/process_results/process_results.py diff --git a/docker/exporter/Dockerfile b/gcp/workers/exporter/Dockerfile similarity index 100% rename from docker/exporter/Dockerfile rename to gcp/workers/exporter/Dockerfile diff --git a/docker/exporter/build.sh b/gcp/workers/exporter/build.sh similarity index 100% rename from docker/exporter/build.sh rename to gcp/workers/exporter/build.sh diff --git a/docker/exporter/export_runner.py b/gcp/workers/exporter/export_runner.py similarity index 100% rename from docker/exporter/export_runner.py rename to gcp/workers/exporter/export_runner.py diff --git a/docker/exporter/exporter.py b/gcp/workers/exporter/exporter.py similarity index 100% rename from docker/exporter/exporter.py rename to gcp/workers/exporter/exporter.py diff --git a/docker/importer/.gitignore b/gcp/workers/importer/.gitignore similarity index 100% rename from docker/importer/.gitignore rename to gcp/workers/importer/.gitignore diff --git a/docker/importer/Dockerfile b/gcp/workers/importer/Dockerfile similarity index 100% rename from docker/importer/Dockerfile rename to gcp/workers/importer/Dockerfile diff --git a/docker/importer/build.sh b/gcp/workers/importer/build.sh similarity index 100% rename from docker/importer/build.sh rename to gcp/workers/importer/build.sh diff --git a/docker/importer/importer.py b/gcp/workers/importer/importer.py similarity index 100% rename from docker/importer/importer.py rename to gcp/workers/importer/importer.py diff --git a/docker/importer/importer_test.py b/gcp/workers/importer/importer_test.py similarity index 99% rename from docker/importer/importer_test.py rename to gcp/workers/importer/importer_test.py index 62472562099..75152518952 100644 --- a/docker/importer/importer_test.py +++ b/gcp/workers/importer/importer_test.py @@ -30,7 +30,7 @@ from google.cloud import storage from google.cloud.storage import retry import pygit2 -from docker.mock_test.mock_test_handler import MockDataHandler +from gcp.workers.mock_test.mock_test_handler import MockDataHandler import importer import osv from osv import tests diff --git a/docker/importer/run_tests.sh b/gcp/workers/importer/run_tests.sh similarity index 100% rename from docker/importer/run_tests.sh rename to gcp/workers/importer/run_tests.sh diff --git a/docker/importer/testdata/ImporterTest_diff_basic.txt b/gcp/workers/importer/testdata/ImporterTest_diff_basic.txt similarity index 100% rename from docker/importer/testdata/ImporterTest_diff_basic.txt rename to gcp/workers/importer/testdata/ImporterTest_diff_basic.txt diff --git a/docker/importer/testdata/ImporterTest_expected.json.txt b/gcp/workers/importer/testdata/ImporterTest_expected.json.txt similarity index 100% rename from docker/importer/testdata/ImporterTest_expected.json.txt rename to gcp/workers/importer/testdata/ImporterTest_expected.json.txt diff --git a/docker/importer/testdata/expected.json b/gcp/workers/importer/testdata/expected.json similarity index 100% rename from docker/importer/testdata/expected.json rename to gcp/workers/importer/testdata/expected.json diff --git a/docker/mock_test/mock_test_handler.py b/gcp/workers/mock_test/mock_test_handler.py similarity index 100% rename from docker/mock_test/mock_test_handler.py rename to gcp/workers/mock_test/mock_test_handler.py diff --git a/docker/mock_test/rest_test.json b/gcp/workers/mock_test/rest_test.json similarity index 100% rename from docker/mock_test/rest_test.json rename to gcp/workers/mock_test/rest_test.json diff --git a/docker/staging_api_test/Dockerfile b/gcp/workers/staging_api_test/Dockerfile similarity index 90% rename from docker/staging_api_test/Dockerfile rename to gcp/workers/staging_api_test/Dockerfile index 5581d06b690..8a0070a2301 100644 --- a/docker/staging_api_test/Dockerfile +++ b/gcp/workers/staging_api_test/Dockerfile @@ -19,7 +19,7 @@ WORKDIR /staging_api_test COPY retrieve_bugs_from_bucket.py perform_api_calls.py run.sh ./ # Add aiohttp lib -RUN cd /env/docker/worker && POETRY_VIRTUALENVS_CREATE=false poetry add aiohttp +RUN cd /env/gcp/workers/worker && POETRY_VIRTUALENVS_CREATE=false poetry add aiohttp RUN chmod 755 retrieve_bugs_from_bucket.py perform_api_calls.py run.sh diff --git a/docker/staging_api_test/build.sh b/gcp/workers/staging_api_test/build.sh similarity index 100% rename from docker/staging_api_test/build.sh rename to gcp/workers/staging_api_test/build.sh diff --git a/docker/staging_api_test/perform_api_calls.py b/gcp/workers/staging_api_test/perform_api_calls.py similarity index 100% rename from docker/staging_api_test/perform_api_calls.py rename to gcp/workers/staging_api_test/perform_api_calls.py diff --git a/docker/staging_api_test/retrieve_bugs_from_bucket.py b/gcp/workers/staging_api_test/retrieve_bugs_from_bucket.py similarity index 100% rename from docker/staging_api_test/retrieve_bugs_from_bucket.py rename to gcp/workers/staging_api_test/retrieve_bugs_from_bucket.py diff --git a/docker/staging_api_test/run.sh b/gcp/workers/staging_api_test/run.sh similarity index 100% rename from docker/staging_api_test/run.sh rename to gcp/workers/staging_api_test/run.sh diff --git a/docker/worker/.gitignore b/gcp/workers/worker/.gitignore similarity index 100% rename from docker/worker/.gitignore rename to gcp/workers/worker/.gitignore diff --git a/docker/worker/Dockerfile b/gcp/workers/worker/Dockerfile similarity index 76% rename from docker/worker/Dockerfile rename to gcp/workers/worker/Dockerfile index 0b971dd9ae7..409fc7288bd 100644 --- a/docker/worker/Dockerfile +++ b/gcp/workers/worker/Dockerfile @@ -16,19 +16,19 @@ FROM gcr.io/oss-vdb/worker-base RUN apt-get update && apt-get upgrade -y -RUN mkdir /work && mkdir -p /env/docker/worker +RUN mkdir /work && mkdir -p /env/gcp/workers/worker VOLUME /var/lib/docker # Replicate project structure to make relative editable poetry dependency work. # TODO(ochang): Just copy the entire project (needs a clean checkout). -COPY docker/worker/poetry.lock docker/worker/pyproject.toml /env/docker/worker/ +COPY gcp/workers/worker/poetry.lock gcp/workers/worker/pyproject.toml /env/gcp/workers/worker/ COPY poetry.lock pyproject.toml README.md /env/ COPY osv /env/osv # Set virtualenv creation to false to install globally -RUN cd /env/docker/worker && POETRY_VIRTUALENVS_CREATE=false poetry install +RUN cd /env/gcp/workers/worker && POETRY_VIRTUALENVS_CREATE=false poetry install -COPY docker/worker/oss_fuzz.py docker/worker/worker.py /usr/local/bin/ +COPY gcp/workers/worker/oss_fuzz.py gcp/workers/worker/worker.py /usr/local/bin/ RUN chmod 755 /usr/local/bin/worker.py ENTRYPOINT ["worker.py"] diff --git a/docker/worker/build.sh b/gcp/workers/worker/build.sh similarity index 92% rename from docker/worker/build.sh rename to gcp/workers/worker/build.sh index b9d97bed4d9..98ae012eef0 100755 --- a/docker/worker/build.sh +++ b/gcp/workers/worker/build.sh @@ -14,8 +14,8 @@ # limitations under the License. # Build from root context. -cd ../../ +cd ../../../ -docker build -t gcr.io/oss-vdb/worker:$1 -t gcr.io/oss-vdb/worker:latest -f docker/worker/Dockerfile . && \ +docker build -t gcr.io/oss-vdb/worker:$1 -t gcr.io/oss-vdb/worker:latest -f gcp/workers/worker/Dockerfile . && \ gcloud docker -- push gcr.io/oss-vdb/worker:$1 && \ gcloud docker -- push gcr.io/oss-vdb/worker:latest diff --git a/docker/worker/oss_fuzz.py b/gcp/workers/worker/oss_fuzz.py similarity index 100% rename from docker/worker/oss_fuzz.py rename to gcp/workers/worker/oss_fuzz.py diff --git a/docker/worker/osv-test b/gcp/workers/worker/osv-test similarity index 100% rename from docker/worker/osv-test rename to gcp/workers/worker/osv-test diff --git a/docker/worker/poetry.lock b/gcp/workers/worker/poetry.lock similarity index 99% rename from docker/worker/poetry.lock rename to gcp/workers/worker/poetry.lock index 3f08ebfc557..ff5f76f43e3 100644 --- a/docker/worker/poetry.lock +++ b/gcp/workers/worker/poetry.lock @@ -906,7 +906,7 @@ semver = "^3.0" [package.source] type = "directory" -url = "../.." +url = "../../.." [[package]] name = "packageurl-python" @@ -1532,4 +1532,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "9ed6a3d16d3846a9231541774de4e5489a344b70c22ae09ab6bf4d68fd203ebe" +content-hash = "9717190fa004b095330d4bfccc4ea8cc3dc8b8c8bee9f0c905f506273f299315" diff --git a/docker/worker/pyproject.toml b/gcp/workers/worker/pyproject.toml similarity index 92% rename from docker/worker/pyproject.toml rename to gcp/workers/worker/pyproject.toml index da7477b35b2..72e6e2f92ea 100644 --- a/docker/worker/pyproject.toml +++ b/gcp/workers/worker/pyproject.toml @@ -17,7 +17,7 @@ pygit2 = "==1.16.0" requests = "==2.32.3" jsonschema = "==4.23.0" -osv = { path = "../../", develop = true } +osv = { path = "../../../", develop = true } [tool.poetry.dev-dependencies] yapf = "*" diff --git a/docker/worker/run_tests.sh b/gcp/workers/worker/run_tests.sh similarity index 100% rename from docker/worker/run_tests.sh rename to gcp/workers/worker/run_tests.sh diff --git a/docker/worker/testdata/CVE-2016-10046.json b/gcp/workers/worker/testdata/CVE-2016-10046.json similarity index 100% rename from docker/worker/testdata/CVE-2016-10046.json rename to gcp/workers/worker/testdata/CVE-2016-10046.json diff --git a/docker/worker/testdata/CVE-2022-27449.json b/gcp/workers/worker/testdata/CVE-2022-27449.json similarity index 100% rename from docker/worker/testdata/CVE-2022-27449.json rename to gcp/workers/worker/testdata/CVE-2022-27449.json diff --git a/docker/worker/testdata/DSA-3029-1.json b/gcp/workers/worker/testdata/DSA-3029-1.json similarity index 100% rename from docker/worker/testdata/DSA-3029-1.json rename to gcp/workers/worker/testdata/DSA-3029-1.json diff --git a/docker/worker/testdata/GHSA-838r-hvwh-24h8.json b/gcp/workers/worker/testdata/GHSA-838r-hvwh-24h8.json similarity index 100% rename from docker/worker/testdata/GHSA-838r-hvwh-24h8.json rename to gcp/workers/worker/testdata/GHSA-838r-hvwh-24h8.json diff --git a/docker/worker/testdata/ImpactTest_basic.txt b/gcp/workers/worker/testdata/ImpactTest_basic.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_basic.txt rename to gcp/workers/worker/testdata/ImpactTest_basic.txt diff --git a/docker/worker/testdata/ImpactTest_fixed_range_too_long.txt b/gcp/workers/worker/testdata/ImpactTest_fixed_range_too_long.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_fixed_range_too_long.txt rename to gcp/workers/worker/testdata/ImpactTest_fixed_range_too_long.txt diff --git a/docker/worker/testdata/ImpactTest_not_fixed.txt b/gcp/workers/worker/testdata/ImpactTest_not_fixed.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_not_fixed.txt rename to gcp/workers/worker/testdata/ImpactTest_not_fixed.txt diff --git a/docker/worker/testdata/ImpactTest_range.txt b/gcp/workers/worker/testdata/ImpactTest_range.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_range.txt rename to gcp/workers/worker/testdata/ImpactTest_range.txt diff --git a/docker/worker/testdata/ImpactTest_simplify_range.txt b/gcp/workers/worker/testdata/ImpactTest_simplify_range.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_simplify_range.txt rename to gcp/workers/worker/testdata/ImpactTest_simplify_range.txt diff --git a/docker/worker/testdata/ImpactTest_zero_regression_range.txt b/gcp/workers/worker/testdata/ImpactTest_zero_regression_range.txt similarity index 100% rename from docker/worker/testdata/ImpactTest_zero_regression_range.txt rename to gcp/workers/worker/testdata/ImpactTest_zero_regression_range.txt diff --git a/docker/worker/testdata/LINUX-123.yaml b/gcp/workers/worker/testdata/LINUX-123.yaml similarity index 100% rename from docker/worker/testdata/LINUX-123.yaml rename to gcp/workers/worker/testdata/LINUX-123.yaml diff --git a/docker/worker/testdata/OSV-123.yaml b/gcp/workers/worker/testdata/OSV-123.yaml similarity index 100% rename from docker/worker/testdata/OSV-123.yaml rename to gcp/workers/worker/testdata/OSV-123.yaml diff --git a/docker/worker/testdata/OSV-124.yaml b/gcp/workers/worker/testdata/OSV-124.yaml similarity index 100% rename from docker/worker/testdata/OSV-124.yaml rename to gcp/workers/worker/testdata/OSV-124.yaml diff --git a/docker/worker/testdata/OSV-125.yaml b/gcp/workers/worker/testdata/OSV-125.yaml similarity index 100% rename from docker/worker/testdata/OSV-125.yaml rename to gcp/workers/worker/testdata/OSV-125.yaml diff --git a/docker/worker/testdata/OSV-126.yaml b/gcp/workers/worker/testdata/OSV-126.yaml similarity index 100% rename from docker/worker/testdata/OSV-126.yaml rename to gcp/workers/worker/testdata/OSV-126.yaml diff --git a/docker/worker/testdata/OSV-127.yaml b/gcp/workers/worker/testdata/OSV-127.yaml similarity index 100% rename from docker/worker/testdata/OSV-127.yaml rename to gcp/workers/worker/testdata/OSV-127.yaml diff --git a/docker/worker/testdata/OSV-128.yaml b/gcp/workers/worker/testdata/OSV-128.yaml similarity index 100% rename from docker/worker/testdata/OSV-128.yaml rename to gcp/workers/worker/testdata/OSV-128.yaml diff --git a/docker/worker/testdata/OSV-129.yaml b/gcp/workers/worker/testdata/OSV-129.yaml similarity index 100% rename from docker/worker/testdata/OSV-129.yaml rename to gcp/workers/worker/testdata/OSV-129.yaml diff --git a/docker/worker/testdata/OSV-130.yaml b/gcp/workers/worker/testdata/OSV-130.yaml similarity index 100% rename from docker/worker/testdata/OSV-130.yaml rename to gcp/workers/worker/testdata/OSV-130.yaml diff --git a/docker/worker/testdata/OSV-131.yaml b/gcp/workers/worker/testdata/OSV-131.yaml similarity index 100% rename from docker/worker/testdata/OSV-131.yaml rename to gcp/workers/worker/testdata/OSV-131.yaml diff --git a/docker/worker/testdata/OSV-TEST-last-affected-01.yaml b/gcp/workers/worker/testdata/OSV-TEST-last-affected-01.yaml similarity index 100% rename from docker/worker/testdata/OSV-TEST-last-affected-01.yaml rename to gcp/workers/worker/testdata/OSV-TEST-last-affected-01.yaml diff --git a/docker/worker/testdata/PYSEC-123.yaml b/gcp/workers/worker/testdata/PYSEC-123.yaml similarity index 100% rename from docker/worker/testdata/PYSEC-123.yaml rename to gcp/workers/worker/testdata/PYSEC-123.yaml diff --git a/docker/worker/testdata/PYSEC-124.yaml b/gcp/workers/worker/testdata/PYSEC-124.yaml similarity index 100% rename from docker/worker/testdata/PYSEC-124.yaml rename to gcp/workers/worker/testdata/PYSEC-124.yaml diff --git a/docker/worker/testdata/PYSEC-456.yaml b/gcp/workers/worker/testdata/PYSEC-456.yaml similarity index 100% rename from docker/worker/testdata/PYSEC-456.yaml rename to gcp/workers/worker/testdata/PYSEC-456.yaml diff --git a/docker/worker/testdata/RESTUpdateTest_update_no_introduced.txt b/gcp/workers/worker/testdata/RESTUpdateTest_update_no_introduced.txt similarity index 100% rename from docker/worker/testdata/RESTUpdateTest_update_no_introduced.txt rename to gcp/workers/worker/testdata/RESTUpdateTest_update_no_introduced.txt diff --git a/docker/worker/testdata/UpdateTest_analysis_crash_handling.txt b/gcp/workers/worker/testdata/UpdateTest_analysis_crash_handling.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_analysis_crash_handling.txt rename to gcp/workers/worker/testdata/UpdateTest_analysis_crash_handling.txt diff --git a/docker/worker/testdata/UpdateTest_diff_alpine.txt b/gcp/workers/worker/testdata/UpdateTest_diff_alpine.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_alpine.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_alpine.txt diff --git a/docker/worker/testdata/UpdateTest_diff_debian.txt b/gcp/workers/worker/testdata/UpdateTest_diff_debian.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_debian.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_debian.txt diff --git a/docker/worker/testdata/UpdateTest_diff_last_affected.txt b/gcp/workers/worker/testdata/UpdateTest_diff_last_affected.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_last_affected.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_last_affected.txt diff --git a/docker/worker/testdata/UpdateTest_diff_last_affected_git.txt b/gcp/workers/worker/testdata/UpdateTest_diff_last_affected_git.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_last_affected_git.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_last_affected_git.txt diff --git a/docker/worker/testdata/UpdateTest_diff_maven.txt b/gcp/workers/worker/testdata/UpdateTest_diff_maven.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_maven.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_maven.txt diff --git a/docker/worker/testdata/UpdateTest_diff_normalized_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_diff_normalized_pypi.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_normalized_pypi.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_normalized_pypi.txt diff --git a/docker/worker/testdata/UpdateTest_diff_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_diff_pypi.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_pypi.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_pypi.txt diff --git a/docker/worker/testdata/UpdateTest_diff_update.txt b/gcp/workers/worker/testdata/UpdateTest_diff_update.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_update.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_update.txt diff --git a/docker/worker/testdata/UpdateTest_diff_update_add_fix.txt b/gcp/workers/worker/testdata/UpdateTest_diff_update_add_fix.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_update_add_fix.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_update_add_fix.txt diff --git a/docker/worker/testdata/UpdateTest_diff_update_limit.txt b/gcp/workers/worker/testdata/UpdateTest_diff_update_limit.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_update_limit.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_update_limit.txt diff --git a/docker/worker/testdata/UpdateTest_diff_update_no_introduced.txt b/gcp/workers/worker/testdata/UpdateTest_diff_update_no_introduced.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_diff_update_no_introduced.txt rename to gcp/workers/worker/testdata/UpdateTest_diff_update_no_introduced.txt diff --git a/docker/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt b/gcp/workers/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt rename to gcp/workers/worker/testdata/UpdateTest_dont_index_too_many_git_versions.txt diff --git a/docker/worker/testdata/UpdateTest_last_affected_git.txt b/gcp/workers/worker/testdata/UpdateTest_last_affected_git.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_last_affected_git.txt rename to gcp/workers/worker/testdata/UpdateTest_last_affected_git.txt diff --git a/docker/worker/testdata/UpdateTest_normalized_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_normalized_pypi.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_normalized_pypi.txt rename to gcp/workers/worker/testdata/UpdateTest_normalized_pypi.txt diff --git a/docker/worker/testdata/UpdateTest_normalized_pypi_pubsub_calls.txt b/gcp/workers/worker/testdata/UpdateTest_normalized_pypi_pubsub_calls.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_normalized_pypi_pubsub_calls.txt rename to gcp/workers/worker/testdata/UpdateTest_normalized_pypi_pubsub_calls.txt diff --git a/docker/worker/testdata/UpdateTest_pypi_pubsub_calls.txt b/gcp/workers/worker/testdata/UpdateTest_pypi_pubsub_calls.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_pypi_pubsub_calls.txt rename to gcp/workers/worker/testdata/UpdateTest_pypi_pubsub_calls.txt diff --git a/docker/worker/testdata/UpdateTest_update.txt b/gcp/workers/worker/testdata/UpdateTest_update.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update.txt rename to gcp/workers/worker/testdata/UpdateTest_update.txt diff --git a/docker/worker/testdata/UpdateTest_update_add_fix.txt b/gcp/workers/worker/testdata/UpdateTest_update_add_fix.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_add_fix.txt rename to gcp/workers/worker/testdata/UpdateTest_update_add_fix.txt diff --git a/docker/worker/testdata/UpdateTest_update_alpine.txt b/gcp/workers/worker/testdata/UpdateTest_update_alpine.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_alpine.txt rename to gcp/workers/worker/testdata/UpdateTest_update_alpine.txt diff --git a/docker/worker/testdata/UpdateTest_update_bucket_0.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_0.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_bucket_0.txt rename to gcp/workers/worker/testdata/UpdateTest_update_bucket_0.txt diff --git a/docker/worker/testdata/UpdateTest_update_bucket_1.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_1.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_bucket_1.txt rename to gcp/workers/worker/testdata/UpdateTest_update_bucket_1.txt diff --git a/docker/worker/testdata/UpdateTest_update_bucket_2.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_2.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_bucket_2.txt rename to gcp/workers/worker/testdata/UpdateTest_update_bucket_2.txt diff --git a/docker/worker/testdata/UpdateTest_update_bucket_cve.txt b/gcp/workers/worker/testdata/UpdateTest_update_bucket_cve.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_bucket_cve.txt rename to gcp/workers/worker/testdata/UpdateTest_update_bucket_cve.txt diff --git a/docker/worker/testdata/UpdateTest_update_debian.txt b/gcp/workers/worker/testdata/UpdateTest_update_debian.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_debian.txt rename to gcp/workers/worker/testdata/UpdateTest_update_debian.txt diff --git a/docker/worker/testdata/UpdateTest_update_last_affected.txt b/gcp/workers/worker/testdata/UpdateTest_update_last_affected.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_last_affected.txt rename to gcp/workers/worker/testdata/UpdateTest_update_last_affected.txt diff --git a/docker/worker/testdata/UpdateTest_update_limit.txt b/gcp/workers/worker/testdata/UpdateTest_update_limit.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_limit.txt rename to gcp/workers/worker/testdata/UpdateTest_update_limit.txt diff --git a/docker/worker/testdata/UpdateTest_update_linux.txt b/gcp/workers/worker/testdata/UpdateTest_update_linux.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_linux.txt rename to gcp/workers/worker/testdata/UpdateTest_update_linux.txt diff --git a/docker/worker/testdata/UpdateTest_update_maven.txt b/gcp/workers/worker/testdata/UpdateTest_update_maven.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_maven.txt rename to gcp/workers/worker/testdata/UpdateTest_update_maven.txt diff --git a/docker/worker/testdata/UpdateTest_update_new.txt b/gcp/workers/worker/testdata/UpdateTest_update_new.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_new.txt rename to gcp/workers/worker/testdata/UpdateTest_update_new.txt diff --git a/docker/worker/testdata/UpdateTest_update_no_introduced.txt b/gcp/workers/worker/testdata/UpdateTest_update_no_introduced.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_no_introduced.txt rename to gcp/workers/worker/testdata/UpdateTest_update_no_introduced.txt diff --git a/docker/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt b/gcp/workers/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt rename to gcp/workers/worker/testdata/UpdateTest_update_partly_bad_ecosystem_new.txt diff --git a/docker/worker/testdata/UpdateTest_update_pypi.txt b/gcp/workers/worker/testdata/UpdateTest_update_pypi.txt similarity index 100% rename from docker/worker/testdata/UpdateTest_update_pypi.txt rename to gcp/workers/worker/testdata/UpdateTest_update_pypi.txt diff --git a/docker/worker/worker.py b/gcp/workers/worker/worker.py similarity index 100% rename from docker/worker/worker.py rename to gcp/workers/worker/worker.py diff --git a/docker/worker/worker_test.py b/gcp/workers/worker/worker_test.py similarity index 99% rename from docker/worker/worker_test.py rename to gcp/workers/worker/worker_test.py index cd1d313d656..a915039d150 100644 --- a/docker/worker/worker_test.py +++ b/gcp/workers/worker/worker_test.py @@ -16,7 +16,7 @@ import codecs import datetime import hashlib -from docker.mock_test.mock_test_handler import MockDataHandler +from gcp.workers.mock_test.mock_test_handler import MockDataHandler import http.server import os import shutil diff --git a/renovate.json b/renovate.json index 63e7f9a4fd4..e867463e03f 100644 --- a/renovate.json +++ b/renovate.json @@ -74,7 +74,7 @@ }, { "matchFileNames": [ - "docker/**" + "gcp/workers/**" ], "matchCategories": [ "python" @@ -83,7 +83,7 @@ }, { "matchFileNames": [ - "docker/**" + "gcp/indexer/**" ], "matchCategories": [ "golang"