Fix/add region for boto3 (#70)

* fix: add region for all boto3 objects

* fix: add region support for all boto3 objects

Author: yanbasic

src/emd/cfn/codepipeline/template.yaml

@@ -2,7 +2,7 @@ AWSTemplateFormatVersion: '2010-09-09'
 Description: |
   Easy Model Deployer bootstrap environment.
   If you delete this stack, you will not be able to deploy any new models.
-
+  Please go to https://github.com/aws-samples/easy-model-deployer for more information.
 Parameters:
   ArtifactBucketName:
     Type: String

src/emd/cfn/ecs/template.yaml

@@ -39,7 +39,7 @@ Parameters:
     Description: The emd model ID to be used for the ECS Endpoint
   ModelTag:
     Type: String
-    Default: "latest"
+    Default: "dev"
     Description: The model tag to be used for the ECS Endpoint
   FrameWorkType:
     Type: String

src/emd/sdk/deploy.py

@@ -67,7 +67,7 @@ def prepare_deploy(
             f"A model with the ID: {model_id} and tag: {model_tag} already exists. Kindly use a different tag to proceed."
         )
 
-    client = boto3.client("codepipeline")
+    client = boto3.client("codepipeline", region_name=region)
     try:
         active_executuion_infos = get_pipeline_active_executions(
             pipeline_name=CODEPIPELINE_NAME,
@@ -114,7 +114,7 @@ def deploy(
     waiting_until_deploy_complete=True,
 ) -> dict:
     # Check if AWS environment is properly configured
-    logger.info("check if model is exists...")
+    logger.info("checking if model is exists...")
     assert (
         model_stack_name is None
     ), f"It is currently not supported to custom model stack name."
@@ -228,7 +228,8 @@ def deploy(
         while True:
             try:
                 status_info = get_pipeline_execution_status(
-                    pipeline_execution_id=response["pipelineExecutionId"]
+                    pipeline_execution_id=response["pipelineExecutionId"],
+                    region=region
                 )
             except client.exceptions.PipelineExecutionNotFoundException as e:
                 logger.info("Waiting for pipeline execution to start...")
@@ -244,7 +245,7 @@ def deploy(
                 log_info += f", status_summary: {status_summary}"
             if stage_name:
                 log_info += f", in stage: {stage_name}"
-            log_info += f", Execution ID: {execution_id}"
+            # log_info += f", Execution ID: {execution_id}"
             log_info += f", Duration time: {int(time.time() - start_deploy_time)}s"
             logger.info(log_info)
             if status_code == 0:

src/emd/sdk/destroy.py

@@ -17,7 +17,7 @@
 )
 from emd.models.utils.constants import ServiceType
 from emd.models import Model
-
+from emd.utils.aws_service_utils import get_current_region
 logger = get_logger(__name__)
 
 
@@ -36,7 +36,7 @@ def stop_pipeline_execution(
     cur_uuid = Model.get_model_stack_name_prefix(model_id,model_tag)
     if cur_uuid in active_executuion_infos_d:
         pipeline_execution_id = active_executuion_infos_d[cur_uuid]['pipeline_execution_id']
-        client = boto3.client('codepipeline')
+        client = boto3.client('codepipeline', region_name=get_current_region())
         try:
             client.stop_pipeline_execution(
                 pipelineName=pipeline_name,
@@ -59,7 +59,7 @@ def stop_pipeline_execution(
 
 
 def destroy_ecs(model_id,model_tag,stack_name):
-    cf_client = boto3.client('cloudformation')
+    cf_client = boto3.client('cloudformation', region_name=get_current_region())
     cf_client.delete_stack(StackName=stack_name)
 
 def destroy(model_id:str,model_tag=MODEL_DEFAULT_TAG,waiting_until_complete=True):
@@ -74,7 +74,7 @@ def destroy(model_id:str,model_tag=MODEL_DEFAULT_TAG,waiting_until_complete=True
     if parameters['ServiceType'] == ServiceType.ECS:
         return destroy_ecs(model_id, model_tag,stack_name)
 
-    cf_client = boto3.client('cloudformation')
+    cf_client = boto3.client('cloudformation', region_name=get_current_region())
     cf_client.delete_stack(StackName=stack_name)
 
     logger.info(f"Delete stack initiated: {stack_name}")

src/emd/sdk/status.py

@@ -10,12 +10,14 @@
     check_env_stack_exist_and_complete
 )
 from emd.utils.aws_service_utils import get_account_id
-
+from emd.utils.aws_service_utils import get_current_region
 def get_pipeline_execution_status(
         pipeline_execution_id:str,
         pipeline_name:str = CODEPIPELINE_NAME,
         region=None
     ):
+    if region is None:
+        region = get_current_region()
     client = boto3.client('codepipeline', region_name=region)
     response = client.get_pipeline_execution(
         pipelineName=pipeline_name,

src/emd/utils/aws_service_management.py

@@ -29,7 +29,7 @@ def check_aws_environment():
     """
     try:
         # Try to create a boto3 client and make a simple API call
-        sts = boto3.client('sts')
+        sts = boto3.client('sts', region_name=get_current_region())
         response = sts.get_caller_identity()
         typer.echo("AWS environment is properly configured.")
         account_id = response['Account']
@@ -47,7 +47,7 @@ def log_pipeline_execution_details(execution_id: str = None, logs: bool = False)
     Get the details of a pipeline execution and optionally log the events.
     """
     try:
-        sts = boto3.client("sts")
+        sts = boto3.client("sts", region_name=get_current_region())
         region = get_current_region()
         cfn = boto3.client("cloudformation", region_name=region)
         codepipeline = boto3.client("codepipeline", region_name=region)

src/emd/utils/aws_service_utils.py

@@ -56,7 +56,7 @@ def check_aws_environment():
     """
     try:
         # Try to create a boto3 client and make a simple API call
-        sts = boto3.client("sts")
+        sts = boto3.client("sts", region_name=get_current_region())
         response = sts.get_caller_identity()
         logger.info("AWS environment is properly configured.")
         account_id = response["Account"]
@@ -69,7 +69,7 @@ def check_aws_environment():
 
 
 def get_account_id():
-    sts_client = boto3.client("sts")
+    sts_client = boto3.client("sts", region_name=get_current_region())
     account_id = sts_client.get_caller_identity()["Account"]
     return account_id
 
@@ -123,7 +123,7 @@ def get_role_create_template(
 
 
 def get_stack_info(stack_name):
-    cf = boto3.client("cloudformation")
+    cf = boto3.client("cloudformation", region_name=get_current_region())
     stack_info = cf.describe_stacks(StackName=stack_name)["Stacks"][0]
     parameters = {}
     for parameter in stack_info["Parameters"]:
@@ -134,7 +134,7 @@ def get_stack_info(stack_name):
 
 def check_stack_exists(stack_name):
     try:
-        cf = boto3.client("cloudformation")
+        cf = boto3.client("cloudformation", region_name=get_current_region())
         cf.describe_stacks(StackName=stack_name)
         return True
     except ClientError as e:
@@ -150,7 +150,7 @@ def check_stack_status(stack_name) -> StackStatus:
     is_stack_exist = True
     stack_info = {}
     try:
-        cf = boto3.client("cloudformation")
+        cf = boto3.client("cloudformation", region_name=get_current_region())
         stack_info = cf.describe_stacks(StackName=stack_name)["Stacks"][0]
     except ClientError as e:
         if e.response["Error"][
@@ -163,7 +163,7 @@ def check_stack_status(stack_name) -> StackStatus:
 
 
 def get_pipeline_stages(pipeline_name: str) -> list[str]:
-    client = boto3.client("codepipeline")
+    client = boto3.client("codepipeline", region_name=get_current_region())
     response = client.get_pipeline_state(name=pipeline_name)
     stages = [i["stageName"] for i in response["stageStates"]]
     return stages
@@ -173,7 +173,7 @@ def get_pipeline_execution_info(
     pipeline_name: str, pipeline_execution_id: str, client=None
 ):
 
-    client = client or boto3.client("codepipeline")
+    client = client or boto3.client("codepipeline", region_name=get_current_region())
     execution_info = client.get_pipeline_execution(
         pipelineName=pipeline_name, pipelineExecutionId=pipeline_execution_id
     )["pipelineExecution"]
@@ -187,7 +187,7 @@ def get_pipeline_active_executions(
     filter_stoped=True,
     filter_failed=True,
 ) -> list[dict]:
-    client = client or boto3.client("codepipeline")
+    client = client or boto3.client("codepipeline", region_name=get_current_region())
     try:
         stage_states = client.get_pipeline_state(name=pipeline_name)[
             "stageStates"
@@ -264,7 +264,7 @@ def get_pipeline_active_executions(
 
 
 def get_model_stacks():
-    cf = boto3.client("cloudformation")
+    cf = boto3.client("cloudformation", region_name=get_current_region())
     stacks = cf.list_stacks(
         StackStatusFilter=[
             "CREATE_COMPLETE",
@@ -322,21 +322,21 @@ def get_model_stacks():
 
 
 def get_model_stack_info(model_stack_name: str):
-    cf = boto3.client("cloudformation")
+    cf = boto3.client("cloudformation", region_name=get_current_region())
     stack_info = cf.describe_stacks(StackName=model_stack_name)["Stacks"][0]
     return stack_info
 
 
 def s3_bucket_version(bucket, s3_key):
-    s3_client = boto3.client("s3")
+    s3_client = boto3.client("s3", region_name=get_current_region())
     version_id: str = s3_client.head_object(Bucket=bucket, Key=s3_key)[
         "VersionId"
     ]
     return version_id
 
 
 def check_stack_exist_and_complete(stack_name: str):
-    client = boto3.client("cloudformation")
+    client = boto3.client("cloudformation", region_name=get_current_region())
     try:
         response = client.describe_stacks(StackName=stack_name)
         stack_status = response["Stacks"][0]["StackStatus"]
@@ -357,7 +357,7 @@ def monitor_stack(stack_name):
     response = get_stack_info(stack_name=stack_name)
     stack_id = response["StackId"]
     seen_events = set()
-    cloudformation = boto3.client("cloudformation")
+    cloudformation = boto3.client("cloudformation", region_name=get_current_region())
     # Determine if this is a create or update operation
     while True:
         events = cloudformation.describe_stack_events(StackName=stack_id)[
@@ -398,7 +398,7 @@ def monitor_stack(stack_name):
 
 
 def monitor_pipeline(pipeline_name, pipeline_execution_id):
-    client = boto3.client("codepipeline")
+    client = boto3.client("codepipeline", region_name=get_current_region())
     while True:
         response = client.get_pipeline_state(name=pipeline_name)
         for stage in response["stageStates"]:
@@ -435,7 +435,7 @@ def get_sagemaker_instance_quota(instance_type: str) -> float:
         ValueError: If the instance type doesn't have a corresponding quota code
         ClientError: If there's an error calling AWS Service Quotas
     """
-    service_quota_client = boto3.client("service-quotas")
+    service_quota_client = boto3.client("service-quotas", region_name=get_current_region())
 
     quota_code = ServiceQuotaCode.get_service_quota_code(instance_type)
     response = service_quota_client.get_service_quota(
@@ -459,7 +459,7 @@ def get_sagemaker_instance_count_by_type(instance_type: str):
         list: List of endpoint names using this instance type
     """
     # Initialize SageMaker client
-    sagemaker_client = boto3.client("sagemaker")
+    sagemaker_client = boto3.client("sagemaker", region_name=get_current_region())
 
     sagemaker_instance_type = InstanceType.convert_instance_type_to_sagemaker(
         instance_type
@@ -566,7 +566,7 @@ def get_current_region():
 
 
 def get_aws_account_id():
-    sts = boto3.client("sts")
+    sts = boto3.client("sts", region_name=get_current_region())
     response = sts.get_caller_identity()
     account_id = response["Account"]
     return account_id

src/pipeline/utils/aws_service_utils.py

@@ -33,7 +33,7 @@ def check_aws_environment():
 
 
 def get_account_id():
-    sts_client = boto3.client("sts")
+    sts_client = boto3.client("sts", region_name=get_current_region())
     account_id = sts_client.get_caller_identity()["Account"]
     return account_id
 
@@ -90,7 +90,7 @@ def get_role_create_template(
 
 
 def get_stack_info(stack_name):
-    cf = boto3.client('cloudformation')
+    cf = boto3.client('cloudformation', region_name=get_current_region())
     stack_info = cf.describe_stacks(StackName=stack_name)['Stacks'][0]
     return stack_info