qontract-reconcile 0.10.1rc1137__py3-none-any.whl → 0.10.1rc1139__py3-none-any.whl

{qontract_reconcile-0.10.1rc1137.dist-info → qontract_reconcile-0.10.1rc1139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1137
+Version: 0.10.1rc1139
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1137.dist-info → qontract_reconcile-0.10.1rc1139.dist-info}/RECORD

@@ -400,7 +400,7 @@ reconcile/gql_definitions/terraform_repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=nm4CH7Vog4aabdvCKmhVSUvoUb7dxSLx8nwAEJAVqG0,3706
 reconcile/gql_definitions/terraform_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_resources/database_access_manager.py,sha256=yv0_YC-LmhaKD_gyGG3le1w5BtypBjlsO894-Zgdg4U,4813
-reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=KnqoorTaTJhkdvGiUfnA7qqzgDDf7X9wre7kbKCUARk,42597
+reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=7FErGZ8VZDwT6m5uFhdLHydsgzH5rzsuQE3c-RWfklo,42687
 reconcile/gql_definitions/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_tgw_attachments/aws_accounts.py,sha256=FPyPEikpkZ_kvHfXqnkzSUDNmxMMTiUwhI-eLQtuIHM,2616
 reconcile/gql_definitions/unleash_feature_toggles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -655,7 +655,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=1EC9l2cxMW2IvnhsXaIcq6iohZ4rRgqyHJsXPs9Vtes,67398
+reconcile/utils/aws_api.py,sha256=Mp5-euZUfKfnVzgMZd3LoWbegm1OrNjzpP1A-n2EiF0,67640
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
@@ -727,7 +727,7 @@ reconcile/utils/state.py,sha256=W0_awkLAPX18hNOF_60o73tkPxDUylqbzYNHfl_sDsk,1638
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=LjX2U2E0Dglt2S_KA5jWQ_dVC8sPn4FEAh0xW_d6JTk,35953
-reconcile/utils/terrascript_aws_client.py,sha256=YqMsqSJl5_P8kXPzcaWLAMxdIxhq1supwL94Xd5qPB4,281298
+reconcile/utils/terrascript_aws_client.py,sha256=0xHh8NbMbISv9zIxwcXxuYVer8dTM_2t7f6Jf4TuU2I,281362
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=pi0PuyopvCq1gW0cldvy1-Ff6bqLUlCKC2MW0sifvSE,15043
@@ -838,7 +838,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=PV2tqOqpFqAQh1_ZGNNf7up4OTBSPZmpGjN7eHxlQ0s,136187
+tools/qontract_cli.py,sha256=3k3cPk2ohxpOipQiV9gcsooYR0DZmnwr6xwiRZ9t2dk,139124
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -871,8 +871,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1137.dist-info/METADATA,sha256=7ylXvyDsV2c3I5swlsdqaN4u2wGhqQWkrv6uiGaV67w,2213
-qontract_reconcile-0.10.1rc1137.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1137.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1137.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1137.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1139.dist-info/METADATA,sha256=bXr1ZVaT9iTVuCUis_xtQiZcLxHtYvCRixacclFAXJs,2213
+qontract_reconcile-0.10.1rc1139.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1139.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1139.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1139.dist-info/RECORD,,

reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py

