qontract-reconcile 0.10.1rc803__py3-none-any.whl → 0.10.1rc805__py3-none-any.whl

{qontract_reconcile-0.10.1rc803.dist-info → qontract_reconcile-0.10.1rc805.dist-info}/METADATA

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

@@ -104,7 +104,7 @@ reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9
 reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWpBLAM,4470
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
 reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
-reconcile/slack_usergroups.py,sha256=6G-KjcqacqqhJDsl-KMC-t5M9oexUpSSUc1yGyt2zvY,27120
+reconcile/slack_usergroups.py,sha256=sp1QSPRUgTj3-hXpAWx1qOeR6okmVmlHcTUvUMTOLDI,27855
 reconcile/sql_query.py,sha256=FAQI9EIHsokZBbGwvGU4vnjg1fHemxpYQE20UtCB1qo,25941
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
@@ -371,7 +371,7 @@ reconcile/gql_definitions/terraform_repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=_rdq3efy5Q3QFpI-vcs3-wacsXo_1fu1kVix_E83h5Q,3599
 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=ElJTVH2cwNqJiLFl3Zi5zt9y7dN0yLmdtmwZC5X7ir0,42189
+reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=bY53hFt1Ki0oqjP03OX4nT80zdD29YwvnlKW3Df7zs8,42401
 reconcile/gql_definitions/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_tgw_attachments/aws_accounts.py,sha256=GjCuLHOgm3eHbkpK7Q2i7l6tori5Y62uFlz3M89BYtA,2602
 reconcile/gql_definitions/vault_instances/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -522,7 +522,7 @@ reconcile/test/test_saasherder.py,sha256=hSZk34aZFq-wspT-kJmFuHjh8ztSr7IzGc5QdRV
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=5NHQwNJO66at6HiyMZ5sVRTQDwxdvlOQo0KmkBWCw5Q,4853
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
-reconcile/test/test_slack_usergroups.py,sha256=wmS7xgl4U1jx4gu8qIDlljkhZxb_y8F6tR4UteyrlZE,24899
+reconcile/test/test_slack_usergroups.py,sha256=Yj7SetVzdVsl0mzPakVil3Fb_4R_3r9lC32gnw_CwiA,24899
 reconcile/test/test_sql_query.py,sha256=rC-lf1_isT9i2ZIV9W0hkUkLi2oBIjZMRMhk-6mV-34,11029
 reconcile/test/test_status_board.py,sha256=go3YSWo03OLIdK95SuiDJa1Nqk-eN_9QtS7dfmu9__8,7875
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
@@ -619,7 +619,7 @@ reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4
 reconcile/utils/expiration.py,sha256=BXwKE50sNIV-Lszke97fxitNkLxYszoOLW1LBgp_yqg,1246
 reconcile/utils/extended_early_exit.py,sha256=QSktrmfw37zSRMNk930tDbQsVeKxaPPPD43e79DGwZw,6754
 reconcile/utils/external_resource_spec.py,sha256=IRY8MCsyWKzt-Qj_hXiFKgkCvZu6VVyj6IYtqEb05BA,6618
-reconcile/utils/external_resources.py,sha256=a2CkJ3KLociYBnc_9F2VWfZGWMhzDl6fDNhwo2U-MWU,7501
+reconcile/utils/external_resources.py,sha256=ZnBjQlMpiuCX0Ivm77eIMB4Um_RuAsoMtc8IyuvIxI4,7590
 reconcile/utils/filtering.py,sha256=zZnHH0u0SaTDyzuFXZ_mREURGLvjEqQIQy4z-7QBVlc,419
 reconcile/utils/git.py,sha256=BdxXFgQ1XOZpS-4qb3qMsKTCFDG8MlE26rv1jAhvCkM,1560
 reconcile/utils/git_secrets.py,sha256=0wGNL5mvDtVPRuu3vEQgld1Am64gIDJHtmu1_ZKxMAI,1973
