qontract-reconcile 0.10.2.dev478__py3-none-any.whl → 0.10.2.dev479__py3-none-any.whl

{qontract_reconcile-0.10.2.dev478.dist-info → qontract_reconcile-0.10.2.dev479.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev478
+Version: 0.10.2.dev479
 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.dev478.dist-info → qontract_reconcile-0.10.2.dev479.dist-info}/RECORD

@@ -190,10 +190,10 @@ reconcile/external_resources/cloudflare.py,sha256=7Yq31L_enR-iyAAsVx_Z-QVbRjh_Gm
 reconcile/external_resources/factories.py,sha256=52GzEmEaLhriG0AQzHh0R8n3IwnGvwpxVCv8U0glGC4,8506
 reconcile/external_resources/integration.py,sha256=Fcc7MjixGx6bE6K4fgXx6yFomVoJavsOLhhDgL7VJgg,7040
 reconcile/external_resources/integration_secrets_sync.py,sha256=M2uOFi2JXWhiw3hQyE_4NVPQmPIYGHlghRti5eLWhkw,1738
-reconcile/external_resources/manager.py,sha256=dwDFqvN5GDnmSKBHVxQt2Wb4hspJQiS7gyITylA2Y8U,18856
+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=8kw2-Y0DxHpdNxaxdfM6xD_cyS40MElTHgfD-Sm2j2E,15405
+reconcile/external_resources/model.py,sha256=XxdIpf4uznYaZzoO_9SYL3x73vFanUi1tAkWOjfzR_g,15503
 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
@@ -803,7 +803,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.dev478.dist-info/METADATA,sha256=vyQsjxw1NoAHqnLG1q2_-8QMpttGry95GFqp6ZdtNJc,24948
-qontract_reconcile-0.10.2.dev478.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev478.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev478.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev479.dist-info/METADATA,sha256=S8y7PdpWCuc852MqrZRmjaXKWpQ-grJVtnuqlbn3NiI,24948
+qontract_reconcile-0.10.2.dev479.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev479.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev479.dist-info/RECORD,,

reconcile/external_resources/manager.py

@@ -318,6 +318,8 @@ class ExternalResourcesManager:
                 if r.action == Action.APPLY:
                     reconciliation_status.resource_status = (
                         ResourceStatus.PENDING_SECRET_SYNC
+                        if r.module_configuration.outputs_secret_sync
+                        else ResourceStatus.CREATED
                     )
                 elif r.action == Action.DESTROY:
                     reconciliation_status.resource_status = ResourceStatus.DELETED
@@ -377,13 +379,6 @@ class ExternalResourcesManager:
         state.reconciliation = r
         self.state_mgr.set_external_resource_state(state)
 
-    def _need_secret_sync(
-        self, r: Reconciliation, state: ExternalResourceState
-    ) -> bool:
-        return (
-            r.action == Action.APPLY and state.resource_status == ResourceStatus.CREATED
-        )
-
     def _sync_secrets(
         self,
         to_sync_keys: Iterable[ExternalResourceKey],

reconcile/external_resources/model.py

@@ -269,6 +269,7 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
     version: str = ""
     reconcile_drift_interval_minutes: int = 1440
     reconcile_timeout_minutes: int = 1440  # same as https://developer.hashicorp.com/terraform/enterprise/application-administration/general#terraform-run-timeout-settings
+    outputs_secret_sync: bool = False
     outputs_secret_image: str = ""
     outputs_secret_version: str = ""
     resources: Resources = Resources()
@@ -335,6 +336,7 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
             reconcile_drift_interval_minutes=module.reconcile_drift_interval_minutes,
             reconcile_timeout_minutes=module_overrides.reconcile_timeout_minutes
             or module.reconcile_timeout_minutes,
+            outputs_secret_sync=module.outputs_secret_sync,
             outputs_secret_image=module_overrides.outputs_secret_image
             or module.outputs_secret_image
             or settings.outputs_secret_image,