qontract-reconcile 0.10.2.dev113__py3-none-any.whl → 0.10.2.dev115__py3-none-any.whl

{qontract_reconcile-0.10.2.dev113.dist-info → qontract_reconcile-0.10.2.dev115.dist-info}/METADATA

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

@@ -144,7 +144,7 @@ reconcile/automated_actions/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 reconcile/automated_actions/config/integration.py,sha256=cf1VxolcjlGP-xO7IIH5A00Qr4znNJTT7a_sU18ABig,10755
 reconcile/aws_account_manager/README.md,sha256=_XFM3GZNHUzv--e_navqJuaUWpjC6QrHfulreHynFf0,262
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_account_manager/integration.py,sha256=WOE_mi45pvJW4TNKh4mCGSViJiElH--T4Wg0CLMYxpY,14988
+reconcile/aws_account_manager/integration.py,sha256=v-l4fdWTgX_vSYiBKAfDvT_g0_ZKNPDQnDKUyhrSzIs,15143
 reconcile/aws_account_manager/merge_request_manager.py,sha256=q8t-YwD4y_4UpxdoG9TQrEbDpjlzasOQIynFoCjP2OE,3947
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=8mwwcWVVNoUzmttzxgnLyePqN823v1t_dQCNCrx1mG0,15035
@@ -227,7 +227,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=a8ZQ44bbv2CYbpxq63auErFnpDKmnzIpjhmt3FoGX2I,2280534
+reconcile/gql_definitions/introspection.json,sha256=_jq9M-0AjHkgGDguglV1mi29Ajk7yfpSKh28LOouPb4,2281058
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -243,7 +243,7 @@ reconcile/gql_definitions/app_sre_tekton_access_revalidation/users.py,sha256=XdV
 reconcile/gql_definitions/automated_actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/automated_actions/instance.py,sha256=D50v0exLeK5hvjQKvxQ5V-6DnYZo_L6cX_Gaf3PGREs,5491
 reconcile/gql_definitions/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/aws_account_manager/aws_accounts.py,sha256=ITfT4nkGw0BBpjU3oXoBwW1NtEweCFhkdrN5zDkGmfs,4999
+reconcile/gql_definitions/aws_account_manager/aws_accounts.py,sha256=YnS_CDwKMNCxE5ySaKC_72pG9_WmW3nz8ZyyCzX1yV4,5119
 reconcile/gql_definitions/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/aws_ami_cleanup/aws_accounts.py,sha256=jIgOa888MYLLvVsn1ir3nbkhWLG5T6dBg7oDnp1q8BI,4108
 reconcile/gql_definitions/aws_saml_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -769,7 +769,7 @@ tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaB
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=SXh6sZ1dXXzd-2R5eeBufCtW3J4-Y55--0MZLdo4lr8,5409
-tools/cli_commands/erv2.py,sha256=VxUlNXllo947UwmtvS-42IeI9x_t_X3MHrrSI3K_GRo,23274
+tools/cli_commands/erv2.py,sha256=qojYCTope8ao-NBQVITs5Kd4mJBjRLNZwfvrV-Eov9w,23770
 tools/cli_commands/gpg_encrypt.py,sha256=JWwds_Qg7KhSJMIGUh8TfI5-Jf17iUtmaEi4kWJxfVE,4907
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -791,7 +791,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.dev113.dist-info/METADATA,sha256=1C-m50EQHQv6A3pL8UsxfNmDCQLCfiktS9YVq-MIWTg,24566
-qontract_reconcile-0.10.2.dev113.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev113.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev113.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev115.dist-info/METADATA,sha256=YKV1Wo4fbur-7QWCeOLn4XS55-_TQDaI8Czl697u84c,24566
+qontract_reconcile-0.10.2.dev115.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev115.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev115.dist-info/RECORD,,

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(

reconcile/gql_definitions/aws_account_manager/aws_accounts.py

@@ -95,6 +95,7 @@ query AWSAccountManagerAccounts {
     organization_accounts {
       ... AWSAccountManaged
     }
+    organizationAccountTags
   }
 }
 """
@@ -154,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):

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,

tools/cli_commands/erv2.py

@@ -266,6 +266,12 @@ class Erv2Cli:
                 [
                     "docker",
                     "run",
+                    "-e",
+                    "TERRAFORM_MODULE_WORK_DIR=/tmp/migration",
+                    "-e",
+                    "BACKEND_TF_FILE=/tmp/migration/backend.tf",
+                    "-e",
+                    "TF_VARS_FILE=/tmp/migration/terraform.tfvars.json",
                     "--name",
                     "erv2-unlock",
                     "--rm",
@@ -279,7 +285,11 @@ class Erv2Cli:
                     "/bin/bash",
                     self.image,
                     "-c",
-                    f"cdktf synth && cd cdktf.out/stacks/CDKTF/ && terraform init && terraform force-unlock -force '{lock_id}'",
+                    "mkdir -p $TERRAFORM_MODULE_WORK_DIR;"
+                    "cp -rf module/* $TERRAFORM_MODULE_WORK_DIR;"
+                    "generate-tf-config && "
+                    "terraform -chdir=$TERRAFORM_MODULE_WORK_DIR init && "
+                    f"terraform -chdir=$TERRAFORM_MODULE_WORK_DIR force-unlock -force '{lock_id}'",
                 ],
                 check=True,
             )