Skip to content

Commit

Permalink
fix: did not extract dcor_object_store.ssl_verify from config
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Oct 2, 2024
1 parent 74f0c64 commit 98a4416
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
checks:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@main
- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@main
with:
python-version: "3.8"
- name: Install flake8 dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@main
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@main
with:
python-version: "3.9"
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
0.11.3
- fix: did not extract `dcor_object_store.ssl_verify` from config
0.11.2
- build: cleanup
0.11.1
Expand Down
3 changes: 1 addition & 2 deletions dcor_shared/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,14 @@ def create_time():
@functools.lru_cache()
def get_s3():
"""Return the current S3 client as defined by ckan.ini"""
from ckan import common as ckan_common
# Create a new session (do not use the default session)
s3_session = boto3.Session(
aws_access_key_id=get_ckan_config_option(
"dcor_object_store.access_key_id"),
aws_secret_access_key=get_ckan_config_option(
"dcor_object_store.secret_access_key"),
)
ssl_verify = ckan_common.config.get("dcor_object_store.ssl_verify")
ssl_verify = get_ckan_config_option("dcor_object_store.ssl_verify")
if isinstance(ssl_verify, str):
# additional check (in case CKAN did not convert to bool)
ssl_verify = ssl_verify.lower() == "true"
Expand Down

0 comments on commit 98a4416

Please sign in to comment.