Merge pull request #517 from sebasrp/issues/514

Fixes #514 - EKS Fargate profile usage check error

awslimitchecker/services/eks.py

@@ -139,7 +139,9 @@ def _find_clusters_usage(self):
                     aws_type='AWS::EKS::FargateProfile')
 
                 for selector in profile_selectors:
-                    label_pairs = selector['labels']
+                    label_pairs = selector.get('labels')
+                    if label_pairs is None:
+                        continue
                     self.limits[
                         'Label pairs per Fargate profile selector'
                     ]._add_current_usage(

awslimitchecker/tests/services/result_fixtures.py

@@ -4632,6 +4632,7 @@ class EKS(object):
             'fargateProfileNames': [
                 'bar',
                 'baz',
+                'profile_no_labels',
             ]
         }
     ]
@@ -4697,5 +4698,15 @@ class EKS(object):
                     },
                 ],
             }
+        },
+        {
+            'fargateProfile': {
+                'fargateProfileName': 'profile_no_labels',
+                'selectors': [
+                    {
+                        'namespace': "test_namespace1",
+                    },
+                ],
+            }
         }
     ]

awslimitchecker/tests/services/test_eks.py

@@ -160,6 +160,10 @@ def test_find_clusters_usage(self):
                 clusterName=ANY,
                 fargateProfileName=ANY
             ),
+            call.describe_fargate_profile(
+                clusterName=ANY,
+                fargateProfileName=ANY
+            ),
         ]
         assert len(cls.limits[clusters_limit_key].get_current_usage()) == 1
         assert cls.limits[clusters_limit_key].get_current_usage()[
@@ -191,10 +195,10 @@ def test_find_clusters_usage(self):
         assert cls.limits[fargate_profiles_limit_key].get_current_usage()[
             0].get_value() == 1
         assert cls.limits[fargate_profiles_limit_key].get_current_usage()[
-            1].get_value() == 2
+            1].get_value() == 3
 
         assert len(cls.limits[
-            selectors_limit_key].get_current_usage()) == 3
+            selectors_limit_key].get_current_usage()) == 4
         assert cls.limits[selectors_limit_key].get_current_usage()[
             0].get_value() == 1
         assert cls.limits[selectors_limit_key].get_current_usage()[

dev/release.py

@@ -106,7 +106,7 @@ def run(self):
             for line in fh.readlines():
                 line = line.strip()
                 if (
-                    line == '------------------' and
+                    line == '-' * len(expected) and
                     last_line == expected
                 ):
                     have_ver = True

docs/build_generated_docs.py

@@ -167,7 +167,7 @@ def limits_for_ec2():
     regions still use the old per-instance-type limits. Please see the sections
     for either :ref:`limits.ec2-standard` or :ref:`limits.ec2-nonvcpu` for
     details.
-    
+
     """)
     limit_info += '.. _limits.ec2-standard:\n\n'
     limit_info += "EC2 - Standard Regions\n"
@@ -180,10 +180,10 @@ def limits_for_ec2():
     (On-Demand, Reserved, etc.). The value that awslimitchecker reports
     for Running On-Demand Instances current usage will *not* match the
     number of instances you see in the Console or API.
-    
+
     **Important:** The limits for **Running On-Demand Instances** are now
     measured in vCPU count per instance family, not instance count per instance
-    type. 
+    type.
     """) + "\n"
     limit_info += "\n"
     limit_info += format_limits_for_service(
@@ -299,9 +299,6 @@ def build_runner_examples():
             '--limit="AutoScaling/Launch configurations"=456',
             '-l',
         ],
-        'check_thresholds': ['awslimitchecker', '--no-color'],
-        'check_thresholds_custom': ['awslimitchecker', '-W', '97',
-                                    '--critical=98', '--no-color'],
         'iam_policy': ['awslimitchecker', '--iam-policy'],
         'list_metrics': ['awslimitchecker', '--list-metrics-providers'],
         'list_alerts': ['awslimitchecker', '--list-alert-providers'],

docs/source/awslimitchecker.services.eks.rst

@@ -0,0 +1,8 @@
+awslimitchecker.services.eks module
+===================================
+
+.. automodule:: awslimitchecker.services.eks
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :private-members:

docs/source/awslimitchecker.services.kinesis.rst

@@ -0,0 +1,8 @@
+awslimitchecker.services.kinesis module
+=======================================
+
+.. automodule:: awslimitchecker.services.kinesis
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :private-members:

docs/source/awslimitchecker.services.rst

@@ -24,11 +24,13 @@ Submodules
    awslimitchecker.services.ec2
    awslimitchecker.services.ecs
    awslimitchecker.services.efs
+   awslimitchecker.services.eks
    awslimitchecker.services.elasticache
    awslimitchecker.services.elasticbeanstalk
    awslimitchecker.services.elb
    awslimitchecker.services.firehose
    awslimitchecker.services.iam
+   awslimitchecker.services.kinesis
    awslimitchecker.services.lambdafunc
    awslimitchecker.services.rds
    awslimitchecker.services.redshift

docs/source/cli_usage.rst

@@ -461,8 +461,6 @@ threshold only, and another has crossed the critical threshold):
    VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
    VPC/Virtual private gateways                           (limit 5) WARNING: 4
 
-
-
 .. _cli_usage.threshold_overrides:
 
 Set Custom Thresholds
@@ -482,8 +480,6 @@ To set the warning threshold of 50% and a critical threshold of 75% when checkin
    S3/Buckets                                             (limit 100) CRITICAL: 946
    VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
 
