Skip to content

Commit 739595f

Browse files
Merge branch 'master' into docs/container-scanning
2 parents d70b16a + e28623b commit 739595f

File tree

312 files changed

+15209
-10658
lines changed

Some content is hidden

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

312 files changed

+15209
-10658
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
46+
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
57+
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
71+
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5

.github/workflows/link-checker-on-push.yml

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

.github/workflows/links.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Check markdown links
2+
3+
on:
4+
push:
5+
paths:
6+
- "**.md"
7+
pull_request:
8+
paths:
9+
- "**.md"
10+
schedule:
11+
- cron: "30 22 * * 1,4"
12+
13+
# Restrict jobs in this workflow to have no permissions by default; permissions
14+
# should be granted per job as needed using a dedicated `permissions` block
15+
permissions: {}
16+
17+
jobs:
18+
check:
19+
permissions:
20+
contents: read # to fetch code (actions/checkout)
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
- uses: tcort/github-action-markdown-link-check@a800ad5f1c35bf61987946fd31c15726a1c9f2ba # v1.1.0
25+
with:
26+
use-quiet-mode: "yes"
27+
base-branch: "master"
28+
check-modified-files-only: ${{ github.event_name == 'schedule' && 'yes' || 'no'}}

.github/workflows/lint.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ permissions:
2525
contents: read
2626

2727
jobs:
28+
filenames:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
persist-credentials: false
34+
- run: |
35+
find . -mindepth 1 ! -regex '.*/[()#@,A-Za-z0-9._+-]*' -print0 \
36+
| xargs -0 -I{} bash -c \
37+
'printf "::error file=%q::This filename contains undesired characters\n" "$1" && false' _ {}
2838
lint:
2939
name: Lint and format
3040
runs-on: ubuntu-latest
@@ -36,7 +46,7 @@ jobs:
3646
with:
3747
python-version: '3.13'
3848
- name: Install poetry
39-
run: pip install poetry==2.1.3
49+
run: pip install poetry==2.2.1
4050
- name: Set up poetry
4151
run: poetry install
4252
- name: Set up Go

.github/workflows/publish-to-pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
build
4545
--sdist --wheel --outdir dist/ .
4646
- name: Publish distribution to PyPI
47-
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
47+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
4848
with:
4949
password: ${{ secrets.PYPI_API_TOKEN }}
5050
packages_dir: dist/

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
persist-credentials: false
2828

2929
- name: "Run analysis"
30-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
30+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
3131
with:
3232
results_file: results.sarif
3333
results_format: sarif
@@ -50,6 +50,6 @@ jobs:
5050

5151
# Upload the results to GitHub's code scanning dashboard.
5252
- name: "Upload to code-scanning"
53-
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
53+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
5454
with:
5555
sarif_file: results.sarif

.gitmodules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
[submodule "osv-schema"]
88
path = osv/osv-schema
99
url = https://github.com/ossf/osv-schema.git
10-
branch = v1.7.3

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Upcoming
2+
### Changed
3+
- Moved Debian converted CVE tracking records to their own record at the prefix "DEBIAN-"

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ You must install:
3939
1. [Pylint](https://pypi.org/project/pylint)
4040
1. [Yapf](https://github.com/google/yapf)
4141
1. [Make](https://www.gnu.org/software/make/)
42-
1. [Poetry](https://python-poetry.org/) >= 2.1.3
42+
1. [Poetry](https://python-poetry.org/) >= 2.2.1
4343
2. [Google Cloud SDK](https://cloud.google.com/sdk)
4444
3. [Hugo](https://gohugo.io/installation/)
4545
4. [Node JS](https://nodejs.org/) >= 18.17.x
46-
5. [Terraform](https://developer.hashicorp.com/terraform/downloads) >= 1.5 (for infrastructure changes)
46+
5. [Terraform](https://developer.hashicorp.com/terraform/install) >= 1.5 (for infrastructure changes)
4747

4848
Then you can set up the development environment by cloning the OSV repo and
4949
installing the Poetry dependencies.
@@ -62,11 +62,11 @@ poetry shell
6262
### Running tests
6363

6464
Certain tests require you to auth with the Google Cloud SDK and to install the
65-
Datastore Emulator:
65+
Firestore Emulator:
6666

6767
```shell
6868
gcloud auth login --update-adc
69-
gcloud components install beta cloud-datastore-emulator
69+
gcloud components install cloud-firestore-emulator
7070
```
7171

7272
To run tests:

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ website-tests:
3737
vulnfeed-tests:
3838
cd vulnfeeds && ./run_tests.sh
3939

40+
bindings-tests:
41+
cd bindings && ./run_tests.sh
42+
4043
api-server-tests:
4144
test -f $(HOME)/.config/gcloud/application_default_credentials.json || (echo "GCP Application Default Credentials not set, try 'gcloud auth login --update-adc'"; exit 1)
4245
cd gcp/api && docker build -f Dockerfile.esp -t osv/esp:latest .
4346
cd gcp/api && ./run_tests.sh $(HOME)/.config/gcloud/application_default_credentials.json
4447

4548
lint:
46-
tools/lint_and_format.sh
49+
$(run-cmd) tools/lint_and_format.sh
4750

4851
build-protos:
4952
$(run-cmd) python -m grpc_tools.protoc --python_out=. --mypy_out=. --proto_path=. osv/*.proto
@@ -68,12 +71,12 @@ run-website-emulator:
6871
run-api-server:
6972
test -f $(HOME)/.config/gcloud/application_default_credentials.json || (echo "GCP Application Default Credentials not set, try 'gcloud auth login --update-adc'"; exit 1)
7073
cd gcp/api && docker build -f Dockerfile.esp -t osv/esp:latest .
71-
cd gcp/api && $(install-cmd) && GOOGLE_CLOUD_PROJECT=oss-vdb $(run-cmd) python test_server.py $(HOME)/.config/gcloud/application_default_credentials.json $(ARGS)# Run with `make run-api-server ARGS=--no-backend` to launch esp without backend.
74+
cd gcp/api && $(install-cmd) && GOOGLE_CLOUD_PROJECT=oss-vdb OSV_VULNERABILITIES_BUCKET=osv-vulnerabilities $(run-cmd) python test_server.py $(HOME)/.config/gcloud/application_default_credentials.json $(ARGS)# Run with `make run-api-server ARGS=--no-backend` to launch esp without backend.
7275

7376
run-api-server-test:
7477
test -f $(HOME)/.config/gcloud/application_default_credentials.json || (echo "GCP Application Default Credentials not set, try 'gcloud auth login --update-adc'"; exit 1)
7578
cd gcp/api && docker build -f Dockerfile.esp -t osv/esp:latest .
7679
cd gcp/api && $(install-cmd) && GOOGLE_CLOUD_PROJECT=oss-vdb-test OSV_VULNERABILITIES_BUCKET=osv-test-vulnerabilities $(run-cmd) python test_server.py $(HOME)/.config/gcloud/application_default_credentials.json $(ARGS)
7780

7881
# TODO: API integration tests.
79-
all-tests: lib-tests worker-tests importer-tests alias-tests recoverer-tests website-tests vulnfeed-tests
82+
all-tests: lib-tests worker-tests importer-tests alias-tests recoverer-tests website-tests vulnfeed-tests bindings-tests

0 commit comments

Comments
 (0)