qontract-reconcile 0.10.2.dev255__py3-none-any.whl → 0.10.2.dev256__py3-none-any.whl

{qontract_reconcile-0.10.2.dev255.dist-info → qontract_reconcile-0.10.2.dev256.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev255
+Version: 0.10.2.dev256
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -392,7 +392,7 @@ these tools for static analysis and type checking:
 The [Makefile](Makefile) contains several targets to help with testing, linting,
 formatting, and type checking:
 
-- `make all-test`: Run all available tests.
+- `make all-tests`: Run all available tests.
 - `make linter-test`: Run the linter and formatter tests.
 - `make types-test`: Run the type checker tests.
 - `make qenerate-test`: Run the query classes generation tests.
@@ -422,7 +422,7 @@ Start the [qontract-server](https://github.com/app-sre/qontract-server) in a dif
 Run this in the root dir of `qontract-server` repo:
 
 ```shell
-make dev
+make build-dev
 ```
 
 ### Trigger integration

{qontract_reconcile-0.10.2.dev255.dist-info → qontract_reconcile-0.10.2.dev256.dist-info}/RECORD

@@ -88,7 +88,7 @@ reconcile/quay_mirror.py,sha256=PBooiA0ShZpWYfO6oeKFqYYT6Syi7Q8JJD9kj0wRRLg,1403
 reconcile/quay_mirror_org.py,sha256=I-tEqRHLL6uFqbSi7qCfPuDNoae7EAI2U68NbDOhmv8,10809
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=4ljTNPmRwzJQz14RXHMH-GLW3uOTdoXMwvgJmnSJP7I,49924
+reconcile/queries.py,sha256=PRlDXp-ViYjky3k4-Cvf6FptraOpzVpsZUluUEJW7II,49886
 reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -99,7 +99,7 @@ reconcile/sendgrid_teammates.py,sha256=oO8QbLb4s1o8A6CGiCagN9CmS05BSS_WLztuY0Ym9
 reconcile/service_dependencies.py,sha256=G2qCuYFc8wQLpRxkdhmibxSAl3nUM3hcan4x50W_mCA,4335
 reconcile/signalfx_endpoint_monitoring.py,sha256=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
 reconcile/slack_base.py,sha256=I-msunWxfgu5bSwXYulGbtLjxUB_tRmTCAUCU-3nabI,3484
-reconcile/slack_usergroups.py,sha256=xFkVe67RXSUj8JvpfSFEiRdQzB0TnJJEHW_b5PEwLng,30213
+reconcile/slack_usergroups.py,sha256=HYuzaT4P7mX1EGG9w6rocx2sgTVRbAkIgcBsxNRY2XA,30190
 reconcile/sql_query.py,sha256=auZCWe6dytsDp83Imfo4zqkpMCLRXU007IUlPeUE3j4,26376
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=3AiFdG-W4sKdU_pq9sKANtpgSoOGi8JwGMEHu3KetDQ,15298
@@ -285,7 +285,7 @@ reconcile/gql_definitions/common/saasherder_settings.py,sha256=nqQLcMwYxLseqq0BE
 reconcile/gql_definitions/common/slack_workspaces.py,sha256=2o0kgi4QiaRuNmZJnc_By4F6NsKIdRaXkrufRQw7Nok,1753
 reconcile/gql_definitions/common/smtp_client_settings.py,sha256=JU6t6D-Qj-z1gLlgUiHKe0W7AxWQdty9jlv-ig_43tM,2248
 reconcile/gql_definitions/common/state_aws_account.py,sha256=LAdpCG2-ykVpWBPO0Zu1WvG-hwKXyDC0fJQxJRpbqCk,2198
-reconcile/gql_definitions/common/users.py,sha256=ahY3d185LbTekCGYBLJwZJljn54RJI_P5CVefdqyoZA,1705
+reconcile/gql_definitions/common/users.py,sha256=q5Q1zTJ2SAfXTwU_j4rMT9kDr5_u0zGr7JDBN8X3vfU,1688
 reconcile/gql_definitions/common/users_with_paths.py,sha256=kOYzIXKG11JI0afgRMA5WLlEwJlvElAKytE8RAeuSco,2726
 reconcile/gql_definitions/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cost_report/app_names.py,sha256=fzqYXyiTSll359J1F1o7qapco0MSxgs3sr_Ssb2Kbns,1786
@@ -340,7 +340,7 @@ reconcile/gql_definitions/fragments/saas_target_namespace.py,sha256=6f6WaerElaRi
 reconcile/gql_definitions/fragments/serviceaccount_token.py,sha256=2pG4rxAjvT-YsFBnm4zl301i7DCYznp99HOEGA-216I,1117
 reconcile/gql_definitions/fragments/terraform_state.py,sha256=S5QuTR9YlvUObiU7hevS9ybxZEssWoRGqCR9YtGwePs,1024
 reconcile/gql_definitions/fragments/upgrade_policy.py,sha256=cVza8zfra1E3yBsHiS-hKbys17fvv572GFnKshJjluE,1246
-reconcile/gql_definitions/fragments/user.py,sha256=TZyFEs1fBg5PkvWdyCxFDZ_3aRhcQzusfhObXFiOU_0,1025
+reconcile/gql_definitions/fragments/user.py,sha256=GfR82KoUSiOhXrSqKhgCtc_rBHOSL2kCSW5BVynd668,954
 reconcile/gql_definitions/fragments/vault_secret.py,sha256=8xoQJNx1jKw_1yradq1iLEYWzuOHra1bEHHU7WHKxqo,833
 reconcile/gql_definitions/gcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/gcp/gcp_docker_repos.py,sha256=HvNaJxQYNPBTDmk26cOUY5_C5oBfau4bdfuI-L1Vcps,3338
@@ -370,7 +370,7 @@ reconcile/gql_definitions/ldap_groups/settings.py,sha256=KR6eKqXQWVYZAUEdatL1RCA
 reconcile/gql_definitions/maintenance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/maintenance/maintenances.py,sha256=ObAoOHUrTxL1l8CUhdOACc1s49Pt5j1fsErXE49fs1g,3042
 reconcile/gql_definitions/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/membershipsources/roles.py,sha256=d3nv3GLsj_eKgwB1glsiK6smpC4i16WO3dU5rIdRg94,3678
+reconcile/gql_definitions/membershipsources/roles.py,sha256=xcl1kHy7i1RzXlpPtvdbfZwGH5dr4xUYfpFR9s62Bmg,3586
 reconcile/gql_definitions/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/ocm_labels/clusters.py,sha256=K0DaTnOEdCZAziDbmq3Ktrxzzmzy6sdb3-9kIDk6yao,2932
 reconcile/gql_definitions/ocm_labels/organizations.py,sha256=ylNna62pG3XidrLQtMwu0LIOsKh6qyC2QImCbur2tV4,2252
@@ -380,7 +380,7 @@ reconcile/gql_definitions/openshift_cluster_bots/__init__.py,sha256=47DEQpj8HBSa
 reconcile/gql_definitions/openshift_cluster_bots/clusters.py,sha256=QshhCQeFRu_o0DLpD-4ltT5X_xZHjsCLc5jB3an3UXs,3688
 reconcile/gql_definitions/openshift_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_groups/managed_groups.py,sha256=mBWZX9xxeW3eB1ylnAI5x_7UBacRqJf_H6um-fB_nKc,2013
-reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=rsHMgDWwnh0RRJpS_-TxD22KQPC6_7rtRfauTOtxH5I,2627
+reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=9gS7UtTuI2XxxE9d-NEiJ0CSlmqYcPiXfaxw3q-LIQs,2610
 reconcile/gql_definitions/openshift_serviceaccount_tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_serviceaccount_tokens/tokens.py,sha256=FeraeQThHl2UbhTuCPDwm3ltczF_jfZn5E3Squ8-znw,3313
 reconcile/gql_definitions/quay_membership/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -400,8 +400,8 @@ 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=f2TTFWOfneVZJEhDBG6y8c68tKZaVoAO8Q1T9J0_AMo,5473
-reconcile/gql_definitions/slack_usergroups/users.py,sha256=-_iOFxctoVpX2wJt1Drrk8_Gb_FhZ5htdrxkBvDUtOA,2897
+reconcile/gql_definitions/slack_usergroups/permissions.py,sha256=6XIZnWxu9j5cANunFszmkjb5uVOEGTkudgcmuXeagkA,5456
+reconcile/gql_definitions/slack_usergroups/users.py,sha256=0KFLYHYXL_bGIKf5LAJSYxUnMQtwggZKVn-mh59Vk10,2880
 reconcile/gql_definitions/slo_documents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/slo_documents/slo_documents.py,sha256=pOrm9NXAonlo6Lxq6NkD3mHkZ53ZeBnZOZMkDvOEwds,3746
 reconcile/gql_definitions/status_board/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -650,7 +650,7 @@ reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=MaP56KZaAE35EyYbgAitdm6fUSxdzWeGFSOym9qiZkw,10206
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=CNyU9mkSbt7FRANEhOOZpWJl7L-YliHhaxr898gmX8c,573
-reconcile/utils/slack_api.py,sha256=IcnXmQrKXQwYEhKfXTBmOeuYKxpSG2Wvc1Fq-Nf1Xgg,17551
+reconcile/utils/slack_api.py,sha256=IrC4fSqTbXCicfvcZhty4rH-g8HZ9w7RPKSE09XfdIo,17858
 reconcile/utils/slo_document_manager.py,sha256=CPgM2oH4AVzBqenakWo59R5yfwB62tnxSnSOHgir7l8,9500
 reconcile/utils/smtp_client.py,sha256=0xefB4I9E5eBB-FlxFJYjvz3Kvuqi_K3Ma_Wk0NAQKM,2779
 reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41Fg,2265
@@ -699,7 +699,7 @@ reconcile/utils/jobcontroller/controller.py,sha256=Vh08lZuCSIIceWGSDhBB00iFwTI9e
 reconcile/utils/jobcontroller/models.py,sha256=x9YIvWfYOOvXNKToFVx1H7qDrZb0Sa1KI_4Y0gl7rMM,6336
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=MqDFvK3aXhmmMuMiIygC-onFVrrIopKHriaYJQ5jnuY,1988
-reconcile/utils/membershipsources/models.py,sha256=r733cJUTne1ZKBBB8iMyxZxlk6ut2OmJUK68ui8OUq0,1929
+reconcile/utils/membershipsources/models.py,sha256=yuEbG4HJ3NOEpSS9EH7OAx1U-uiRW-QmNMAZJe1Rb-U,1898
 reconcile/utils/membershipsources/resolver.py,sha256=meERrCZqeVJZR2lHdZEznaZDsCsUb194UEMOjbE4aYA,3168
 reconcile/utils/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/merge_request_manager/merge_request_manager.py,sha256=3EP6Yw_zB7nY0OkU8D_32nDqta1TITgtRI0cSmOlNQg,3332
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev255.dist-info/METADATA,sha256=o_zpsOZUysndjUn1lN3Sv7LKSNdPT0CVKbWcdLPy6gY,23820
-qontract_reconcile-0.10.2.dev255.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev255.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev255.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev256.dist-info/METADATA,sha256=DE1u8utlQNOXxQ_1eaqSb6HXHYd3jI2s1RlS-fIkQHA,23827
+qontract_reconcile-0.10.2.dev256.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev256.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev256.dist-info/RECORD,,

reconcile/gql_definitions/common/users.py

@@ -25,7 +25,6 @@ fragment User on User_v1 {
   name
   org_username
   github_username
-  slack_username
   pagerduty_username
   tag_on_merge_requests
 }

reconcile/gql_definitions/fragments/user.py

@@ -28,6 +28,5 @@ class User(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     org_username: str = Field(..., alias="org_username")
     github_username: str = Field(..., alias="github_username")
-    slack_username: Optional[str] = Field(..., alias="slack_username")
     pagerduty_username: Optional[str] = Field(..., alias="pagerduty_username")
     tag_on_merge_requests: Optional[bool] = Field(..., alias="tag_on_merge_requests")

reconcile/gql_definitions/membershipsources/roles.py

@@ -29,7 +29,6 @@ query MembershipSourceRolesQuery($filter: JSON) {
       org_username
       github_username
       quay_username
-      slack_username
       pagerduty_username
       aws_username
       cloudflare_user
@@ -62,7 +61,6 @@ class UserV1(ConfiguredBaseModel):
     org_username: str = Field(..., alias="org_username")
     github_username: str = Field(..., alias="github_username")
     quay_username: Optional[str] = Field(..., alias="quay_username")
-    slack_username: Optional[str] = Field(..., alias="slack_username")
     pagerduty_username: Optional[str] = Field(..., alias="pagerduty_username")
     aws_username: Optional[str] = Field(..., alias="aws_username")
     cloudflare_user: Optional[str] = Field(..., alias="cloudflare_user")

reconcile/gql_definitions/openshift_groups/managed_roles.py

@@ -25,7 +25,6 @@ fragment User on User_v1 {
   name
   org_username
   github_username
-  slack_username
   pagerduty_username
   tag_on_merge_requests
 }

reconcile/gql_definitions/slack_usergroups/permissions.py

@@ -26,7 +26,6 @@ fragment User on User_v1 {
   name
   org_username
   github_username
-  slack_username
   pagerduty_username
   tag_on_merge_requests
 }

reconcile/gql_definitions/slack_usergroups/users.py

@@ -25,7 +25,6 @@ fragment User on User_v1 {
   name
   org_username
   github_username
-  slack_username
   pagerduty_username
   tag_on_merge_requests
 }

reconcile/queries.py

@@ -1775,7 +1775,6 @@ USERS_QUERY = """
     name
     org_username
     github_username
-    slack_username
     pagerduty_username
     public_gpg_key
     {% if refs %}
@@ -1806,7 +1805,6 @@ ROLES_QUERY = """
     name
     org_username
     github_username
-    slack_username
     tag_on_cluster_updates
     labels
     roles {

reconcile/slack_usergroups.py

@@ -219,7 +219,7 @@ def get_current_state(
 
 def get_slack_username(user: User) -> str:
     """Return slack username"""
-    return user.slack_username or user.org_username
+    return user.org_username
 
 
 def get_pagerduty_name(user: User) -> str:

reconcile/utils/membershipsources/models.py

@@ -55,7 +55,6 @@ class RoleUser(BaseModel):
     org_username: str
     github_username: str | None
     quay_username: str | None
-    slack_username: str | None
     pagerduty_username: str | None
     aws_username: str | None
     cloudflare_user: str | None

reconcile/utils/slack_api.py

@@ -415,11 +415,19 @@ class SlackApi:
             k: v["name"] for k, v in self._get("channels").items() if k in channels_ids
         }
 
+    @staticmethod
+    def extract_name_from_user(user: dict[str, Any]) -> str | None:
+        if email := user["profile"].get("email"):
+            return email.split("@")[0]
+        return None
+
     def get_active_users_by_names(self, user_names: Iterable[str]) -> dict[str, str]:
         return {
-            k: v["name"]
+            k: name
             for k, v in self._get("users").items()
-            if v["name"] in user_names and not v["deleted"]
+            if not v["deleted"]
+            and (name := self.extract_name_from_user(v))
+            and name in user_names
         }
 
     def get_users_by_ids(self, users_ids: Iterable[str]) -> dict[str, str]:
@@ -428,9 +436,10 @@ class SlackApi:
             self._translate_user_id(user_id) for user_id in users_ids
         )
         return {
-            user_id: user["name"]
+            user_id: name
             for user_id in translated_user_ids
             if (user := users.get(user_id))
+            and (name := self.extract_name_from_user(user))
         }
 
     def _get(self, resource: str) -> dict[str, Any]: