Skip to content

MESH-2092 Combined Dependabot PRs #112

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

Merged
jimasp merged 9 commits into from
Oct 6, 2025
Merged

MESH-2092 Combined Dependabot PRs #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4530485
Bump tox from 4.28.4 to 4.30.2
dependabot[bot] Oct 6, 2025
3bc2071
Bump boto3 from 1.40.8 to 1.40.43
dependabot[bot] Oct 6, 2025
57362fd
Merge dependabot/pip/boto3-1.40.43 into mesh-2092-dependabot-combined
github-actions[bot] Oct 6, 2025
c48f776
Merge dependabot/pip/tox-4.30.2 into mesh-2092-dependabot-combined
github-actions[bot] Oct 6, 2025
27e846d
MESH-2092 Trigger Build
jimasp Oct 6, 2025
bded7c8
MESH-2092 fix for Sonar rule githubactions:S7630
jimasp Oct 6, 2025
fa6a2e4
MESH-2092 update proxy connect message
jimasp Oct 6, 2025
44dbb93
MESH-2092 proxy connect error - assert on type not message
jimasp Oct 6, 2025
e685e28
MESH-2092 remove old constant
jimasp Oct 6, 2025
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
16 changes: 12 additions & 4 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ jobs:

- name: merge into base_branch
if: ${{ github.event_name == 'pull_request' }}
env:
PR_HEAD_REF: ${{ github.head_ref }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch $PR_HEAD_REF"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
Expand Down Expand Up @@ -85,9 +87,11 @@ jobs:

- name: merge into base_branch
if: ${{ github.event_name == 'pull_request' }}
env:
PR_HEAD_REF: ${{ github.head_ref }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch $PR_HEAD_REF"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
Expand Down Expand Up @@ -203,9 +207,11 @@ jobs:

- name: merge into base_branch
if: ${{ github.event_name == 'pull_request' }}
env:
PR_HEAD_REF: ${{ github.head_ref }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch $PR_HEAD_REF"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
Expand Down Expand Up @@ -288,9 +294,11 @@ jobs:

- name: merge into base_branch
if: ${{ github.event_name == 'pull_request' }}
env:
PR_HEAD_REF: ${{ github.head_ref }}
run: |
echo base branch "${{ github.base_ref }}"
echo pr branch "${{ github.head_ref }}"
echo "pr branch $PR_HEAD_REF"
git checkout "${{ github.base_ref }}"
git checkout -b "merging-${{ github.event.number }}"
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
Expand Down
60 changes: 11 additions & 49 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tests/mesh_endpoint_connectivity_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import pytest
from requests.exceptions import ConnectionError as RequestsConnectionError
from requests.exceptions import HTTPError, SSLError
from urllib3.exceptions import ProxyError

import mesh_client
from mesh_client import DEPRECATED_HSCN_INT_ENDPOINT, Endpoint, MeshClient
Expand All @@ -32,7 +33,6 @@ def _host_resolves(endpoint: Endpoint):

CONNECTION_ABORTED_ERROR = "Connection aborted."
REMOTE_END_CLOSED_CONNECTION = "Remote end closed connection without response"
UNABLE_TO_CONNECT_TO_PROXY = "Unable to connect to proxy"
SSL_CERTIFICATE_ERROR = "SSL certificate error"
LOCAL_HTTPS_PROXY_URL = "http://localhost:8019"

Expand Down Expand Up @@ -295,7 +295,7 @@ def test_internet_endpoints_via_explicit_proxy(name: str, endpoint: Endpoint):
if err.type == SSLError:
assert isinstance(err.value.args[0].reason.args[0], SSLCertVerificationError)
else:
assert err.value.args[0].reason.args[0] == UNABLE_TO_CONNECT_TO_PROXY
assert isinstance(err.value.args[0].reason, ProxyError)
assert str(err.value.args[0].reason.args[1]) == REMOTE_END_CLOSED_CONNECTION


Expand All @@ -311,5 +311,5 @@ def test_internet_endpoints_via_ambient_proxy(name: str, endpoint: Endpoint):
if err.type == SSLError:
assert isinstance(err.value.args[0].reason.args[0], SSLCertVerificationError)
else:
assert err.value.args[0].reason.args[0] == UNABLE_TO_CONNECT_TO_PROXY
assert isinstance(err.value.args[0].reason, ProxyError)
assert str(err.value.args[0].reason.args[1]) == REMOTE_END_CLOSED_CONNECTION
Loading