Skip to content

Commit 8d606dd

Browse files
👌 IMPROVE: Add aws_region as env variable
1 parent fe27360 commit 8d606dd

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

src/clone_blue_environment.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import json
22
import logging
33
import time
4+
import os
45

56
# noqa: E502
67

78

89
def main(BLUE_ENV_NAME, GREEN_ENV_NAME, BEANSTALK_APP_NAME, S3_ARTIFACTS_BUCKET, boto_authenticated_client):
910

1011
beanstalkclient = boto_authenticated_client.client(
11-
'elasticbeanstalk', region_name='us-east-1')
12+
'elasticbeanstalk', region_name=os.environ['AWS_DEFAULT_REGION'])
1213
s3client = boto_authenticated_client.client(
13-
's3', region_name='us-east-1')
14+
's3', region_name=os.environ['AWS_DEFAULT_REGION'])
1415

1516

1617
blue_env_info = get_env_info(beanstalkclient, BLUE_ENV_NAME)
@@ -105,14 +106,14 @@ def wait_green_be_ready(beanstalkclient, GREEN_ENV_NAME):
105106
green_env_info = get_env_info(beanstalkclient, GREEN_ENV_NAME)
106107
while green_env_info["Environments"][0]["Status"] != "Ready":
107108
print("Waiting the blue environment be Ready!")
108-
time.sleep(60)
109+
time.sleep(10)
109110
green_env_info = get_env_info(beanstalkclient, GREEN_ENV_NAME)
110111

111112

112113
def rollback_created_env(boto_authenticated_client, environment_name):
113114
''' Terminate a beanstalk environment'''
114115
beanstalkclient = boto_authenticated_client.client(
115-
'elasticbeanstalk', region_name='us-east-1')
116+
'elasticbeanstalk', region_name=os.environ['AWS_DEFAULT_REGION'])
116117

117118
green_env_info = get_env_info(beanstalkclient, environment_name)
118119
if len(green_env_info["Environments"]) == 0:

src/swap_environment.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import json
22
import time
3-
import aws_authentication
3+
import os
44

55

66
BLUE_CNAME_CONFIG_FILE = "blue_green_assets/blue_cname.json"
77

88

99
def main(BLUE_ENV_NAME, GREEN_ENV_NAME, S3_ARTIFACTS_BUCKET, BEANSTALK_APP_NAME, boto_authenticated_client):
1010
beanstalkclient = boto_authenticated_client.client(
11-
"elasticbeanstalk", region_name="us-east-1")
11+
"elasticbeanstalk", region_name=os.environ['AWS_DEFAULT_REGION'])
1212
s3client = boto_authenticated_client.client(
13-
's3', region_name='us-east-1')
13+
's3', region_name=os.environ['AWS_DEFAULT_REGION'])
1414
route53_client = boto_authenticated_client.client(
15-
'route53', region_name='us-east-1')
15+
'route53', region_name=os.environ['AWS_DEFAULT_REGION'])
1616
ssm_client = boto_authenticated_client.client(
17-
'ssm', region_name='us-east-1')
17+
'ssm', region_name=os.environ['AWS_DEFAULT_REGION'])
1818

1919
blue_env_url = get_env_address(
2020
BLUE_CNAME_CONFIG_FILE, S3_ARTIFACTS_BUCKET, s3client)
@@ -107,7 +107,7 @@ def create_route53_records(route53_client, applications_list, green_env_url, hos
107107
"ResourceRecordSet": {
108108
"Type": "CNAME",
109109
"Name": record,
110-
"Region": "us-east-1",
110+
"Region": os.environ['AWS_DEFAULT_REGION'],
111111
"SetIdentifier": f"{record} Identifier",
112112
"TTL": 60,
113113
"ResourceRecords": [
@@ -135,9 +135,9 @@ def re_swap_dns(boto_authenticated_client, S3_ARTIFACTS_BUCKET, GREEN_ENV_NAME,
135135
'''Re-swap beanstalk environments Domains applying the rollback'''
136136

137137
beanstalkclient = boto_authenticated_client.client(
138-
"elasticbeanstalk", region_name="us-east-1")
138+
"elasticbeanstalk", region_name=os.environ['AWS_DEFAULT_REGION'])
139139
s3client = boto_authenticated_client.client(
140-
's3', region_name='us-east-1')
140+
's3', region_name=os.environ['AWS_DEFAULT_REGION'])
141141

142142
blue_env_url = get_env_address(
143143
BLUE_CNAME_CONFIG_FILE, S3_ARTIFACTS_BUCKET, s3client

src/terminate_green_env.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
def main(BLUE_ENV_NAME, GREEN_ENV_NAME, BEANSTALK_APP_NAME, boto_authenticated_client):
66
CREATE_CONFIG_TEMPLATE_NAME = "BlueEnvConfig"
77

8-
beanstalkclient = boto_authenticated_client.client('elasticbeanstalk',region_name='us-east-1')
9-
s3client = boto_authenticated_client.client('s3',region_name='us-east-1')
8+
beanstalkclient = boto_authenticated_client.client('elasticbeanstalk',region_name=os.environ['AWS_DEFAULT_REGION'])
9+
s3client = boto_authenticated_client.client('s3',region_name=os.environ['AWS_DEFAULT_REGION'])
1010
try:
1111
print("Starting the job")
1212
# Extract the Job Data

0 commit comments

Comments
 (0)