Merge pull request #35 from mz-ko/master

Add config for session client to increment retries count.

Author: mz-ko

src/plugin/connector/base.py

@@ -119,7 +119,7 @@ def set_client(self, service_name):
         self._client = self.session.client(
             self.service_name,
             verify=BOTO3_HTTPS_VERIFIED,
-            Config=Config(retries={"max_attempts": 10}),
+            config=Config(retries={"max_attempts": 10}),
         )
         return self._client
 
@@ -130,7 +130,11 @@ def load_account_id(self, account_id):
         self.account_id = account_id
 
     def set_account_id(self):
-        sts_client = self.session.client("sts", verify=BOTO3_HTTPS_VERIFIED)
+        sts_client = self.session.client(
+            "sts",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         self.account_id = sts_client.get_caller_identity()["Account"]
 
     def set_cloud_service_types(self):

src/plugin/connector/ec2/auto_scaling_group_connector.py

@@ -1,3 +1,5 @@
+from botocore.config import Config
+
 from plugin.conf.cloud_service_conf import BOTO3_HTTPS_VERIFIED
 from plugin.connector.base import ResourceConnector
 
@@ -25,7 +27,11 @@ def get_auto_scaling_groups(self):
         return response_iterator
 
     def get_launch_templates(self):
-        lt_client = self.session.client("ec2", verify=BOTO3_HTTPS_VERIFIED)
+        lt_client = self.session.client(
+            "ec2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         paginator = lt_client.get_paginator("describe_launch_templates")
         response_iterator = paginator.paginate(
             PaginationConfig={
@@ -46,29 +52,49 @@ def get_launch_configurations(self):
         return response_iterator
 
     def describe_launch_template_versions(self, lt):
-        lt_client = self.session.client("ec2", verify=BOTO3_HTTPS_VERIFIED)
+        lt_client = self.session.client(
+            "ec2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         lt_versions = lt_client.describe_launch_template_versions(LaunchTemplateId=lt)
         return lt_versions
 
     def describe_instances(self, instance_ids):
-        ec2_client = self.session.client("ec2", verify=BOTO3_HTTPS_VERIFIED)
+        ec2_client = self.session.client(
+            "ec2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         res = ec2_client.describe_instances(InstanceIds=instance_ids)
         return res
 
     def describe_target_groups(self, tg_arns):
-        elb_client = self.session.client("elbv2", verify=BOTO3_HTTPS_VERIFIED)
+        elb_client = self.session.client(
+            "elbv2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         res = elb_client.describe_target_groups(TargetGroupArns=tg_arns)
         return res
 
     def describe_load_balancers(self, lb_arns):
-        elb_client = self.session.client("elbv2", verify=BOTO3_HTTPS_VERIFIED)
+        elb_client = self.session.client(
+            "elbv2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         res = elb_client.describe_load_balancers(LoadBalancerArns=lb_arns).get(
             "LoadBalancers", []
         )
         return res
 
     def describe_listeners(self, lb_arn):
-        elb_client = self.session.client("elbv2", verify=BOTO3_HTTPS_VERIFIED)
+        elb_client = self.session.client(
+            "elbv2",
+            verify=BOTO3_HTTPS_VERIFIED,
+            config=Config(retries={"max_attempts": 10}),
+        )
         res = elb_client.describe_listeners(lb_arn).get("Listeners", [])
         return res
 

src/plugin/connector/ec2/instance_connector.py

@@ -1,3 +1,4 @@
+from botocore.config import Config
 from spaceone.core.error import ERROR_REQUIRED_PARAMETER
 
 from plugin.conf.cloud_service_conf import *
@@ -15,8 +16,12 @@ def __init__(self, secret_data, region_name):
         self.service_name = "ec2"
         self.cloud_service_type = "Instance"
         self.rest_service_name = "ec2"
-        self.asg_client = self.session.client("autoscaling")
-        self.elbv2_client = self.session.client("elbv2")
+        self.asg_client = self.session.client(
+            "autoscaling", config=Config(retries={"max_attempts": 10})
+        )
+        self.elbv2_client = self.session.client(
+            "elbv2", config=Config(retries={"max_attempts": 10})
+        )
 
     def list_regions(self, **query):
         query = self._generate_query(is_paginate=False, **query)