From 6fe03b57d04d429cd598515c6be98658531f2109 Mon Sep 17 00:00:00 2001 From: "Meir.b" Date: Tue, 21 Jan 2020 10:38:48 +0200 Subject: [PATCH 1/2] added logs --- .gitignore | 1 + drivers/version.txt | 2 +- .../ami_management/operations/deploy_operation.py | 2 +- .../cp/aws/domain/conncetivity/operations/cleanup.py | 2 +- .../cp/aws/domain/conncetivity/operations/prepare.py | 10 ++++++---- .../operations/prepare_subnet_executor.py | 2 +- package/cloudshell/cp/aws/domain/services/ec2/vpc.py | 11 +++++++---- package/version.txt | 2 +- version.txt | 2 +- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 211aa340..5b7cada3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ settings_local.py # Distribution / packaging .Python env/ +venv/ build/ cover/ develop-eggs/ diff --git a/drivers/version.txt b/drivers/version.txt index acdc3f1b..f7ef1c8b 100644 --- a/drivers/version.txt +++ b/drivers/version.txt @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.4.7.1 \ No newline at end of file diff --git a/package/cloudshell/cp/aws/domain/ami_management/operations/deploy_operation.py b/package/cloudshell/cp/aws/domain/ami_management/operations/deploy_operation.py index 3b3a28ca..6e2476e9 100644 --- a/package/cloudshell/cp/aws/domain/ami_management/operations/deploy_operation.py +++ b/package/cloudshell/cp/aws/domain/ami_management/operations/deploy_operation.py @@ -81,7 +81,7 @@ def deploy(self, ec2_session, s3_session, name, reservation, aws_ec2_cp_resource """ ami_deployment_model = ami_deploy_action.actionParams.deployment.customModel vpc = self.vpc_service.find_vpc_for_reservation(ec2_session=ec2_session, - reservation_id=reservation.reservation_id) + reservation_id=reservation.reservation_id, logger=logger) if not vpc: raise ValueError('VPC is not set for this reservation') diff --git a/package/cloudshell/cp/aws/domain/conncetivity/operations/cleanup.py b/package/cloudshell/cp/aws/domain/conncetivity/operations/cleanup.py index b46c4be0..88843f99 100644 --- a/package/cloudshell/cp/aws/domain/conncetivity/operations/cleanup.py +++ b/package/cloudshell/cp/aws/domain/conncetivity/operations/cleanup.py @@ -39,7 +39,7 @@ def cleanup(self, ec2_client, ec2_session, s3_session, aws_ec2_data_model, reser try: # need to remove the keypair before we try to find the VPC self._remove_keypair(aws_ec2_data_model, ec2_session, logger, reservation_id, s3_session) - vpc = self.vpc_service.find_vpc_for_reservation(ec2_session, reservation_id) + vpc = self.vpc_service.find_vpc_for_reservation(ec2_session, reservation_id, logger) if not vpc: raise ValueError('No VPC was created for this reservation') diff --git a/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare.py b/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare.py index ad56feac..c98fed38 100644 --- a/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare.py +++ b/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare.py @@ -142,7 +142,7 @@ def _prepare_network(self, ec2_client, ec2_session, reservation, aws_ec2_datamod # will get or create a vpc for the reservation self.cancellation_service.check_if_cancelled(cancellation_context) logger.info("Get or create existing VPC (no subnets yet)") - vpc = self._get_or_create_vpc(cidr, ec2_session, reservation) + vpc = self._get_or_create_vpc(cidr, ec2_session, reservation, logger) # will enable dns for the vpc self.cancellation_service.check_if_cancelled(cancellation_context) @@ -363,13 +363,15 @@ def _get_or_create_sandbox_isolated_security_group(self, ec2_session, management return security_group - def _get_or_create_vpc(self, cidr, ec2_session, reservation): + def _get_or_create_vpc(self, cidr, ec2_session, reservation, logger): vpc = self.vpc_service.find_vpc_for_reservation(ec2_session=ec2_session, - reservation_id=reservation.reservation_id) + reservation_id=reservation.reservation_id, + logger = logger) if not vpc: vpc = self.vpc_service.create_vpc_for_reservation(ec2_session=ec2_session, reservation=reservation, - cidr=cidr) + cidr=cidr, + logger = logger) return vpc def _create_prepare_create_keys_result(self, action, access_key): action_result = CreateKeysActionResult() diff --git a/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare_subnet_executor.py b/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare_subnet_executor.py index 6d19a3d8..a98f19b6 100644 --- a/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare_subnet_executor.py +++ b/package/cloudshell/cp/aws/domain/conncetivity/operations/prepare_subnet_executor.py @@ -58,7 +58,7 @@ def execute(self, subnet_actions): action_items = [PrepareSubnetExecutor.ActionItem(a) for a in subnet_actions] # get vpc and availability_zone - vpc = self.vpc_service.find_vpc_for_reservation(ec2_session=self.ec2_session, reservation_id=self.reservation.reservation_id) + vpc = self.vpc_service.find_vpc_for_reservation(ec2_session=self.ec2_session, reservation_id=self.reservation.reservation_id, logger=self.logger) if not vpc: vpcs_count = self.vpc_service.get_active_vpcs_count(self.ec2_client, self.logger) diff --git a/package/cloudshell/cp/aws/domain/services/ec2/vpc.py b/package/cloudshell/cp/aws/domain/services/ec2/vpc.py index 3a0bd21a..767c1ac2 100644 --- a/package/cloudshell/cp/aws/domain/services/ec2/vpc.py +++ b/package/cloudshell/cp/aws/domain/services/ec2/vpc.py @@ -37,7 +37,7 @@ def __init__(self, tag_service, subnet_service, instance_service, vpc_waiter, vp self.sg_service = sg_service self.route_table_service = route_table_service - def create_vpc_for_reservation(self, ec2_session, reservation, cidr): + def create_vpc_for_reservation(self, ec2_session, reservation, cidr, logger): """ Will create a vpc for reservation and will save it in a folder in the s3 bucket :param ec2_session: Ec2 Session @@ -48,8 +48,9 @@ def create_vpc_for_reservation(self, ec2_session, reservation, cidr): :return: vpc """ vpc = ec2_session.create_vpc(CidrBlock=cidr) + logger.info("Created VPC for reservation {0}. Id is {1}".format(reservation.reservation_id, vpc.id)) - self.vpc_waiter.wait(vpc=vpc,state= self.vpc_waiter.AVAILABLE) + self.vpc_waiter.wait(vpc=vpc, state=self.vpc_waiter.AVAILABLE) vpc_name = self.VPC_RESERVATION.format(reservation.reservation_id) self._set_tags(vpc_name=vpc_name, reservation=reservation, vpc=vpc) @@ -99,18 +100,20 @@ def get_or_create_private_route_table(self, ec2_session, reservation, vpc_id): route_table = self.route_table_service.create_route_table(ec2_session, reservation, vpc_id, route_table_name) return route_table - def find_vpc_for_reservation(self, ec2_session, reservation_id): + def find_vpc_for_reservation(self, ec2_session, reservation_id, logger): filters = [{'Name': 'tag:Name', 'Values': [self.VPC_RESERVATION.format(reservation_id)]}] vpcs = list(ec2_session.vpcs.filter(Filters=filters)) if not vpcs: + logger.info("No VPC found for reservation {0}".format(reservation_id)) return None if len(vpcs) > 1: raise ValueError('Too many vpcs for the reservation') + logger.info("VPC found for reservation {0}. Id is {1}".format(reservation_id, vpcs[0].id)) return vpcs[0] def peer_vpcs(self, ec2_session, vpc_id1, vpc_id2, reservation_model, logger): @@ -128,7 +131,7 @@ def peer_vpcs(self, ec2_session, vpc_id1, vpc_id2, reservation_model, logger): """ # create peering connection - logger.info("Creating VPC Peering between {0} to {1} ".format(vpc_id1, vpc_id1)) + logger.info("Creating VPC Peering between {0} to {1}".format(vpc_id1, vpc_id2)) vpc_peer_connection = ec2_session.create_vpc_peering_connection(VpcId=vpc_id1, PeerVpcId=vpc_id2) logger.info( "VPC Peering created {0} ,State : {1} ".format(vpc_peer_connection.id, vpc_peer_connection.status['Code'])) diff --git a/package/version.txt b/package/version.txt index acdc3f1b..f7ef1c8b 100644 --- a/package/version.txt +++ b/package/version.txt @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.4.7.1 \ No newline at end of file diff --git a/version.txt b/version.txt index acdc3f1b..f7ef1c8b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.4.2 \ No newline at end of file +2.4.7.1 \ No newline at end of file From f32c543f0c6752960427443d980ffc4935b0f86c Mon Sep 17 00:00:00 2001 From: "Meir.b" Date: Wed, 10 Jun 2020 15:50:59 +0300 Subject: [PATCH 2/2] fix URLs --- cloudformation/0_Main.json | 6 +++--- cloudformation/0_Main_EX.json | 6 +++--- cloudformation/0_Main_EX_No_VPN.json | 6 +++--- cloudformation/2_EC2.json | 8 ++++---- cloudformation/2_EC2_EX.json | 8 ++++---- cloudformation/2_EC2_EX_No_VPN.json | 8 ++++---- cloudformation/publish_test.py | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cloudformation/0_Main.json b/cloudformation/0_Main.json index 0c468af0..866b94cc 100644 --- a/cloudformation/0_Main.json +++ b/cloudformation/0_Main.json @@ -143,7 +143,7 @@ "AMILookup": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/AMI_Lookup.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/AMI_Lookup.json", "Parameters": { "LookupLatestWindowsServerAmi": "False", "LookupLatestCentosAmi": "True" @@ -153,7 +153,7 @@ "VPCNAT": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/1_VPC.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/1_VPC.json", "Parameters": { "VPCCIDR": { "Ref": "1VPCCIDR" @@ -265,7 +265,7 @@ "Ref": "8InstanceType" } }, - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/2_EC2.json" + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/2_EC2.json" } } }, diff --git a/cloudformation/0_Main_EX.json b/cloudformation/0_Main_EX.json index f18cc849..45819979 100644 --- a/cloudformation/0_Main_EX.json +++ b/cloudformation/0_Main_EX.json @@ -133,7 +133,7 @@ "AMILookup": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/AMI_Lookup.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/AMI_Lookup.json", "Parameters": { "LookupLatestWindowsServerAmi": "False", "LookupLatestCentosAmi": "True" @@ -143,7 +143,7 @@ "VPCNAT": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/1_VPC_EX.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/1_VPC_EX.json", "Parameters": { "VPCCIDR": { "Ref": "1VPCCIDR" @@ -245,7 +245,7 @@ "Ref": "8InstanceType" } }, - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/2_EC2_EX.json" + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/2_EC2_EX.json" } } }, diff --git a/cloudformation/0_Main_EX_No_VPN.json b/cloudformation/0_Main_EX_No_VPN.json index a7d80a77..291eac66 100644 --- a/cloudformation/0_Main_EX_No_VPN.json +++ b/cloudformation/0_Main_EX_No_VPN.json @@ -122,7 +122,7 @@ "AMILookup": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/AMI_Lookup.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/AMI_Lookup.json", "Parameters": { "LookupLatestWindowsServerAmi": "True", "LookupLatestCentosAmi": "True" @@ -132,7 +132,7 @@ "VPCNAT": { "Type": "AWS::CloudFormation::Stack", "Properties": { - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/1_VPC_EX_No_VPN.json", + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/1_VPC_EX_No_VPN.json", "Parameters": { "VPCCIDR": { "Ref": "1VPCCIDR" @@ -244,7 +244,7 @@ "Ref": "7CloudShellServerInstanceType" } }, - "TemplateURL": "https://s3.amazonaws.com/cf-dynamic-execution-server/2_EC2_EX_No_VPN.json" + "TemplateURL": "https://cf-dynamic-execution-server.s3.amazonaws.com/2_EC2_EX_No_VPN.json" } } }, diff --git a/cloudformation/2_EC2.json b/cloudformation/2_EC2.json index 78f64c50..8dbc2215 100644 --- a/cloudformation/2_EC2.json +++ b/cloudformation/2_EC2.json @@ -138,7 +138,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -187,7 +187,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -261,7 +261,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -311,7 +311,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", diff --git a/cloudformation/2_EC2_EX.json b/cloudformation/2_EC2_EX.json index e45912f9..b35473a2 100644 --- a/cloudformation/2_EC2_EX.json +++ b/cloudformation/2_EC2_EX.json @@ -145,7 +145,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -202,7 +202,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -283,7 +283,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -341,7 +341,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", diff --git a/cloudformation/2_EC2_EX_No_VPN.json b/cloudformation/2_EC2_EX_No_VPN.json index 793fefd6..deaa20d6 100644 --- a/cloudformation/2_EC2_EX_No_VPN.json +++ b/cloudformation/2_EC2_EX_No_VPN.json @@ -157,7 +157,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -218,7 +218,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -303,7 +303,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", @@ -365,7 +365,7 @@ "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf\n", "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf\n", "chattr +i /etc/resolv.conf\n", - "curl https://s3.amazonaws.com/cf-dynamic-execution-server/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", + "curl https://cf-dynamic-execution-server.s3.amazonaws.com/execution-server/cloudshell_es_install_script.sh --output cloudshell_es_install_script.sh --retry 20 -s -S\n", "chmod +rwx ./cloudshell_es_install_script.sh\n", "sed -i -e 's/\r$//' ./cloudshell_es_install_script.sh\n", "./cloudshell_es_install_script.sh ", diff --git a/cloudformation/publish_test.py b/cloudformation/publish_test.py index ec7180df..0266c421 100644 --- a/cloudformation/publish_test.py +++ b/cloudformation/publish_test.py @@ -62,7 +62,7 @@ def main(): if obj.key in uploaded_keys: # Make all the uploaded files public obj.Acl().put(ACL='public-read') - print "https://s3.amazonaws.com/{}/{}".format(bucket_name, obj.key) + print "https://{}.s3.amazonaws.com/{}".format(bucket_name, obj.key) def get_s3_key(folder, specs_file):