Skip to content

Commit 02c43f2

Browse files
committed
Simplify logic a bit and add documentation to code
Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>
1 parent a6b50ff commit 02c43f2

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

Tests/iaas/scs_0123_mandatory_services/mandatory_services.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@ def compute_scs_0123_service_presence(services_lookup, *names):
2828

2929
def s3_conn(creds, conn):
3030
"""Return an s3 client conn"""
31-
insecure = conn.config.config.get("insecure")
32-
verify = conn.config.config.get("verify")
33-
cacert = conn.config.config.get("cacert")
34-
vrfy = False if (insecure is True or verify is False) else \
35-
(cacert or (verify if isinstance(verify, str) else None))
31+
cfg = conn.config.config
32+
# Take insecure/verify/cacert parameter from clouds.yaml and pass it to boto3.resource.
33+
# Deliberately do un-Pythonic `is True` and `is False` here because of type mayhem:
34+
# for instance, handle verify=False differently from verify=None (or not set) or verify='some.ca'.
35+
if cfg.get("insecure") is True or cfg.get("verify") is False:
36+
verify = False
37+
else:
38+
verify = cfg.get("cacert") or cfg.get("verify")
3639
return boto3.resource(
37-
's3', endpoint_url=creds["HOST"], verify=vrfy,
40+
's3', endpoint_url=creds["HOST"], verify=verify,
3841
aws_access_key_id=creds["AK"], aws_secret_access_key=creds["SK"],
3942
)
4043

0 commit comments

Comments
 (0)