@@ -797,8 +797,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc803.dist-info/METADATA,sha256=NTfgWm43JS7pKaeQtl4uuf73kEQxGqfhtxg1alCle_E,2314
-qontract_reconcile-0.10.1rc803.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc803.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc803.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc803.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc805.dist-info/METADATA,sha256=hQqEKCmIWG-75Lp4rO5VuV1Utx4ciyWOVz3hcotymnM,2314
+qontract_reconcile-0.10.1rc805.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc805.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc805.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc805.dist-info/RECORD,,

reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py

@@ -105,6 +105,7 @@ query TerraformResourcesNamespaces {
                 data_classification {
                     loss_impact
                 }
+                managed_by_erv2
             }
             ... on NamespaceTerraformResourceS3_v1 {
                 region
@@ -173,6 +174,7 @@ query TerraformResourcesNamespaces {
                   prevent_destroy
                   ignore_changes
                 }
+                managed_by_erv2
             }
             ... on NamespaceTerraformResourceSQS_v1 {
                 region
@@ -562,6 +564,7 @@ class NamespaceTerraformResourceRDSV1(NamespaceTerraformResourceAWSV1):
     annotations: Optional[str] = Field(..., alias="annotations")
     event_notifications: Optional[list[AWSRDSEventNotificationV1]] = Field(..., alias="event_notifications")
     data_classification: Optional[AWSRDSDataClassificationV1] = Field(..., alias="data_classification")
+    managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
 
 
 class AWSS3EventNotificationV1(ConfiguredBaseModel):
@@ -645,6 +648,7 @@ class NamespaceTerraformResourceRoleV1(NamespaceTerraformResourceAWSV1):
     output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
     annotations: Optional[str] = Field(..., alias="annotations")
     lifecycle: Optional[NamespaceTerraformResourceLifecycleV1] = Field(..., alias="lifecycle")
+    managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
 
 
 class KeyValueV1(ConfiguredBaseModel):
@@ -1007,7 +1011,7 @@ class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):
 
 
 class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):
-    resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")
+    resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")
 
 
 class EnvironmentV1(ConfiguredBaseModel):

reconcile/slack_usergroups.py

@@ -109,9 +109,7 @@ class State(BaseModel):
     workspace: str = ""
     usergroup: str = ""
     description: str = ""
-    users: set[SlackObject] = set()
     user_names: set[str] = set()
-    channels: set[SlackObject] = set()
     channel_names: set[str] = set()
 
     def __bool__(self) -> bool:
