qontract-reconcile 0.10.2.dev112__tar.gz → 0.10.2.dev114__tar.gz

{qontract_reconcile-0.10.2.dev112 → qontract_reconcile-0.10.2.dev114}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev112
+Version: 0.10.2.dev114
 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.dev112 → qontract_reconcile-0.10.2.dev114}/reconcile/aws_account_manager/integration.py

@@ -195,6 +195,7 @@ class AwsAccountMgmtIntegration(
         aws_api: AWSApi,
         reconciler: AWSReconciler,
         organization_accounts: Iterable[AWSAccountManaged],
+        default_tags: dict[str, str],
     ) -> None:
         """Reconcile organization accounts."""
         for account in organization_accounts:
@@ -204,7 +205,7 @@ class AwsAccountMgmtIntegration(
                 name=account.name,
                 uid=account.uid,
                 ou=account.organization.ou,
-                tags=self.params.default_tags
+                tags=default_tags
                 | account.organization.tags
                 | {"app-interface-name": account.name},
                 enterprise_support=account.premium_support,
@@ -276,6 +277,8 @@ class AwsAccountMgmtIntegration(
                     acct_manager_role_aws_api,
                     reconciler,
                     payer_account.organization_accounts or [],
+                    default_tags=self.params.default_tags
+                    | (payer_account.organization_account_tags or {}),
                 )
 
     def reconcile_non_organization_accounts(

{qontract_reconcile-0.10.2.dev112 → qontract_reconcile-0.10.2.dev114}/reconcile/gql_definitions/aws_account_manager/aws_accounts.py

@@ -90,10 +90,12 @@ query AWSAccountManagerAccounts {
       supportedDeploymentRegions
       uid
       additionalFeatures
+      accountFileTargetPath
     }
     organization_accounts {
       ... AWSAccountManaged
     }
+    organizationAccountTags
   }
 }
 """
@@ -143,6 +145,7 @@ class AWSAccountRequestV1(ConfiguredBaseModel):
     supported_deployment_regions: Optional[list[str]] = Field(..., alias="supportedDeploymentRegions")
     uid: Optional[str] = Field(..., alias="uid")
     additional_features: Optional[Json] = Field(..., alias="additionalFeatures")
+    account_file_target_path: Optional[str] = Field(..., alias="accountFileTargetPath")
 
 
 class AWSAccountV1(AWSAccountManaged):
@@ -152,6 +155,7 @@ class AWSAccountV1(AWSAccountManaged):
     automation_role: Optional[AWSAutomationRoleV1] = Field(..., alias="automationRole")
     account_requests: Optional[list[AWSAccountRequestV1]] = Field(..., alias="account_requests")
     organization_accounts: Optional[list[AWSAccountManaged]] = Field(..., alias="organization_accounts")
+    organization_account_tags: Optional[Json] = Field(..., alias="organizationAccountTags")
 
 
 class AWSAccountManagerAccountsQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev112 → qontract_reconcile-0.10.2.dev114}/reconcile/gql_definitions/introspection.json

@@ -10408,6 +10408,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "organizationAccountTags",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "account_requests",
                             "description": null,
@@ -15396,6 +15408,18 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "accountFileTargetPath",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,