qontract-reconcile 0.10.2.dev496__py3-none-any.whl → 0.10.2.dev498__py3-none-any.whl

{qontract_reconcile-0.10.2.dev496.dist-info → qontract_reconcile-0.10.2.dev498.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev496
+Version: 0.10.2.dev498
 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

{qontract_reconcile-0.10.2.dev496.dist-info → qontract_reconcile-0.10.2.dev498.dist-info}/RECORD

@@ -98,7 +98,7 @@ reconcile/service_dependencies.py,sha256=KydjllianL0lUwhroBAPui7jrnhHSq7j2PB6CoV
 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=C36L64wb95tf2tIqJ8T1xXmREpxHvxbhnglk0QOfUVc,30939
-reconcile/slack_usergroups_api.py,sha256=NnO8Di6tt5yVJG0e-KnHgOOpQq5JhourwCMaMnNEhDw,24862
+reconcile/slack_usergroups_api.py,sha256=4-UJTaGcAatcJADZTfeGlEnFH1vGDc7UL9YMfnav3Mo,24713
 reconcile/sql_query.py,sha256=Go_H36p3YTW4Xv-elYDxW_Fe6Q4ErFhD6eQoFh9Jylw,26424
 reconcile/status.py,sha256=h73oaSxO5sftEGqFrXVAlySBvNYPWpowDaYYplcky5A,565
 reconcile/status_board.py,sha256=iv2CR3IsX_uDY5aXHjTOySeTR5d3vsABykYNiYNjZew,15316
@@ -192,7 +192,7 @@ reconcile/external_resources/integration_secrets_sync.py,sha256=M2uOFi2JXWhiw3hQ
 reconcile/external_resources/manager.py,sha256=xf_FGCtgVHN8DnWUwMTX781E06Jnc1mxEce_qoii3Is,18757
 reconcile/external_resources/meta.py,sha256=RM8qGE6UoJR58nLqABReIJrrdmx4Tqt_OcdlT-QygGs,620
 reconcile/external_resources/metrics.py,sha256=ahvlgrc48B214NwBq-G6ncwQE3Qrtif61jtOrklfylQ,3903
-reconcile/external_resources/model.py,sha256=XxdIpf4uznYaZzoO_9SYL3x73vFanUi1tAkWOjfzR_g,15503
+reconcile/external_resources/model.py,sha256=T9A5h1DE8AhhV1AVNHbxC-NR5wmvqQoxsH3OY5wJoxM,15606
 reconcile/external_resources/reconciler.py,sha256=-jXny_rFnUpPs_VFbA0Iig37-icOu-9i6R-KXjPuWb8,10150
 reconcile/external_resources/secrets_sync.py,sha256=vdcy2Ydz67pKkSHT2U0-Ucu9cxMr99r15RovLTxmoZU,16162
 reconcile/external_resources/state.py,sha256=zWla2_j6BI1FBrSPqRRfuo55bXK0QWAxtEeafb8ffTg,13811
@@ -214,7 +214,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=prje61EOuLEIZLLxlJS_YN0
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=3GgcqUM6hWhLpo9Yx5Xr9vrdexF-WNevVCNL9bJ0Upc,8162
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=FjXblj7vGdpsRA1RkrIQyXQ2t9B60ERqHIt7WRKBoGg,2432241
+reconcile/gql_definitions/introspection.json,sha256=sXS1YYgHWrRaY4aWcH4Jpb2jsW4Kn3_bmi5ig1PKZys,2439948
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=VySMcnWddg-jXj-bj_ddLIwLX3u1GSFUm02H8rJDBYU,2167
 reconcile/gql_definitions/acs/acs_policies.py,sha256=jEV1U8j4VYL9ih17JSK1tiz2s_1CegVECmXU-NVEQvA,4333
@@ -309,7 +309,7 @@ reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=p3hvzvrtkCCQfQoJ3mi
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=bRzfuPDLJvVJRx7IzqAJKnqpd7SBWdj3trI1rNPeYnU,2033
 reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=w07PFh526GaYnZRe-SH92MaxA-aeD2TDT2kG_3Da_HE,3241
-reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=kb6-sHCAZ6-mW-4SGeLWex-MGQ69VkxpTsJQj1L-__Q,48172
+reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=fjZTsR3eZyocdApQ2zOnp6IOp_XpP02rv7jvIWMdF4w,48984
 reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=RvAMgipgH3MoLfWaqCPaYUy8GS3v0Dr4Cod17OsaNx0,3567
 reconcile/gql_definitions/external_resources/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py,sha256=jjABgAhVx7LO3NJd9l90JH8s-_TJFvduBZRbdVquLfY,1313
@@ -817,7 +817,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev496.dist-info/METADATA,sha256=7q7vn5y-O98q0hxYlvPs_S7639jsHomijUm-SiZIUzk,24958
-qontract_reconcile-0.10.2.dev496.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev496.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev496.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev498.dist-info/METADATA,sha256=Ufe3CHnqQrkY4IEW8-zU5dq8m1NIt-I_wXPASYZWXBM,24958
+qontract_reconcile-0.10.2.dev498.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev498.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev498.dist-info/RECORD,,

reconcile/external_resources/model.py

@@ -16,6 +16,7 @@ from reconcile.gql_definitions.external_resources.external_resources_modules imp
 from reconcile.gql_definitions.external_resources.external_resources_namespaces import (
     NamespaceTerraformProviderResourceAWSV1,
     NamespaceTerraformProviderResourceCloudflareV1,
+    NamespaceTerraformResourceCloudflareAccountV1,
     NamespaceTerraformResourceCloudflareZoneV1,
     NamespaceTerraformResourceCloudWatchV1,
     NamespaceTerraformResourceElastiCacheV1,
@@ -104,6 +105,7 @@ SUPPORTED_RESOURCE_TYPES = (
     | NamespaceTerraformResourceCloudWatchV1
     | NamespaceTerraformResourceRDSProxyV1
     | NamespaceTerraformResourceCloudflareZoneV1
+    | NamespaceTerraformResourceCloudflareAccountV1
 )
 
 

reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -588,6 +588,16 @@ query ExternalResourcesNamespaces {
               ...ExternalResourcesModuleOverrides
             }
           }
+          ... on NamespaceTerraformResourceCloudflareAccount_v1 {
+            provider
+            identifier
+            defaults
+            delete
+            managed_by_erv2
+            module_overrides {
+              ...ExternalResourcesModuleOverrides
+            }
+          }
         }
       }
     }