-
-
 You can also set custom thresholds on a per-limit basis using the
 ``--threshold-override-json`` CLI option, which accepts the path to a JSON file
 (local or an s3:// URL) matching the format described in
@@ -530,17 +526,15 @@ Using a command like:
 .. code-block:: console
 
    (venv)$ awslimitchecker -W 97 --critical=98 --no-color --threshold-override-json=s3://bucketname/path/overrides.json
-   DynamoDB/Local Secondary Indexes                       (limit 5) CRITICAL: some_app_name_here=5
+   DynamoDB/Local Secondary Indexes                       (limit 5) CRITICAL: some_app_name (...)
    DynamoDB/Tables Per Region                             (limit 256) CRITICAL: 554
-   EC2/Rules per VPC security group                       (limit 50) CRITICAL: sg-aaaaaaaa=49, sg-bbbbb (...)
-   EC2/Security groups per VPC                            (limit 500) CRITICAL: vpc-cccccccc=726, vpc-c (...)
+   EC2/Rules per VPC security group                       (limit 50) CRITICAL: sg-cccccccc=49, sg-eeeee (...)
+   EC2/Security groups per VPC                            (limit 500) CRITICAL: vpc-dddddddd=726, vpc-c (...)
    (...)
    RDS/VPC Security Groups                                (limit 5) CRITICAL: 5
    S3/Buckets                                             (limit 100) CRITICAL: 946
    VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
 
-
-
 .. _cli_usage.metrics:
 
 Enable Metrics Provider

docs/source/cli_usage.rst.template

@@ -187,7 +187,18 @@ usage value, or both; this functionality is not currently present in the command
 To check all limits against their thresholds (in this example, one limit has crossed the warning
 threshold only, and another has crossed the critical threshold):
 
-{check_thresholds}
+.. code-block:: console
+
+   (venv)$ awslimitchecker --no-color
+   CloudFormation/Stacks                                  (limit 4000) WARNING: 3396
+   DynamoDB/Local Secondary Indexes                       (limit 5) CRITICAL: some_app_name (...)
+   DynamoDB/Tables Per Region                             (limit 256) CRITICAL: 554
+   EBS/Active snapshots                                   (limit 40000.0) WARNING: 33387
+   EC2/Rules per VPC security group                       (limit 50) CRITICAL: sg-aaaaaaaa=50, sg-bbbb (...)
+   (...)
+   VPC/Entries per route table                            (limit 50) WARNING: rtb-aaaaaaaa=43, rtb-bbbb (...)
+   VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
+   VPC/Virtual private gateways                           (limit 5) WARNING: 4
 
 .. _cli_usage.threshold_overrides:
 
@@ -196,7 +207,17 @@ Set Custom Thresholds
 
 To set the warning threshold of 50% and a critical threshold of 75% when checking limits:
 
-{check_thresholds_custom}
+.. code-block:: console
+
+   (venv)$ awslimitchecker -W 97 --critical=98 --no-color
+   DynamoDB/Local Secondary Indexes                       (limit 5) CRITICAL: some_app_name (...)
+   DynamoDB/Tables Per Region                             (limit 256) CRITICAL: 554
+   EC2/Rules per VPC security group                       (limit 50) CRITICAL: sg-cccccccc=49, sg-eeeee (...)
+   EC2/Security groups per VPC                            (limit 500) CRITICAL: vpc-dddddddd=726, vpc-c (...)
+   (...)
+   RDS/VPC Security Groups                                (limit 5) CRITICAL: 5
+   S3/Buckets                                             (limit 100) CRITICAL: 946
+   VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
 
 You can also set custom thresholds on a per-limit basis using the
 ``--threshold-override-json`` CLI option, which accepts the path to a JSON file
@@ -212,7 +233,14 @@ Using a command like:
 .. code-block:: console
 
    (venv)$ awslimitchecker -W 97 --critical=98 --no-color --threshold-override-json=s3://bucketname/path/overrides.json
-{check_thresholds_custom-output-only}
+   DynamoDB/Local Secondary Indexes                       (limit 5) CRITICAL: some_app_name (...)
+   DynamoDB/Tables Per Region                             (limit 256) CRITICAL: 554
+   EC2/Rules per VPC security group                       (limit 50) CRITICAL: sg-cccccccc=49, sg-eeeee (...)
+   EC2/Security groups per VPC                            (limit 500) CRITICAL: vpc-dddddddd=726, vpc-c (...)
+   (...)
+   RDS/VPC Security Groups                                (limit 5) CRITICAL: 5
+   S3/Buckets                                             (limit 100) CRITICAL: 946
+   VPC/NAT Gateways per AZ                                (limit 5) CRITICAL: us-east-1d=5, us-east-1c= (...)
 
 .. _cli_usage.metrics:
 

docs/source/iam_policy.rst

@@ -71,6 +71,11 @@ services that do not affect the results of this program.
             "ecs:DescribeServices",
             "ecs:ListClusters",
             "ecs:ListServices",
+            "eks:DescribeCluster",
+            "eks:DescribeFargateProfile",
+            "eks:ListClusters",
+            "eks:ListFargateProfiles",
+            "eks:ListNodegroups",
             "elasticache:DescribeCacheClusters",
             "elasticache:DescribeCacheParameterGroups",
             "elasticache:DescribeCacheSecurityGroups",
@@ -86,6 +91,7 @@ services that do not affect the results of this program.
             "elasticloadbalancing:DescribeTargetGroups",
             "firehose:ListDeliveryStreams",
             "iam:GetAccountSummary",
+            "kinesis:DescribeLimits",
             "lambda:GetAccountSettings",
             "rds:DescribeAccountAttributes",
             "rds:DescribeDBInstances",