qontract-reconcile 0.10.1rc910__py3-none-any.whl → 0.10.1rc912__py3-none-any.whl

{qontract_reconcile-0.10.1rc910.dist-info → qontract_reconcile-0.10.1rc912.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc910
+Version: 0.10.1rc912
 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.1rc910.dist-info → qontract_reconcile-0.10.1rc912.dist-info}/RECORD

@@ -113,7 +113,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=NfgUqXL218D9pW6sprtUAJQlMzFHa2FXKp_
 reconcile/terraform_cloudflare_resources.py,sha256=41Mj1WkuS75slCDpmhG2GGf1nh3BwfxcdNC73-PNadc,15000
 reconcile/terraform_cloudflare_users.py,sha256=AzIhQwnJtsUh7GlZpvJE0um-_7Q6zYRxzUVJYoSU3dY,13943
 reconcile/terraform_repo.py,sha256=D6JFKLLJbsMHcIG3--oUNeuQteXqT6E5tJ18qzb9YXM,16218
-reconcile/terraform_resources.py,sha256=P2_S0TqkRp4VYf9yoJxt52YFgHJOMqfUYe1GwLzBc7M,19288
+reconcile/terraform_resources.py,sha256=HmTrDTpPbWOvvyPdEM7bXbLPsTS8Tcg1mPu8nZTvAlE,19288
 reconcile/terraform_tgw_attachments.py,sha256=dhtqrckfB3CN90PnrKAepPFRzFB0Ecoh1vk3IkpZ2uE,18657
 reconcile/terraform_users.py,sha256=HqSm3ev3b8dZ9J6F_phDZB-FQsnlsdeKp9RPoY1cU94,10188
 reconcile/terraform_vpc_peerings.py,sha256=WhGvDHwllM36yTJPE5EzQ1Z0Oc-tT9ksXbBn5cpFBBg,27676
@@ -158,7 +158,7 @@ reconcile/aws_version_sync/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa
 reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLdqxycWNvX1eNbwMjWSVBb7q0p-8t5Db0m7b4Q,4842
 reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256=3bRpw7DluiYw3daRg0yAyCSGYf39Ru0d8lUjoepDSpU,5525
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/change_owners/approver.py,sha256=M-qoi8UYkjzdXXF6K2_izuzVE6s0k3sigg6mN0000SY,2202
+reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
 reconcile/change_owners/bundle.py,sha256=ZIlXRo6Z2raeWSCUqYsexBdol-q-r9kWJs5O_YPaEYk,5273
 reconcile/change_owners/change_owners.py,sha256=0HRJhDm0oW3uYJFgzynqA1gA0lbhalhSkmWOiQmr-NM,17062
 reconcile/change_owners/change_types.py,sha256=PMDEWOAbRKjES3WDPGe_8bcrZgK3efLdVF22WvkUL3A,31938
@@ -166,7 +166,7 @@ reconcile/change_owners/changes.py,sha256=CH38-hyOfbH6xFYWidw_LAniyPisKq9nGRQhUa
 reconcile/change_owners/decision.py,sha256=iUJcIc_N_RqXIAY8D10RZqPMC2OinsHTMcqI6f6uylE,7606
 reconcile/change_owners/diff.py,sha256=0vyu29xCL24ZhUa7hqBni0NaxoCYRXLwvA-h8V23YQ4,9009
 reconcile/change_owners/implicit_ownership.py,sha256=6BehZvx4IjrphmOt_LLLk9_02Fl5BY5jd00Wuz_PBZk,4234
-reconcile/change_owners/self_service_roles.py,sha256=bd_T3gUkDtrDjIDv2lq1Rsb0b1uJNCSSoL4wKlz6pwQ,9631
+reconcile/change_owners/self_service_roles.py,sha256=wxCxtROuQ9_0KjLke82ENRzNfVLh93gnXlPRjXahgfA,9683
 reconcile/change_owners/tester.py,sha256=yY15ABnWx_3g9QeeR38-cQAaql0aq7JIxBv_7KtC91U,8955
 reconcile/cluster_auth_rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/cluster_auth_rhidp/integration.py,sha256=KIAiP_XFjsOA2OE8oFJa8lD0T1a7EwOmhct2xbj7tr8,9560