@@ -1211,9 +1221,18 @@ class NamespaceTerraformResourceCloudflareZoneV1(NamespaceTerraformResourceCloud
     module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
 
 
+class NamespaceTerraformResourceCloudflareAccountV1(NamespaceTerraformResourceCloudflareV1):
+    provider: str = Field(..., alias="provider")
+    identifier: str = Field(..., alias="identifier")
+    defaults: str = Field(..., alias="defaults")
+    delete: Optional[bool] = Field(..., alias="delete")
+    managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
+    module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
+
+
 class NamespaceTerraformProviderResourceCloudflareV1(NamespaceExternalResourceV1):
     provisioner: CloudflareAccountV1 = Field(..., alias="provisioner")
-    resources: list[Union[NamespaceTerraformResourceCloudflareZoneV1, NamespaceTerraformResourceCloudflareV1]] = Field(..., alias="resources")
+    resources: list[Union[NamespaceTerraformResourceCloudflareZoneV1, NamespaceTerraformResourceCloudflareAccountV1, NamespaceTerraformResourceCloudflareV1]] = Field(..., alias="resources")
 
 
 class EnvironmentV1(ConfiguredBaseModel):

reconcile/gql_definitions/introspection.json

@@ -4282,6 +4282,26 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "imagePatternsBlockRules",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "ImagePatternsBlock_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -27020,6 +27040,57 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ImagePatternsBlock_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "environmentLabelSelector",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "imagePatterns",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "SCALAR",
+                                            "name": "String",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AppInterfaceEmail_v1",
@@ -42336,6 +42407,11 @@
                             "name": "NamespaceTerraformResourceCloudflareZone_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "NamespaceTerraformResourceCloudflareAccount_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "NamespaceTerraformResourceCloudflareWorkerScript_v1",
@@ -43459,6 +43535,107 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "NamespaceTerraformResourceCloudflareAccount_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "provider",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "identifier",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "defaults",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "delete",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "managed_by_erv2",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "Boolean",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "module_overrides",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "ExternalResourcesModuleOverrides_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "NamespaceTerraformResourceCloudflare_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "NamespaceTerraformResourceCloudflareWorkerScript_v1",

reconcile/slack_usergroups_api.py

@@ -646,27 +646,26 @@ class SlackUsergroupsIntegration(
             return
 
         task = await self.reconcile(workspaces=workspaces, dry_run=dry_run)
-        if dry_run:
-            # wait for task completion and get the action list
-            task_result = await slack_usergroups_task_status(
-                client=self.qontract_api_client, task_id=task.id, timeout=300
-            )
-            if task_result.status == TaskStatus.PENDING:
-                logging.error("Task did not complete within the timeout period")
-                sys.exit(1)
-
-            if task_result.actions:
-                logging.info("Proposed actions:")
-                for action in task_result.actions or []:
-                    if isinstance(action, SlackUsergroupActionUpdateUsers):
-                        logging.info(
-                            f"{action.usergroup=} {action.users_to_add=} {action.users_to_remove=}"
-                        )
-                    else:
-                        logging.info(action)
-
-            if task_result.errors:
-                logging.error(f"Errors encountered: {len(task_result.errors)}")
-                for error in task_result.errors:
-                    logging.error(f"  - {error}")
-                sys.exit(1)
+
+        # wait for task completion and get the action list
+        task_result = await slack_usergroups_task_status(
+            client=self.qontract_api_client, task_id=task.id, timeout=300
+        )
+        if task_result.status == TaskStatus.PENDING:
+            logging.error("Task did not complete within the timeout period")
+            sys.exit(1)
+
+        if task_result.actions:
+            for action in task_result.actions or []:
+                if isinstance(action, SlackUsergroupActionUpdateUsers):
+                    logging.info(
+                        f"{action.usergroup=} {action.users_to_add=} {action.users_to_remove=}"
+                    )
+                else:
+                    logging.info(action)
+
+        if task_result.errors:
+            logging.error(f"Errors encountered: {len(task_result.errors)}")
+            for error in task_result.errors:
+                logging.error(f"  - {error}")
+            sys.exit(1)