From 4c2993182d26d6e64d54b6e9023f01a16eb92fe1 Mon Sep 17 00:00:00 2001 From: Sebastian Rieger Date: Sat, 8 May 2021 20:07:45 +0200 Subject: [PATCH] changed aws demo3 to be compatible with AWS Educate classroom --- .../demo3-microservice-in-aws-destroy.py | 23 ++++++++---- example-projects/demo3-microservice-in-aws.py | 35 ++++++++++++------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/example-projects/demo3-microservice-in-aws-destroy.py b/example-projects/demo3-microservice-in-aws-destroy.py index dedc5d8..9cfcb1b 100644 --- a/example-projects/demo3-microservice-in-aws-destroy.py +++ b/example-projects/demo3-microservice-in-aws-destroy.py @@ -13,8 +13,12 @@ from libcloud.compute.types import Provider, NodeState # default region # region_name = 'eu-central-1' -region_name = 'us-east-2' -#region_name = 'ap-south-1' +# region_name = 'ap-south-1' + +# AWS Educate only allows us-east-1 see our AWS classroom at https://www.awseducate.com +# e.g., https://www.awseducate.com/student/s/launch-classroom?classroomId=a1v3m000005mNm6AAE + +region_name = 'us-east-1' def main(): @@ -24,10 +28,14 @@ def main(): # ########################################################################### - access_id = getpass.win_getpass("Enter your access_id:") - secret_key = getpass.win_getpass("Enter your secret_key:") - # access_id = "AXY..." - # secret_key = "j1zomy61..." + # see AWS Educate classroom, Account Details + + # access_id = getpass.win_getpass("Enter your access_id:") + # secret_key = getpass.win_getpass("Enter your secret_key:") + # session_token = getpass.win_getpass("Enter your session_token:") + access_id = "ASIAU..." + secret_key = "7lafW..." + session_token = "IQoJb3JpZ...EMb//..." ########################################################################### # @@ -38,6 +46,7 @@ def main(): provider = get_driver(Provider.EC2) conn = provider(access_id, secret_key, + token=session_token, region=region_name) ########################################################################### @@ -63,7 +72,7 @@ def main(): # if we see any demo instances still running continue to wait for them to stop if instance.name in ['all-in-one', 'app-worker-1', 'app-worker-2', 'app-worker-3', 'app-controller', 'app-services', 'app-api-1', 'app-api-2']: - if instance.state.value is not 'terminated': + if instance.state.value != 'terminated': nodes_still_running = True print('There are still instances running, waiting for them to be destroyed...') diff --git a/example-projects/demo3-microservice-in-aws.py b/example-projects/demo3-microservice-in-aws.py index ebef0fa..38f0f80 100644 --- a/example-projects/demo3-microservice-in-aws.py +++ b/example-projects/demo3-microservice-in-aws.py @@ -10,7 +10,7 @@ from libcloud.compute.types import Provider # The image to look for and use for the started instance ubuntu_image_name = 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20200408' -#ubuntu_image_id = "ami-0e342d72b12109f91" # local ami id for resent ubuntu 18.04 20200408 in eu-central-1 +# ubuntu_image_id = "ami-0e342d72b12109f91" # local ami id for resent ubuntu 18.04 20200408 in eu-central-1 # The public key to be used for SSH connection, please make sure, that you have the corresponding private key # @@ -23,9 +23,13 @@ pub_key_file = '~/.ssh/id_rsa.pub' flavor_name = 't2.nano' # default region -region_name = 'eu-central-1' -# region_name = 'us-east-2' -#region_name = 'ap-south-1' +# region_name = 'eu-central-1' +# region_name = 'ap-south-1' + +# AWS Educate only allows us-east-1 see our AWS classroom at https://www.awseducate.com +# e.g., https://www.awseducate.com/student/s/launch-classroom?classroomId=a1v3m000005mNm6AAE + +region_name = 'us-east-1' def main(): @@ -35,10 +39,14 @@ def main(): # ########################################################################### - access_id = getpass.win_getpass("Enter your access_id:") - secret_key = getpass.win_getpass("Enter your secret_key:") - # access_id = "AXY..." - # secret_key = "j1zomy61..." + # see AWS Educate classroom, Account Details + + # access_id = getpass.win_getpass("Enter your access_id:") + # secret_key = getpass.win_getpass("Enter your secret_key:") + # session_token = getpass.win_getpass("Enter your session_token:") + access_id = "ASIAU..." + secret_key = "7lafW..." + session_token = "IQoJb3JpZ...EMb//..." ########################################################################### # @@ -49,6 +57,7 @@ def main(): provider = get_driver(Provider.EC2) conn = provider(access_id, secret_key, + token=session_token, region=region_name) ########################################################################### @@ -60,11 +69,11 @@ def main(): images = conn.list_images() # image = '' # for img in images: - # # if img.name == ubuntu_image_name: - # if img.extra['owner_alias'] == 'amazon': - # print(img) - # if img.id == ubuntu_image_name: - # image = img + # # if img.name == ubuntu_image_name: + # if img.extra['owner_alias'] == 'amazon': + # print(img) + # if img.id == ubuntu_image_name: + # image = img image = [i for i in images if i.name == ubuntu_image_name][0] print(image)