Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3006.x] Bump to aiohttp>=3.8.6 due to CVE's #65624

Merged
merged 3 commits into from
Nov 28, 2023
Merged

[3006.x] Bump to aiohttp>=3.8.6 due to CVE's #65624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeea193
Bump to `aiohttp>=3.8.6` due to CVE's
s0undt3ch Nov 28, 2023
69c004e
Add missing `cache-prefix`
s0undt3ch Nov 28, 2023
9e52a23
Pin to `actions/[email protected]` due to https://github.com/actions/cache…
s0undt3ch Nov 28, 2023
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 .github/actions/build-onedir-deps/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:

- name: Cache Deps Onedir Package Directory
id: onedir-pkg-cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: artifacts/${{ inputs.package-name }}
key: >
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-onedir-salt/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:

- name: Download Cached Deps Onedir Package Directory
id: onedir-bare-cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: artifacts/${{ inputs.package-name }}
key: >
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/cached-virtualenv/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ runs:

- name: Cache VirtualEnv
id: cache-virtualenv
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
key: ${{ steps.setup-cache-key.outputs.cache-key }}
path: ${{ steps.virtualenv-path.outputs.venv-path }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-actionlint/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:

- name: Cache actionlint Binary
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: /usr/local/bin/actionlint
key: ${{ inputs.cache-seed }}|${{ runner.os }}|${{ runner.arch }}|actionlint|${{ inputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-pre-commit/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
${{ steps.pre-commit-virtualenv.outputs.python-executable }} -m pip install pre-commit==${{ inputs.version }}

- name: Cache Pre-Commit Hooks
uses: actions/cache@v3
uses: actions/cache@v3.3.1
id: pre-commit-hooks-cache
with:
key: ${{ steps.pre-commit-virtualenv.outputs.cache-key }}|${{ inputs.version }}|${{ hashFiles('.pre-commit-config.yaml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-python-tools-scripts/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ runs:
cache-seed: tools|${{ steps.venv-hash.outputs.venv-hash }}

- name: Restore Python Tools Virtualenvs Cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: ${{ inputs.cwd }}/.tools-venvs
key: ${{ inputs.cache-prefix }}|${{ steps.venv-hash.outputs.venv-hash }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-relenv/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ runs:
python3 -m pip install relenv==${{ inputs.version }}

- name: Cache Relenv Data Directory
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: ${{ github.workspace }}/.relenv
key: ${{ inputs.cache-seed }}|relenv|${{ inputs.version }}|${{ inputs.python-version }}|${{ inputs.platform }}|${{ inputs.arch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-shellcheck/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:

- name: Cache shellcheck Binary
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: /usr/local/bin/shellcheck
key: ${{ inputs.cache-seed }}|${{ runner.os }}|${{ runner.arch }}|shellcheck|${{ inputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-deps-ci-action-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

- name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
id: nox-dependencies-cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-deps-ci-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

- name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
id: nox-dependencies-cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down Expand Up @@ -102,6 +102,8 @@ jobs:
- name: Setup Python Tools Scripts
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: ./.github/actions/setup-python-tools-scripts
with:
cache-prefix: ${{ inputs.cache-prefix }}-build-deps-ci

- name: Get Salt Project GitHub Actions Bot Environment
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Cache Python Tools Docs Virtualenv
id: tools-venvs-dependencies-cache
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: .tools-venvs/docs
key: ${{ inputs.cache-seed }}|${{ github.workflow }}|${{ github.job }}|tools-venvs|${{ steps.python-tools-scripts.outputs.version }}|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/templates/test-package-downloads-action.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down Expand Up @@ -343,7 +343,7 @@ jobs:
python3 -m pip install 'nox==${{ inputs.nox-version }}'

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down Expand Up @@ -546,7 +546,7 @@ jobs:
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-action-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
brew install tree

- name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.gh-actions-python-version }}|${{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz

- name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.gh-actions-python-version }}|${{
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-package-downloads-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down Expand Up @@ -486,7 +486,7 @@ jobs:
python3 -m pip install 'nox==${{ inputs.nox-version }}'

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down Expand Up @@ -693,7 +693,7 @@ jobs:
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz

- name: Download cached nox.${{ matrix.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packages-action-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
python3 -m pip install 'nox==${{ inputs.nox-version }}'

- name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packages-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
tree pkg/artifacts

- name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3
uses: actions/cache@v3.3.1
with:
path: nox.${{ inputs.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
Expand Down
7 changes: 1 addition & 6 deletions requirements/static/ci/py3.11/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# etcd3-py
Expand All @@ -22,10 +22,6 @@ asn1crypto==1.3.0
# -c requirements/static/ci/py3.11/linux.txt
# certvalidator
# oscrypto
async-timeout==4.0.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/py3.11/linux.txt
Expand Down Expand Up @@ -91,7 +87,6 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via
Expand Down
5 changes: 1 addition & 4 deletions requirements/static/ci/py3.11/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
#
aiohttp==3.8.5
aiohttp==3.9.0
# via etcd3-py
aiosignal==1.2.0
# via aiohttp
Expand All @@ -17,8 +17,6 @@ asn1crypto==1.3.0
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
attrs==23.1.0
# via
# aiohttp
Expand Down Expand Up @@ -66,7 +64,6 @@ cffi==1.14.6
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via -r requirements/static/ci/common.in
Expand Down
5 changes: 1 addition & 4 deletions requirements/static/ci/py3.11/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/freebsd.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/freebsd.in requirements/static/pkg/freebsd.in requirements/zeromq.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via etcd3-py
aiosignal==1.2.0
# via aiohttp
Expand All @@ -14,8 +14,6 @@ asn1crypto==1.3.0
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
attrs==23.1.0
# via
# aiohttp
Expand Down Expand Up @@ -65,7 +63,6 @@ cffi==1.14.6
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via -r requirements/static/ci/common.in
Expand Down
7 changes: 1 addition & 6 deletions requirements/static/ci/py3.11/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/lint.txt requirements/base.txt requirements/static/ci/common.in requirements/static/ci/lint.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# etcd3-py
Expand Down Expand Up @@ -35,10 +35,6 @@ asn1crypto==1.3.0
# oscrypto
astroid==2.3.3
# via pylint
async-timeout==4.0.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/py3.11/linux.txt
Expand Down Expand Up @@ -102,7 +98,6 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via
Expand Down
5 changes: 1 addition & 4 deletions requirements/static/ci/py3.11/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/linux.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via etcd3-py
aiosignal==1.2.0
# via aiohttp
Expand All @@ -20,8 +20,6 @@ asn1crypto==1.3.0
# via
# certvalidator
# oscrypto
async-timeout==4.0.2
# via aiohttp
attrs==23.1.0
# via
# aiohttp
Expand Down Expand Up @@ -74,7 +72,6 @@ cffi==1.14.6
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via -r requirements/static/ci/common.in
Expand Down
5 changes: 1 addition & 4 deletions requirements/static/ci/py3.11/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/windows.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/windows.in requirements/static/pkg/windows.in requirements/windows.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via etcd3-py
aiosignal==1.3.1
# via aiohttp
async-timeout==4.0.2
# via aiohttp
attrs==23.1.0
# via
# aiohttp
Expand Down Expand Up @@ -55,7 +53,6 @@ cffi==1.14.6
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# requests
cheetah3==3.2.6.post1
# via -r requirements/static/ci/common.in
Expand Down
7 changes: 1 addition & 6 deletions requirements/static/ci/py3.12/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/cloud.txt requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/ci/common.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
aiohttp==3.8.5
aiohttp==3.9.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# etcd3-py
Expand All @@ -22,10 +22,6 @@ asn1crypto==1.3.0
# -c requirements/static/ci/py3.12/linux.txt
# certvalidator
# oscrypto
async-timeout==4.0.2
# via
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
attrs==23.1.0
# via
# -c requirements/static/ci/py3.12/linux.txt
Expand Down Expand Up @@ -91,7 +87,6 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# aiohttp
# requests
cheetah3==3.2.6.post2
# via
Expand Down
Loading
Loading