Improve aws_parseInstanceType function

services/Evaluator.py

@@ -1,5 +1,6 @@
 import traceback
 import botocore
+import time
 
 from utils.Config import Config
 from utils.Tools import _warn, _info
@@ -37,10 +38,17 @@ def run(self, serviceName):
         for method in methods:
             if not rules or str.lower(method[6:]) in rules:
                 try:
+
+                    startTime = time.time()
                     if debugFlag:
                         print('--- --- fn: ' + method)
 
                     getattr(self, method)()
+                    if debugFlag:
+                        timeSpent = round(time.time() - startTime, 3)
+                        if timeSpent >= 0.2:
+                            _warn("Long running checks {}s".format(timeSpent))
+
                     cnt += 1
                 except botocore.exceptions.ClientError as e:
                     code = e.response['Error']['Code']

services/ec2/drivers/Ec2Instance.py

@@ -1,6 +1,7 @@
 import boto3
 import botocore
 import datetime
+import time
 from utils.Config import Config
 
 from datetime import timedelta
@@ -95,8 +96,7 @@ def _checkSQLServerEdition(self):
                         self.results['SQLServerEOL'] = [-1, image['Name']]
 
     def _checkInstanceTypeGeneration(self):
-
-        instanceArr = aws_parseInstanceFamily(self.ec2InstanceData['InstanceType'])
+        instanceArr = aws_parseInstanceFamily(self.ec2InstanceData['InstanceType'], region=self.ec2Client.meta.region_name)
         instancePrefixArr = instanceArr['prefixDetail']
 
         instancePrefixArr['version'] = int(instancePrefixArr['version'])+1
@@ -105,7 +105,8 @@ def _checkInstanceTypeGeneration(self):
 
         try:
             results = self.ec2Client.describe_instance_types(
-                InstanceTypes=[newFamily + '.' + size]
+                InstanceTypes=[newFamily + '.' + size],
+                MaxResults=1
             )
         except Exception as e:
             self.results['EC2NewGen'] = [1, self.ec2InstanceData['InstanceType']]

services/opensearch/drivers/OpensearchCommon.py

@@ -126,7 +126,7 @@ def _checkInstanceVersion(self):
         instance_type = self.cluster_config["InstanceType"]
         self.results["LatestInstanceVersion"] = [1, instance_type]
 
-        instance_info = aws_parseInstanceFamily(instance_type)
+        instance_info = aws_parseInstanceFamily(instance_type, region=self.osClient.meta.region_name)
 
         instance_prefix_arr = instance_info["prefixDetail"]
         instance_prefix_arr["version"] = int(instance_prefix_arr["version"]) + 1

services/rds/drivers/RdsCommon.py

@@ -80,7 +80,7 @@ def getInstInfo(self):
                 self.addII('isServerless', True)
                 return
 
-            self.instInfo = aws_parseInstanceFamily(self.db['DBInstanceClass'])
+            self.instInfo = aws_parseInstanceFamily(self.db['DBInstanceClass'], region=self.rdsClient.meta.region_name)
             self.addII('instInfo', self.instInfo)
             self.addII('IsCluster', False)
 

utils/Tools.py

@@ -1,5 +1,6 @@
 import boto3
 import re
+import time
 
 from pprint import pprint
 from utils.Config import Config
@@ -26,8 +27,11 @@ def checkIsPrivateIp(ipaddr):
     ip = ipaddr.split('/')
     return IPAddress(ip[0]).is_private()
 
-def aws_parseInstanceFamily(instanceFamily: str) -> Dict[str, str]:
-    CURRENT_REGION = Config.CURRENT_REGION
+def aws_parseInstanceFamily(instanceFamily: str, region=None) -> Dict[str, str]:
+    if region:
+        CURRENT_REGION = region
+    else:
+        CURRENT_REGION = Config.CURRENT_REGION
 
     arr = instanceFamily.split('.')
     if len(arr) > 3 or len(arr) == 1:
@@ -52,9 +56,8 @@ def aws_parseInstanceFamily(instanceFamily: str) -> Dict[str, str]:
     ssBoto = Config.get('ssBoto', None)
     if not spec:
         ec2c = ssBoto.client('ec2', region_name=CURRENT_REGION)
-
         resp = ec2c.describe_instance_types(InstanceTypes=[family])
-
+        
         iType = resp.get('InstanceTypes')
         if iType:
             info = iType[0]