Skip to content

Commit 33f78fe

Browse files
Merge pull request #2 from Christian-kam/my-fix-branch-master
fix: use the provided kms key to upload user code
2 parents a24c216 + 1827678 commit 33f78fe

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/sagemaker/processing.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def _normalize_args(
212212

213213
return normalized_inputs, normalized_outputs
214214

215-
def _include_code_in_inputs(self, inputs, _code, kms_key=None):
215+
def _include_code_in_inputs(self, inputs, _code, _kms_key):
216216
"""A no op in the base class to include code in the processing job inputs.
217217
218218
Args:
@@ -221,6 +221,8 @@ def _include_code_in_inputs(self, inputs, _code, kms_key=None):
221221
:class:`~sagemaker.processing.ProcessingInput` objects.
222222
_code (str): This can be an S3 URI or a local path to a file with the framework
223223
script to run (default: None). A no op in the base class.
224+
_kms_key (str): The ARN of the KMS key that is used to encrypt the
225+
user code file (default: None).
224226
225227
Returns:
226228
list[:class:`~sagemaker.processing.ProcessingInput`]: inputs
@@ -488,12 +490,14 @@ def _include_code_in_inputs(self, inputs, code, kms_key=None):
488490
:class:`~sagemaker.processing.ProcessingInput` objects.
489491
code (str): This can be an S3 URI or a local path to a file with the framework
490492
script to run (default: None).
493+
kms_key (str): The ARN of the KMS key that is used to encrypt the
494+
user code file (default: None).
491495
492496
Returns:
493497
list[:class:`~sagemaker.processing.ProcessingInput`]: inputs together with the
494498
code as `ProcessingInput`.
495499
"""
496-
user_code_s3_uri = self._handle_user_code_url(code,kms_key)
500+
user_code_s3_uri = self._handle_user_code_url(code, kms_key)
497501
user_script_name = self._get_user_code_name(code)
498502

499503
inputs_with_code = self._convert_code_and_add_to_inputs(inputs, user_code_s3_uri)
@@ -523,6 +527,8 @@ def _handle_user_code_url(self, code, kms_key=None):
523527
524528
Args:
525529
code (str): A URL to the customer's code.
530+
kms_key (str): The ARN of the KMS key that is used to encrypt the
531+
user code file (default: None).
526532
527533
Returns:
528534
str: The S3 URL to the customer's code.
@@ -551,7 +557,7 @@ def _handle_user_code_url(self, code, kms_key=None):
551557
code
552558
)
553559
)
554-
user_code_s3_uri = self._upload_code(code_path,kms_key)
560+
user_code_s3_uri = self._upload_code(code_path, kms_key)
555561
else:
556562
raise ValueError(
557563
"code {} url scheme {} is not recognized. Please pass a file path or S3 url".format(
@@ -566,6 +572,8 @@ def _upload_code(self, code, kms_key=None):
566572
567573
Args:
568574
code (str): A file or directory to be uploaded to S3.
575+
kms_key (str): The ARN of the KMS key that is used to encrypt the
576+
user code file (default: None).
569577
570578
Returns:
571579
str: The S3 URI of the uploaded file or directory.
@@ -579,7 +587,9 @@ def _upload_code(self, code, kms_key=None):
579587
self._CODE_CONTAINER_INPUT_NAME,
580588
)
581589
return s3.S3Uploader.upload(
582-
local_path=code, desired_s3_uri=desired_s3_uri, sagemaker_session=self.sagemaker_session, kms_key=kms_key
590+
local_path=code, desired_s3_uri=desired_s3_uri,
591+
sagemaker_session=self.sagemaker_session,
592+
kms_key=kms_key,
583593
)
584594

585595
def _convert_code_and_add_to_inputs(self, inputs, s3_uri):

0 commit comments

Comments
 (0)