Fix resilient service region (#5489)

* Use EC2 instance metadata to get the region instead of passing in a hardcoded value. * Use branch version of server.py for testing. * Get server script from main. * Remove region from spec.
awsdocs · Oct 13, 2023 · 10ec2aa · 10ec2aa
1 parent e7cdc1c
commit 10ec2aa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/python/cross_service/resilient_service/auto_scaler.py b/python/cross_service/resilient_service/auto_scaler.py
@@ -200,7 +200,7 @@ def replace_instance_profile(
                         inst_ready = True
             self.ssm_client.send_command(
                 InstanceIds=[instance_id], DocumentName='AWS-RunShellScript',
-                Parameters={'commands': ['cd / && sudo python3 server.py 80 us-west-2']})
+                Parameters={'commands': ['cd / && sudo python3 server.py 80']})
             log.info("Restarted the Python web server on instance %s.", instance_id)
         except ClientError as err:
             raise AutoScalerError(

diff --git a/python/cross_service/resilient_service/test/resources/server.py b/python/cross_service/resilient_service/test/resources/server.py
@@ -115,7 +115,7 @@ def run():
     """
     parser = argparse.ArgumentParser()
     parser.add_argument('port', default=80, type=int, help="The port where the HTTP server listens.")
-    parser.add_argument('region', default='us-west-2', help="The AWS Region of AWS resources used by this example.")
+    parser.add_argument('--region', default=ec2_metadata.region, help="The AWS Region of AWS resources used by this example.")
     args = parser.parse_args()
 
     server_port = args.port

diff --git a/workflows/resilient_service/SPECIFICATION.md b/workflows/resilient_service/SPECIFICATION.md
@@ -675,7 +675,7 @@ Select an instance, replace its instance profile, and reboot the instance.
    self.ssm_client.send_command(
        InstanceIds=[instance_id], 
        DocumentName='AWS-RunShellScript',
-       Parameters={'commands': ['cd / && sudo python3 server.py 80 us-west-2']})
+       Parameters={'commands': ['cd / && sudo python3 server.py 80']})
    ```
 
 Tell the user all about it:

diff --git a/workflows/resilient_service/resources/server.py b/workflows/resilient_service/resources/server.py
@@ -115,7 +115,7 @@ def run():
     """
     parser = argparse.ArgumentParser()
     parser.add_argument('port', default=80, type=int, help="The port where the HTTP server listens.")
-    parser.add_argument('region', default='us-west-2', help="The AWS Region of AWS resources used by this example.")
+    parser.add_argument('--region', default=ec2_metadata.region, help="The AWS Region of AWS resources used by this example.")
     args = parser.parse_args()
 
     server_port = args.port

diff --git a/workflows/resilient_service/resources/server_startup_script.sh b/workflows/resilient_service/resources/server_startup_script.sh
@@ -4,4 +4,4 @@ sleep 30 # prevent "Error: Rpmdb changed underneath us"
 yum install python-pip -y
 python3 -m pip install boto3 ec2-metadata
 wget -O server.py https://raw.githubusercontent.com/awsdocs/aws-doc-sdk-examples/main/workflows/resilient_service/resources/server.py
-python3 server.py 80 us-west-2
+python3 server.py 80