fix: unique resource names for jumpstart integration tests

Author: evakravi

tests/integ/sagemaker/jumpstart/retrieve_uri/inference.py

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 from __future__ import absolute_import
 
-import time
 import boto3
 import os
 from botocore.config import Config
@@ -23,7 +22,7 @@
     get_sm_session,
 )
 
-from sagemaker.utils import repack_model
+from sagemaker.utils import repack_model, unique_name_from_base
 from tests.integ.sagemaker.jumpstart.constants import (
     ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID,
     JUMPSTART_TAG,
@@ -38,18 +37,14 @@ def __init__(
         model_uri,
         instance_type,
         environment_variables,
-        suffix=time.strftime("%Y-%m-%d-%H-%M-%S", time.gmtime()),
         region=JUMPSTART_DEFAULT_REGION_NAME,
         boto_config=Config(retries={"max_attempts": 10, "mode": "standard"}),
-        base_name="jumpstart-inference-job",
         execution_role=None,
     ) -> None:
 
-        self.suffix = suffix
         self.test_suite_id = os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]
         self.region = region
         self.config = boto_config
-        self.base_name = base_name
         self.execution_role = execution_role or get_sm_session().get_caller_identity_arn()
         self.account_id = boto3.client("sts").get_caller_identity()["Account"]
         self.image_uri = image_uri
@@ -110,41 +105,13 @@ def get_sagemaker_client(self) -> boto3.client:
         return boto3.client(service_name="sagemaker", config=self.config, region_name=self.region)
 
     def get_endpoint_config_name(self) -> str:
-        timestamp_length = len(self.suffix)
-        non_timestamped_name = f"{self.base_name}-endpoint-config-"
-
-        max_endpoint_config_name_length = 63
-
-        if len(non_timestamped_name) > max_endpoint_config_name_length - timestamp_length:
-            non_timestamped_name = non_timestamped_name[
-                : max_endpoint_config_name_length - timestamp_length
-            ]
-
-        return f"{non_timestamped_name}{self.suffix}"
+        return unique_name_from_base("endpoint-config")
 
     def get_endpoint_name(self) -> str:
-        timestamp_length = len(self.suffix)
-        non_timestamped_name = f"{self.base_name}-endpoint-"
-
-        max_endpoint_name_length = 63
-
-        if len(non_timestamped_name) > max_endpoint_name_length - timestamp_length:
-            non_timestamped_name = non_timestamped_name[
-                : max_endpoint_name_length - timestamp_length
-            ]
-
-        return f"{non_timestamped_name}{self.suffix}"
+        return unique_name_from_base("endpoint")
 
     def get_model_name(self) -> str:
-        timestamp_length = len(self.suffix)
-        non_timestamped_name = f"{self.base_name}-model-"
-
-        max_model_name_length = 63
-
-        if len(non_timestamped_name) > max_model_name_length - timestamp_length:
-            non_timestamped_name = non_timestamped_name[: max_model_name_length - timestamp_length]
-
-        return f"{non_timestamped_name}{self.suffix}"
+        return unique_name_from_base("model")
 
     def create_model(self) -> None:
         self.sagemaker_client.create_model(

tests/integ/sagemaker/jumpstart/retrieve_uri/training.py

@@ -13,11 +13,11 @@
 from __future__ import absolute_import
 
 import os
-import time
 import boto3
 from botocore.config import Config
 
 from sagemaker.jumpstart.constants import JUMPSTART_DEFAULT_REGION_NAME
+from sagemaker.utils import unique_name_from_base
 from tests.integ.sagemaker.jumpstart.utils import (
     get_test_artifact_bucket,
     get_sm_session,
@@ -41,19 +41,15 @@ def __init__(
         hyperparameters,
         instance_type,
         training_dataset_s3_key,
-        suffix=time.strftime("%Y-%m-%d-%H-%M-%S", time.gmtime()),
         region=JUMPSTART_DEFAULT_REGION_NAME,
         boto_config=Config(retries={"max_attempts": 10, "mode": "standard"}),
-        base_name="jumpstart-training-job",
         execution_role=None,
     ) -> None:
 
         self.account_id = boto3.client("sts").get_caller_identity()["Account"]
-        self.suffix = suffix
         self.test_suite_id = os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]
         self.region = region
         self.config = boto_config
-        self.base_name = base_name
         self.execution_role = execution_role or get_sm_session().get_caller_identity_arn()
         self.image_uri = image_uri
         self.script_uri = script_uri
@@ -67,13 +63,7 @@ def get_sagemaker_client(self) -> boto3.client:
         return boto3.client(service_name="sagemaker", config=self.config, region_name=self.region)
 
     def get_training_job_name(self) -> str:
-        timestamp_length = len(self.suffix)
-        non_timestamped_name = f"{self.base_name}-training-job-"
-
-        if len(non_timestamped_name) > 63 - timestamp_length:
-            non_timestamped_name = non_timestamped_name[: 63 - timestamp_length]
-
-        return f"{non_timestamped_name}{self.suffix}"
+        return unique_name_from_base("training-job")
 
     def wait_until_training_job_complete(self):
         print("Waiting for training job to complete...")