@@ -208,10 +206,8 @@ def get_current_state(
             current_state.setdefault(workspace, {})[ug] = State(
                 workspace=workspace,
                 usergroup=ug,
-                users={SlackObject(pk=pk, name=name) for pk, name in users.items()},
-                channels={
-                    SlackObject(pk=pk, name=name) for pk, name in channels.items()
-                },
+                user_names={name for _, name in users.items()},
+                channel_names={name for _, name in channels.items()},
                 description=description,
             )
 
@@ -448,7 +444,7 @@ def get_desired_state(
                 workspace=p.workspace.name,
                 usergroup=usergroup,
                 user_names=user_names,
-                channel_names=sorted(p.channels or []),
+                channel_names=sorted(set(p.channels or [])),
                 description=p.description,
             )
     return desired_state
@@ -478,11 +474,11 @@ def get_desired_state_cluster_usergroups(
             for u in openshift_users_desired_state
             if u["cluster"] == cluster.name
         ]
-        cluster_usernames = set({
+        cluster_usernames = {
             get_slack_username(u)
             for u in users
             if include_user_to_cluster_usergroup(u, cluster, desired_cluster_users)
-        })
+        }
         cluster_user_group = compute_cluster_user_group(cluster.name)
         for workspace, spec in slack_map.items():
             if not spec.slack.channel:
@@ -504,7 +500,7 @@ def get_desired_state_cluster_usergroups(
                     workspace=workspace,
                     usergroup=cluster_user_group,
                     user_names=cluster_usernames,
-                    channel_names=set([spec.slack.channel]),
+                    channel_names={spec.slack.channel},
                     description=f"Users with access to the {cluster.name} cluster",
                 )
     return desired_state
@@ -545,26 +541,40 @@ def _update_usergroup_users_from_state(
 ) -> None:
     """Update the users in a Slack usergroup."""
     global error_occurred  # noqa: PLW0603
-    if current_ug_state.users == desired_ug_state.users:
+    if current_ug_state.user_names == desired_ug_state.user_names:
         logging.debug(
             f"No usergroup user changes detected for {desired_ug_state.usergroup}"
         )
         return
 
-    for user in desired_ug_state.users - current_ug_state.users:
+    slack_user_objects = [
+        SlackObject(pk=pk, name=name)
+        for pk, name in slack_client.get_users_by_names(
+            desired_ug_state.user_names
+        ).items()
+    ]
+
+    if len(slack_user_objects) != len(desired_ug_state.user_names):
+        logging.info(
+            f"Following usernames are incorrect for usergroup {desired_ug_state.usergroup} and could not be matched with slack users {desired_ug_state.user_names - set(s.name for s in slack_user_objects)}"
+        )
+        error_occurred = True
+        return
+
+    for user in desired_ug_state.user_names - current_ug_state.user_names:
         logging.info([
             "add_user_to_usergroup",
             desired_ug_state.workspace,
             desired_ug_state.usergroup,
-            user.name,
+            user,
         ])
 
-    for user in current_ug_state.users - desired_ug_state.users:
+    for user in current_ug_state.user_names - desired_ug_state.user_names:
         logging.info([
             "del_user_from_usergroup",
             desired_ug_state.workspace,
             desired_ug_state.usergroup,
-            user.name,
+            user,
         ])
 
     if not dry_run:
@@ -577,7 +587,7 @@ def _update_usergroup_users_from_state(
                 return
             slack_client.update_usergroup_users(
                 id=ugid,
-                users_list=sorted([user.pk for user in desired_ug_state.users]),
+                users_list=sorted([s.pk for s in slack_user_objects]),
             )
         except SlackApiError as error:
             # Prior to adding this, we weren't handling failed updates to user
@@ -597,7 +607,7 @@ def _update_usergroup_from_state(
     """Update a Slack usergroup."""
     global error_occurred  # noqa: PLW0603
     if (
-        current_ug_state.channels == desired_ug_state.channels
+        current_ug_state.channel_names == desired_ug_state.channel_names
         and current_ug_state.description == desired_ug_state.description
     ):
         logging.debug(
@@ -605,20 +615,39 @@ def _update_usergroup_from_state(
         )
         return
 
-    for channel in desired_ug_state.channels - current_ug_state.channels:
+    slack_channel_objects = [
+        SlackObject(pk=pk, name=name)
+        for pk, name in slack_client.get_channels_by_names(
+            desired_ug_state.channel_names or []
+        ).items()
+    ]
+
+    # This is a hack to filter out the missing channels
+    desired_channel_names = {s.name for s in slack_channel_objects}
+
+    # Commenting this out is not correct, we should be checking the length of slack_channel_objects.
+    # However there are a couple of missing channels and filtering these out complies with current behavior.
+    # if len(slack_channel_objects) != len(desired_ug_state.channel_names):
+    #     logging.info(
+    #         f"Following channel names are incorrect for usergroup {desired_ug_state.usergroup} and could not be matched with slack channels {desired_ug_state.channel_names - set([s.name for s in slack_channel_objects])}"
+    #     )
+    #     error_occurred = True
+    #     return
+
+    for channel in desired_channel_names - current_ug_state.channel_names:
         logging.info([
             "add_channel_to_usergroup",
             desired_ug_state.workspace,
             desired_ug_state.usergroup,
-            channel.name,
+            channel,
         ])
 
-    for channel in current_ug_state.channels - desired_ug_state.channels:
+    for channel in current_ug_state.channel_names - desired_channel_names:
         logging.info([
             "del_channel_from_usergroup",
             desired_ug_state.workspace,
             desired_ug_state.usergroup,
-            channel.name,
+            channel,
         ])
 
     if current_ug_state.description != desired_ug_state.description:
@@ -639,9 +668,7 @@ def _update_usergroup_from_state(
                 return
             slack_client.update_usergroup(
                 id=ugid,
-                channels_list=sorted([
-                    channel.pk for channel in desired_ug_state.channels
-                ]),
+                channels_list=sorted(s.pk for s in slack_channel_objects),
                 description=desired_ug_state.description,
             )
         except SlackApiError as error:
@@ -663,40 +690,24 @@ def act(
                 usergroup, State()
             )
 
-            slack_client = slack_map[workspace].slack
-
-            desired_ug_state.users = {
-                SlackObject(pk=pk, name=name)
-                for pk, name in slack_client.get_users_by_names(
-                    sorted(desired_ug_state.user_names)
-                ).items()
-            }
-
-            desired_ug_state.channels = {
-                SlackObject(pk=pk, name=name)
-                for pk, name in slack_client.get_channels_by_names(
-                    sorted(desired_ug_state.channel_names or [])
-                ).items()
-            }
-
             _create_usergroups(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_client,
+                slack_client=slack_map[workspace].slack,
                 dry_run=dry_run,
             )
 
             _update_usergroup_users_from_state(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_client,
+                slack_client=slack_map[workspace].slack,
                 dry_run=dry_run,
             )
 
             _update_usergroup_from_state(
                 current_ug_state,
                 desired_ug_state,
-                slack_client=slack_client,
+                slack_client=slack_map[workspace].slack,
                 dry_run=dry_run,
             )
 

reconcile/test/test_slack_usergroups.py

@@ -36,7 +36,6 @@ from reconcile.gql_definitions.slack_usergroups.users import (
 from reconcile.gql_definitions.slack_usergroups.users import ClusterV1 as AccessCluster
 from reconcile.slack_usergroups import (
     SlackMap,
-    SlackObject,
     SlackState,
     State,
     WorkspaceSpec,
@@ -61,9 +60,7 @@ def base_state():
                 workspace="slack-workspace",
                 usergroup="usergroup-1",
                 usergroup_id="USERGA",
-                users={SlackObject(name="username", pk="USERA")},
                 user_names={"username"},
-                channels={SlackObject(name="channelname", pk="CHANA")},
                 channel_names={"channelname"},
                 description="Some description",
             )
@@ -561,9 +558,7 @@ def test_act_dryrun_no_changes_made(
     current_state = base_state
     desired_state = copy.deepcopy(base_state)
 
-    desired_state["slack-workspace"]["usergroup-1"].users = {
-        SlackObject(name="foo", pk="bar")
-    }
+    desired_state["slack-workspace"]["usergroup-1"].user_names = {"foo"}
 
     act(current_state, desired_state, slack_map, dry_run=True)
 
@@ -604,6 +599,11 @@ def test_act_update_usergroup_users(
     current_state = base_state
     desired_state = copy.deepcopy(base_state)
 
+    desired_state["slack-workspace"]["usergroup-1"].user_names = {
+        "someotherusername",
+        "anotheruser",
+    }
+
     slack_client_mock.get_usergroup_id.return_value = "USERGA"
     slack_client_mock.get_users_by_names.return_value = {
         "USERB": "someotherusername",
@@ -614,6 +614,7 @@ def test_act_update_usergroup_users(
     act(current_state, desired_state, slack_map, dry_run=False)
 
     slack_client_mock.update_usergroup.assert_not_called()
+    slack_client_mock.update_usergroup_users.assert_called_once()
     assert slack_client_mock.update_usergroup_users.call_args_list == [
         call(id="USERGA", users_list=["USERB", "USERC"])
     ]

reconcile/utils/external_resources.py

@@ -36,6 +36,8 @@ def get_external_resource_specs(
     external_resources = namespace_info.get("externalResources") or []
     for e in external_resources:
         for r in e.get("resources", []):
+            if "managed_by_erv2" in r and r["managed_by_erv2"]:
+                continue
             spec = ExternalResourceSpec(
                 provision_provider=e["provider"],
                 provisioner=e["provisioner"],