@@ -308,6 +308,7 @@ query TerraformResourcesNamespaces {
                 enable_http2
                 ip_address_type
                 access_logs
+                ssl_policy
                 targets {
                     name
                     default
@@ -876,6 +877,7 @@ class NamespaceTerraformResourceALBV1(NamespaceTerraformResourceAWSV1):
     enable_http2: Optional[bool] = Field(..., alias="enable_http2")
     ip_address_type: Optional[str] = Field(..., alias="ip_address_type")
     access_logs: Optional[bool] = Field(..., alias="access_logs")
+    ssl_policy: Optional[str] = Field(..., alias="ssl_policy")
     targets: list[NamespaceTerraformResourceALBTargetsV1] = Field(..., alias="targets")
     rules: list[NamespaceTerraformResourceALBRulesV1] = Field(..., alias="rules")
     output_resource_name: Optional[str] = Field(..., alias="output_resource_name")

reconcile/utils/aws_api.py

@@ -1598,6 +1598,14 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         rds = self._account_rds_client(account_name, **optional_kwargs)
         return rds.describe_db_instances(DBInstanceIdentifier=db_instance_name)
 
+    def describe_rds_recommendations(
+        self,
+        account_name: str,
+        region_name: str | None = None,
+    ):
+        rds = self._account_rds_client(account_name, region_name)
+        return rds.describe_db_recommendations()
+
     def get_db_valid_upgrade_target(
         self,
         account_name: str,

reconcile/utils/terrascript_aws_client.py

@@ -5313,12 +5313,13 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         # forward
         if not default_target:
             raise KeyError("expected a single default target")
+        ssl_policy = resource.get("ssl_policy") or "ELBSecurityPolicy-TLS13-1-0-2021-06"
         values = {
             "provider": provider,
             "load_balancer_arn": f"${{{lb_tf_resource.arn}}}",
             "port": 443,
             "protocol": "HTTPS",
-            "ssl_policy": "ELBSecurityPolicy-TLS-1-2-2017-01",
+            "ssl_policy": ssl_policy,
             "certificate_arn": resource["certificate_arn"],
             "default_action": {
                 "type": "forward",

tools/qontract_cli.py

@@ -1749,6 +1749,85 @@ You can view the source of this Markdown to extract the JSON data.
         print_output(ctx.obj["options"], results, columns)
 
 
+@get.command
+@click.pass_context
+def rds_recommendations(ctx):
+    IGNORED_STATUSES = ("resolved",)
+    IGNORED_SEVERITIES = ("informational",)
+
+    settings = queries.get_app_interface_settings()
+
+    # Only check AWS accounts for which we have RDS resources defined
+    targetted_accounts = []
+    namespaces = queries.get_namespaces()
+    for namespace_info in namespaces:
+        if not managed_external_resources(namespace_info):
+            continue
+        for spec in get_external_resource_specs(namespace_info):
+            if spec.provider == "rds":
+                targetted_accounts.append(spec.provisioner_name)
+
+    accounts = [
+        a for a in queries.get_aws_accounts() if a["name"] in targetted_accounts
+    ]
+    accounts.sort(key=lambda a: a["name"])
+
+    columns = [
+        # 'RecommendationId',
+        # 'TypeId',
+        # 'ResourceArn',
+        "ResourceName",  # Non-AWS field
+        "Severity",
+        "Category",
+        "Impact",
+        "Status",
+        "Detection",
+        "Recommendation",
+        "Description",
+        # 'Source',
+        # 'TypeDetection',
+        # 'TypeRecommendation',
+        # 'AdditionalInfo'
+    ]
+
+    ctx.obj["options"]["sort"] = False
+
+    print("[TOC]")
+    for account in accounts:
+        account_name = account.get("name")
+        account_deployment_regions = account.get("supportedDeploymentRegions")
+        for region in account_deployment_regions or []:
+            with AWSApi(1, [account], settings=settings, init_users=False) as aws:
+                try:
+                    data = aws.describe_rds_recommendations(account_name, region)
+                    recommendations = data.get("DBRecommendations", [])
+                except Exception as e:
+                    logging.error(f"Error describing RDS recommendations: {e}")
+                    continue
+
+                # Add field ResourceName infered from ResourceArn
+                recommendations = [
+                    {**rec, "ResourceName": rec["ResourceArn"].split(":")[-1]}
+                    for rec in recommendations
+                    if rec.get("Status") not in IGNORED_STATUSES
+                    and rec.get("Severity") not in IGNORED_SEVERITIES
+                ]
+                # The Description field has \n that are causing issues with the markdown table
+                recommendations = [
+                    {**rec, "Description": rec["Description"].replace("\n", " ")}
+                    for rec in recommendations
+                ]
+                # If we have no recommendations to show, skip
+                if not recommendations:
+                    continue
+                # Sort by ResourceName
+                recommendations.sort(key=lambda r: r["ResourceName"])
+
+                print(f"# {account_name} - {region}")
+                print("Note: Severity informational is not shown.")
+                print_output(ctx.obj["options"], recommendations, columns)
+
+
 @get.command()
 @click.pass_context
 def products(ctx):