Skip to content

allow https url for spark ingestion jar #1266

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
jklegar merged 2 commits into from
Jan 18, 2021
Merged

allow https url for spark ingestion jar #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
698ec10
allow https url for spark ingestion jar
jklegar Jan 14, 2021
dead34c
lint
jklegar Jan 14, 2021
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
12 changes: 6 additions & 6 deletions sdk/python/feast/pyspark/launchers/aws/emr_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ def _random_string(length) -> str:
return "".join(random.choice(string.ascii_lowercase) for _ in range(length))


def _upload_jar(jar_s3_prefix: str, local_path: str) -> str:
with open(local_path, "rb") as f:
uri = urlparse(os.path.join(jar_s3_prefix, os.path.basename(local_path)))
def _upload_jar(jar_s3_prefix: str, jar_path: str) -> str:
if jar_path.startswith("https://"):
return jar_path
with open(jar_path, "rb") as f:
uri = urlparse(os.path.join(jar_s3_prefix, os.path.basename(jar_path)))
return urlunparse(
get_staging_client(uri.scheme).upload_fileobj(
f, local_path, remote_uri=uri,
)
get_staging_client(uri.scheme).upload_fileobj(f, jar_path, remote_uri=uri)
)


Expand Down
6 changes: 5 additions & 1 deletion sdk/python/feast/pyspark/launchers/k8s/k8s.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,11 @@ def historical_feature_retrieval(
return cast(RetrievalJob, self._job_from_job_info(job_info))

def _upload_jar(self, jar_path: str) -> str:
if jar_path.startswith("s3://") or jar_path.startswith("s3a://"):
if (
jar_path.startswith("s3://")
or jar_path.startswith("s3a://")
or jar_path.startswith("https://")
):
return jar_path
elif jar_path.startswith("file://"):
local_jar_path = urlparse(jar_path).path
Expand Down