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

changed string variables for Blob and S3 kwargs #151

Merged
merged 4 commits into from
Jun 1, 2022
Merged

changed string variables for Blob and S3 kwargs #151

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3209170
Update bug_report.md
g-despot Apr 19, 2022
0c7cf5b
[master < T0068-GA] Update README (#136)
katarinasupe May 4, 2022
bde84c4
changed string variables for Blob and S3 kwargs
brunos252 May 25, 2022
9a39cea
Merge branch 'develop' into fix-s3-and-blob-kwargs-usage
brunos252 May 27, 2022
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
28 changes: 14 additions & 14 deletions gqlalchemy/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
FEATHER_EXTENSION = "feather"
ARROW_EXTENSION = "arrow"

BLOB_ACCOUNT_NAME = "blob_account_name"
BLOB_ACCOUNT_KEY = "blob_account_key"
BLOB_SAS_TOKEN = "blob_sas_token"
BLOB_ACCOUNT_NAME = "account_name"
BLOB_ACCOUNT_KEY = "account_key"
BLOB_SAS_TOKEN = "sas_token"
BLOB_CONTAINER_NAME_KEY = "container_name"

S3_REGION = "s3_region"
S3_ACCESS_KEY = "s3_access_key"
S3_SECRET_KEY = "s3_secret_key"
S3_SESSION_TOKEN = "s3_session_token"
S3_REGION = "region"
S3_ACCESS_KEY = "access_key"
S3_SECRET_KEY = "secret_key"
S3_SESSION_TOKEN = "session_token"
S3_BUCKET_NAME_KEY = "bucket_name"

LOCAL_STORAGE_PATH = "local_storage_path"
Expand Down Expand Up @@ -209,10 +209,10 @@ def __init__(self, bucket_name: str, **kwargs):
bucket_name: Name of the bucket on S3 from which to read the data

Kwargs:
s3_access_key: S3 access key.
s3_secret_key: S3 secret key.
s3_region: S3 region.
s3_session_token: S3 session token (Optional).
access_key: S3 access key.
secret_key: S3 secret key.
region: S3 region.
session_token: S3 session token (Optional).

Raises:
KeyError: kwargs doesn't contain necessary fields.
Expand Down Expand Up @@ -244,9 +244,9 @@ def __init__(self, container_name: str, **kwargs) -> None:
container_name: Name of the Blob container storing data.

Kwargs:
blob_account_name: Account name from Azure Blob.
blob_account_key: Account key for Azure Blob (Optional - if using sas_token).
blob_sas_token: Shared access signature token for authentification (Optional).
account_name: Account name from Azure Blob.
account_key: Account key for Azure Blob (Optional - if using sas_token).
sas_token: Shared access signature token for authentification (Optional).

Raises:
KeyError: kwargs doesn't contain necessary fields.
Expand Down