@@ -227,7 +227,7 @@ reconcile/gql_definitions/aws_version_sync/namespaces.py,sha256=eBLyXlSjWdmEE-jY
 reconcile/gql_definitions/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/change_types.py,sha256=9S2YRNnSAvutjzuubZIQQe35yd8V2rGKvWSUI6yl11Q,5017
-reconcile/gql_definitions/change_owners/queries/self_service_roles.py,sha256=gU5qQ_zncXqM41WW_c2NYEZBuXlI9Xwm08D9HF6dP7g,4627
+reconcile/gql_definitions/change_owners/queries/self_service_roles.py,sha256=-7f7JO7_iYTQXAgPVwTDpgGi8NG8YR8cGv-wcC-KPVU,4699
 reconcile/gql_definitions/cluster_auth_rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cluster_auth_rhidp/clusters.py,sha256=Pp9P3Q30Be3szcVqOEOtPfYUNiGTq1xc5Juz-ApMMw0,3283
 reconcile/gql_definitions/cna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -357,7 +357,7 @@ reconcile/gql_definitions/skupper_network/site_controller_template.py,sha256=MFJ
 reconcile/gql_definitions/skupper_network/skupper_networks.py,sha256=Gfk1YshRj8WSaXgoImBbeXOZz0KXUTKhtf1jiWYEHxY,6037
 reconcile/gql_definitions/slack_usergroups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/slack_usergroups/clusters.py,sha256=HUTPLna1jxCSyDbxG-LNj9QQUl6smiXOsuCuFTItLzk,2119
-reconcile/gql_definitions/slack_usergroups/permissions.py,sha256=h-BMSf8HR_XeTAlXJgJwgUxmfZmFYOFeP3YKjH4fSwQ,5459
+reconcile/gql_definitions/slack_usergroups/permissions.py,sha256=BMZDBwaTyyk5t57Z2MhPzVvCgl5GMgGogK43ud8CO1Y,5449
 reconcile/gql_definitions/slack_usergroups/users.py,sha256=pJtsW8DNUgjSk_XpsuDxq5Nwzrb2QgtWVvCjnGBshb0,2873
 reconcile/gql_definitions/slo_documents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/slo_documents/slo_documents.py,sha256=pOrm9NXAonlo6Lxq6NkD3mHkZ53ZeBnZOZMkDvOEwds,3746
@@ -705,7 +705,7 @@ reconcile/utils/sqs_gateway.py,sha256=RiIfkBuGC15Q2178caG1_5hg53gY6QdRL1tWbK3FOM
 reconcile/utils/state.py,sha256=sJbfxvSTnHlHfgQRc_vRz-U_9NnVFGq-W8DX3ZHkfeY,16352
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=zbx5Ng2Xm7P93qqvFCbR-2FFYUTlmZbLGYNWvpkDtzE,32400
+reconcile/utils/terraform_client.py,sha256=hyMtNVBuDHbqQNSsdG5kTIvJRyOt23tFuWAspPf_Lqo,32161
 reconcile/utils/terrascript_aws_client.py,sha256=kU--Qk42v7OXbOtBEBhgRPRdSiFcfXOvMS6stHs0r_o,276712
 reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8uM1ccjWaiXxiV8,4895
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -844,8 +844,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.1rc910.dist-info/METADATA,sha256=boTuxu6Nk52lbr0BIuxN2q3SC5o3ffs4x7CyScm5GkI,2273
-qontract_reconcile-0.10.1rc910.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc910.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc910.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc910.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc912.dist-info/METADATA,sha256=qR2rsUnR1rVDkqgV_iVsHwnqlQxMRMdffVqsdgvoQAQ,2273
+qontract_reconcile-0.10.1rc912.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc912.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc912.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc912.dist-info/RECORD,,

reconcile/change_owners/approver.py

@@ -67,9 +67,10 @@ class ApproverReachability(Protocol):
 class SlackGroupApproverReachability:
     slack_group: str
     workspace: str
+    channel: str
 
     def render_for_mr_report(self) -> str:
-        return f"Slack group {self.slack_group}/{self.workspace}"
+        return f"Slack group @{self.slack_group} in channel #{self.channel} (workspace {self.workspace})"
 
 
 @dataclass

reconcile/change_owners/self_service_roles.py

@@ -238,6 +238,7 @@ def approver_reachability_from_role(role: RoleV1) -> list[ApproverReachability]:
                 SlackGroupApproverReachability(
                     slack_group=permission.handle,
                     workspace=permission.workspace.name,
+                    channel=permission.channels[0],
                 )
             )
         elif isinstance(permission, PermissionGitlabGroupMembershipV1):

reconcile/gql_definitions/change_owners/queries/self_service_roles.py

@@ -78,6 +78,7 @@ query SelfServiceRolesQuery($name: String) {
         workspace {
           name
         }
+        channels
       }
       ... on PermissionGitlabGroupMembership_v1 {
         group
@@ -135,6 +136,7 @@ class SlackWorkspaceV1(ConfiguredBaseModel):
 class PermissionSlackUsergroupV1(PermissionV1):
     handle: str = Field(..., alias="handle")
     workspace: SlackWorkspaceV1 = Field(..., alias="workspace")
+    channels: list[str] = Field(..., alias="channels")
 
 
 class PermissionGitlabGroupMembershipV1(PermissionV1):

reconcile/gql_definitions/slack_usergroups/permissions.py

@@ -161,7 +161,7 @@ class SlackWorkspaceV1(ConfiguredBaseModel):
 
 class PermissionSlackUsergroupV1(PermissionV1):
     name: str = Field(..., alias="name")
-    channels: Optional[list[str]] = Field(..., alias="channels")
+    channels: list[str] = Field(..., alias="channels")
     description: str = Field(..., alias="description")
     handle: str = Field(..., alias="handle")
     owners_from_repos: Optional[list[str]] = Field(..., alias="ownersFromRepos")

reconcile/terraform_resources.py

@@ -66,7 +66,7 @@ from reconcile.utils.vault import (
 )
 
 QONTRACT_INTEGRATION = "terraform_resources"
-QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 3)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 4)
 QONTRACT_TF_PREFIX = "qrtf"
 
 

reconcile/utils/terraform_client.py

@@ -757,7 +757,6 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         if after_version == before_version:
             return
 
-        allow_major_version_upgrade = after.get("allow_major_version_upgrade", False)
         region_name = get_region_from_availability_zone(before["availability_zone"])
         if self._aws_api is not None:
             valid_upgrade_target = self._aws_api.get_db_valid_upgrade_target(
@@ -765,13 +764,10 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             )
             if not valid_upgrade_target:
                 # valid_upgrade_target can be empty when current version is no longer supported by AWS.
-                # In this case, we can't validate it, so treat it as major version upgrade for safety.
-                # Skip validation if allow_major_version_upgrade is enabled.
-                if not allow_major_version_upgrade:
-                    raise ValueError(
-                        "allow_major_version_upgrade is not enabled for upgrading RDS instance: "
-                        f"{resource_name} to a new version when there is no valid upgrade target available."
-                    )
+                # In this case, we can't validate it, so skip.
+                logging.warning(
+                    f"No valid upgrade target available, skip validation for {resource_name}."
+                )
                 return
             target = next(
                 (
@@ -786,6 +782,10 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                     f"Cannot upgrade RDS instance: {resource_name} "
                     f"from {before_version} to {after_version}"
                 )
+            allow_major_version_upgrade = after.get(
+                "allow_major_version_upgrade",
+                False,
+            )
             if target["IsMajorVersionUpgrade"] and not allow_major_version_upgrade:
                 raise ValueError(
                     "allow_major_version_upgrade is not enabled for upgrading RDS instance: "