qontract-reconcile 0.10.2.dev197__tar.gz → 0.10.2.dev199__tar.gz

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev197
+Version: 0.10.2.dev199
 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.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/external_resources/model.py

@@ -32,7 +32,7 @@ from reconcile.gql_definitions.external_resources.external_resources_settings im
 from reconcile.gql_definitions.external_resources.fragments.external_resources_module_overrides import (
     ExternalResourcesModuleOverrides,
 )
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
+from reconcile.gql_definitions.fragments.deploy_resources import DeployResourcesFields
 from reconcile.utils.exceptions import FetchResourceError
 from reconcile.utils.external_resource_spec import (
     ExternalResourceSpec,
@@ -61,6 +61,10 @@ class ExternalResourceOutputResourceNameDuplications(Exception):
         super().__init__("".join(msg))
 
 
+class ExternalResourceModuleConfigurationError(Exception):
+    pass
+
+
 class ExternalResourceValidationError(Exception):
     errors: list[str] = []
 
@@ -281,6 +285,13 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
         spec: ExternalResourceSpec,
         settings: ExternalResourcesSettingsV1,
     ) -> "ExternalResourceModuleConfiguration":
+        """Resolve the module configuration for a given ExternalResourceSpec.
+        Priority:
+        1.- Module_overrides from the spec
+        2.- Provisioner (AWS account) channel
+        3.- Module default channel
+        """
+
         module_overrides = spec.metadata.get("module_overrides")
         overridden = module_overrides is not None
 
@@ -289,15 +300,35 @@ class ExternalResourceModuleConfiguration(BaseModel, frozen=True):
                 module_type=None,
                 image=None,
                 version=None,
+                channel=None,
                 reconcile_timeout_minutes=None,
                 outputs_secret_image=None,
                 outputs_secret_version=None,
                 resources=None,
             )
 
+        provisioner_channel = (spec.provisioner.get("external_resources") or {}).get(
+            "channel"
+        ) or None
+
+        channel_name = (
+            module_overrides.channel or provisioner_channel or module.default_channel
+        )
+
+        channel = next(
+            (c for c in module.channels if c.name == channel_name),
+            None,
+        )
+
+        if channel is None:
+            raise ExternalResourceModuleConfigurationError(
+                f"Module {module.provision_provider}/{module.provider} does not have the channel {channel_name}. "
+                f"Resource spec: {spec.id_object()}"
+            )
+
         return ExternalResourceModuleConfiguration(
-            image=module_overrides.image or module.image,
-            version=module_overrides.version or module.version,
+            image=module_overrides.image or channel.image,
+            version=module_overrides.version or channel.version,
             reconcile_drift_interval_minutes=module.reconcile_drift_interval_minutes,
             reconcile_timeout_minutes=module_overrides.reconcile_timeout_minutes
             or module.reconcile_timeout_minutes,

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/external_resources/external_resources_modules.py

@@ -17,7 +17,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
+from reconcile.gql_definitions.fragments.deploy_resources import DeployResourcesFields
 
 
 DEFINITION = """
@@ -37,8 +37,6 @@ query ExternalResourcesModules {
         provision_provider
         provider
         module_type
-        image
-        version
         reconcile_drift_interval_minutes
         reconcile_timeout_minutes
         outputs_secret_sync
@@ -47,6 +45,12 @@ query ExternalResourcesModules {
         resources {
           ... DeployResourcesFields
         }
+        default_channel
+        channels {
+          name
+          image
+          version
+        }
     }
 }
 """
@@ -58,18 +62,24 @@ class ConfiguredBaseModel(BaseModel):
         extra=Extra.forbid
 
 
+class ExternalResourcesChannelV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    image: str = Field(..., alias="image")
+    version: str = Field(..., alias="version")
+
+
 class ExternalResourcesModuleV1(ConfiguredBaseModel):
     provision_provider: str = Field(..., alias="provision_provider")
     provider: str = Field(..., alias="provider")
     module_type: str = Field(..., alias="module_type")
-    image: str = Field(..., alias="image")
-    version: str = Field(..., alias="version")
     reconcile_drift_interval_minutes: int = Field(..., alias="reconcile_drift_interval_minutes")
     reconcile_timeout_minutes: int = Field(..., alias="reconcile_timeout_minutes")
     outputs_secret_sync: bool = Field(..., alias="outputs_secret_sync")
     outputs_secret_image: Optional[str] = Field(..., alias="outputs_secret_image")
     outputs_secret_version: Optional[str] = Field(..., alias="outputs_secret_version")
     resources: Optional[DeployResourcesFields] = Field(..., alias="resources")
+    default_channel: str = Field(..., alias="default_channel")
+    channels: list[ExternalResourcesChannelV1] = Field(..., alias="channels")
 
 
 class ExternalResourcesModulesQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -67,6 +67,7 @@ fragment DeployResourcesFields on DeployResources_v1 {
 
 fragment ExternalResourcesModuleOverrides on ExternalResourcesModuleOverrides_v1 {
   module_type
+  channel
   image
   version
   reconcile_timeout_minutes
@@ -98,6 +99,9 @@ query ExternalResourcesNamespaces {
             name
             resourcesDefaultRegion
             supportedDeploymentRegions
+            externalResources {
+                channel
+            }
         }
         resources {
             output_format {
@@ -572,10 +576,15 @@ class NamespaceExternalResourceV1(ConfiguredBaseModel):
     provider: str = Field(..., alias="provider")
 
 
+class ExternalResourcesAccountSettingsV1(ConfiguredBaseModel):
+    channel: Optional[str] = Field(..., alias="channel")
+
+
 class AWSAccountV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     resources_default_region: str = Field(..., alias="resourcesDefaultRegion")
     supported_deployment_regions: Optional[list[str]] = Field(..., alias="supportedDeploymentRegions")
+    external_resources: Optional[ExternalResourcesAccountSettingsV1] = Field(..., alias="externalResources")
 
 
 class NamespaceTerraformResourceOutputFormatV1(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/external_resources/external_resources_settings.py

@@ -17,7 +17,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
+from reconcile.gql_definitions.fragments.deploy_resources import DeployResourcesFields
 
 
 DEFINITION = """

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py

@@ -17,7 +17,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
+from reconcile.gql_definitions.fragments.deploy_resources import DeployResourcesFields
 
 
 class ConfiguredBaseModel(BaseModel):
@@ -28,6 +28,7 @@ class ConfiguredBaseModel(BaseModel):
 
 class ExternalResourcesModuleOverrides(ConfiguredBaseModel):
     module_type: Optional[str] = Field(..., alias="module_type")
+    channel: Optional[str] = Field(..., alias="channel")
     image: Optional[str] = Field(..., alias="image")
     version: Optional[str] = Field(..., alias="version")
     reconcile_timeout_minutes: Optional[int] = Field(..., alias="reconcile_timeout_minutes")

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/integrations/integrations.py

@@ -18,7 +18,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 )
 
 from reconcile.gql_definitions.fragments.jumphost_common_fields import CommonJumphostFields
-from reconcile.gql_definitions.fragments.deplopy_resources import DeployResourcesFields
+from reconcile.gql_definitions.fragments.deploy_resources import DeployResourcesFields
 from reconcile.gql_definitions.fragments.minimal_ocm_organization import MinimalOCMOrganization
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/gql_definitions/introspection.json

@@ -10447,6 +10447,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "externalResources",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "ExternalResourcesAccountSettings_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "account_requests",
                             "description": null,
@@ -15412,6 +15424,29 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ExternalResourcesAccountSettings_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "channel",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AWSAccountRequest_v1",
@@ -34816,38 +34851,6 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
-                        {
-                            "name": "image",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "version",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
                         {
                             "name": "reconcile_drift_interval_minutes",
                             "description": null,
@@ -34931,6 +34934,46 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "default_channel",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "channels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "ExternalResourcesChannel_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -34944,6 +34987,65 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ExternalResourcesChannel_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "image",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "version",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "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": "AppChangelog_v1",
@@ -44161,6 +44263,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "channel",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "image",
                             "description": null,

{qontract_reconcile-0.10.2.dev197 → qontract_reconcile-0.10.2.dev199}/reconcile/utils/terraform_client.py

@@ -222,7 +222,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         if disable_deletions_detected:
             raise RuntimeError("Terraform plan has disabled deletions detected")
 
-    @retry(no_retry_exceptions=RdsUpgradeValidationError)
+    @retry(max_attempts=10, no_retry_exceptions=RdsUpgradeValidationError)
     def terraform_plan(
         self, spec: TerraformSpec, enable_deletion: bool
     ) -> tuple[bool, list[AccountUser], bool]: