qontract-reconcile 0.10.1rc1178__py3-none-any.whl → 0.10.1rc1180__py3-none-any.whl

{qontract_reconcile-0.10.1rc1178.dist-info → qontract_reconcile-0.10.1rc1180.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1178
+Version: 0.10.1rc1180
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1178.dist-info → qontract_reconcile-0.10.1rc1180.dist-info}/RECORD

@@ -112,7 +112,7 @@ reconcile/terraform_aws_route53.py,sha256=dQzzT46YhwRA902_H6pi-f7WlX4EaH187wXSdm
 reconcile/terraform_cloudflare_dns.py,sha256=-aLEe2QnH5cJPu7HWqs-R9NmQ1NlFbcVUm0v7alVL3I,13431
 reconcile/terraform_cloudflare_resources.py,sha256=pq8Ieo5NmB-dYQ9X2F0s6iEoINMzhiqGw2yQK4ovok4,14980
 reconcile/terraform_cloudflare_users.py,sha256=iyTG5sj20Jg4J4qWJ144KVptfIHGOSfH8wQKxu0imq0,13942
-reconcile/terraform_repo.py,sha256=TKqlodhQGoAtQ6nDm04TNlpx4wpgJ_n4atoUK5Rfd7o,16444
+reconcile/terraform_repo.py,sha256=jT8zD-V1_5D6yB2gLYP1nEC9wHoHktDQYnJqpo2EC9M,15807
 reconcile/terraform_resources.py,sha256=iufjMJs_aSEvmh7Cg11beCxKmV8nrOLOpEtiTryPNx0,19470
 reconcile/terraform_tgw_attachments.py,sha256=09svJG9pAiwWp4aY0xRoQRV90T4ZNwHG3r8flI-ZS_s,18810
 reconcile/terraform_users.py,sha256=HqSm3ev3b8dZ9J6F_phDZB-FQsnlsdeKp9RPoY1cU94,10188
@@ -397,7 +397,7 @@ reconcile/gql_definitions/terraform_cloudflare_users/terraform_cloudflare_roles.
 reconcile/gql_definitions/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_init/aws_accounts.py,sha256=OJ0hDbRachRaDkL-OGT6-byr9cKdBiQDnNCpwUe3oJ8,2674
 reconcile/gql_definitions/terraform_repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=nm4CH7Vog4aabdvCKmhVSUvoUb7dxSLx8nwAEJAVqG0,3706
+reconcile/gql_definitions/terraform_repo/terraform_repo.py,sha256=Eb6vb-nBIZMAiIbjTcDTH-eNv3831bvZAIgM6E287Hw,3861
 reconcile/gql_definitions/terraform_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_resources/database_access_manager.py,sha256=yv0_YC-LmhaKD_gyGG3le1w5BtypBjlsO894-Zgdg4U,4813
 reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.py,sha256=_man82NXH9Jw7OvgDiQCKiLDG6Q7aV_ktOAi12QCXbI,42793
@@ -566,7 +566,7 @@ reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-N
 reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGYoBpT2d45ZxU_ECIQ6o,3425
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=1mdSZS-38mtTSg7teJgDCJU1b_yKbwnrr3N5m8kwV4k,13595
 reconcile/test/test_terraform_cloudflare_users.py,sha256=2VGBtMUhckLPtUnQlHIzpGsCnyVJZPNLFf-ABELkxbQ,27456
-reconcile/test/test_terraform_repo.py,sha256=INfl-VlUtpV87J0neQt4wliptnX7PKvxLPF-ZgweTFA,12960
+reconcile/test/test_terraform_repo.py,sha256=r6bwryHtq6-VuUh3fuMsxlsjbQAgrcQUHOEFou_hilQ,12260
 reconcile/test/test_terraform_resources.py,sha256=8C97yXIEihaQ3DZrtjxLNt4y4G12IOhD01ydm7JjliY,15359
 reconcile/test/test_terraform_tgw_attachments.py,sha256=pJFmQzUwAn-wKpF6oSkImpdF7WXvcky8iaJiXbjGGgU,41104
 reconcile/test/test_terraform_users.py,sha256=XOAfGvITCJPI1LTlISmHbA4ONMQMkxYUMTsny7pQCFw,4319
@@ -880,8 +880,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1178.dist-info/METADATA,sha256=RfXebn7FPC9wsFLc2UmBeZ81WxuD2OpnNYVnkVAb7Fs,2213
-qontract_reconcile-0.10.1rc1178.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-qontract_reconcile-0.10.1rc1178.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1178.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1178.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1180.dist-info/METADATA,sha256=5FtpxYHIFj662mfS5_AXkrDYRFw4uWWBGxXElRlLS24,2213
+qontract_reconcile-0.10.1rc1180.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+qontract_reconcile-0.10.1rc1180.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1180.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1180.dist-info/RECORD,,

reconcile/gql_definitions/terraform_repo/terraform_repo.py

@@ -47,6 +47,9 @@ query TerraformRepo {
       }
     }
     name
+    app {
+      name
+    }
     repository
     ref
     projectPath
@@ -92,6 +95,10 @@ class AWSAccountV1(ConfiguredBaseModel):
     terraform_state: Optional[TerraformStateAWSV1] = Field(..., alias="terraformState")
 
 
+class AppV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
 class TerraformRepoVariablesV1(ConfiguredBaseModel):
     inputs: VaultSecret = Field(..., alias="inputs")
     outputs: VaultSecret = Field(..., alias="outputs")
@@ -100,6 +107,7 @@ class TerraformRepoVariablesV1(ConfiguredBaseModel):
 class TerraformRepoV1(ConfiguredBaseModel):
     account: AWSAccountV1 = Field(..., alias="account")
     name: str = Field(..., alias="name")
+    app: Optional[AppV1] = Field(..., alias="app")
     repository: str = Field(..., alias="repository")
     ref: str = Field(..., alias="ref")
     project_path: str = Field(..., alias="projectPath")

reconcile/terraform_repo.py

@@ -100,7 +100,6 @@ class TerraformRepoIntegration(
                 desired_state=desired,
                 dry_run=dry_run,
                 state=state,
-                recreate_state=False,
             )
 
             if repo_diff_result:
@@ -110,18 +109,19 @@ class TerraformRepoIntegration(
             # the existing state stored in S3. This is due to a behavior in Pydantic V1 that has since been addressed in V2
             # https://docs.pydantic.dev/latest/blog/pydantic-v2/#required-vs-nullable-cleanup
             # so in this case, tf-repo will just recreate all of those state files in S3 and not actually do a plan or apply
-            logging.error(err)
-            logging.info(
-                "Unable to parse existing Terraform-Repo state from S3. Note that this is separate from the actual .tfstate files. Terraform Repo will re-create its own state upon merge and will not update any infrastructure. This typically occurs with changes to the Terraform Repo schema files and is normally resolved once state is re-created."
+            logging.warning(
+                "Unable to parse existing Terraform-Repo state from S3. Will re-create internal state upon apply, more info here: https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/docs/terraform-repo/sop/statefile-load-errors.md",
+                exc_info=err,
             )
             repo_diff_result = self.calculate_diff(
                 existing_state=[],
                 desired_state=desired,
                 dry_run=dry_run,
                 state=state,
-                recreate_state=True,
             )
 
+            # we don't call print_output here meaning that the executor will not plan/apply
+
     def print_output(self, diff: list[TerraformRepoV1], dry_run: bool) -> OutputFile:
         """Parses and prints the output of a Terraform Repo diff for the executor
 
@@ -302,7 +302,6 @@ class TerraformRepoIntegration(
         desired_state: list[TerraformRepoV1],
         dry_run: bool,
         state: State | None,
-        recreate_state: bool,
     ) -> list[TerraformRepoV1] | None:
         """Calculated the difference between existing and desired state
         to determine what actions the executor will need to take
@@ -315,8 +314,6 @@ class TerraformRepoIntegration(
         :type dry_run: bool
         :param state: AWS S3 state
         :type state: Optional[State]
-        :param recreate_state: whether we are recreating our own state
-        :type recreate_state: bool
         :raises ParameterError: if there is an invalid operation performed like trying to delete
         a representation in A-I before setting the delete flag
         :return: the terraform repo to act on
@@ -326,13 +323,6 @@ class TerraformRepoIntegration(
 
         merged = self.merge_results(diff)
 
-        # validate that only one repo is being modified in each MR
-        # this lets us fail early and avoid multiple GL requests we don't need to make
-        if dry_run and len(merged) > 1 and not recreate_state:
-            raise Exception(
-                "Only one repository can be modified per merge request, please split your change out into multiple MRs. Hint: try rebasing your merge request"
-            )
-
         # added repos: do standard validation that SHA is valid
         if self.params.validate_git:
             for add_repo in diff.add.values():

reconcile/test/test_terraform_repo.py

@@ -42,6 +42,7 @@ def existing_repo(aws_account, tf_variables) -> TerraformRepoV1:
         repository=A_REPO,
         ref=A_REPO_SHA,
         account=aws_account,
+        app=None,
         projectPath="tf",
         delete=False,
         requireFips=True,
@@ -83,6 +84,7 @@ def new_repo(aws_account_no_state) -> TerraformRepoV1:
         repository=B_REPO,
         ref=B_REPO_SHA,
         account=aws_account_no_state,
+        app=None,
         projectPath="tf",
         delete=False,
         requireFips=False,
@@ -191,7 +193,6 @@ def test_addition_to_existing_repo(existing_repo, new_repo, int_params, state_mo
         desired_state=desired,
         dry_run=False,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff == [new_repo]
@@ -213,7 +214,6 @@ def test_updating_repo_ref(existing_repo, int_params, state_mock):
         desired_state=[updated_repo],
         dry_run=False,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff == [updated_repo]
@@ -234,7 +234,6 @@ def test_force_rerun(existing_repo, int_params, state_mock):
         desired_state=[updated_repo],
         dry_run=False,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff == [updated_repo]
@@ -261,7 +260,6 @@ def test_fail_on_update_invalid_repo_params(existing_repo, int_params):
             desired_state=[updated_repo],
             dry_run=True,
             state=None,
-            recreate_state=False,
         )
 
 
@@ -277,7 +275,6 @@ def test_delete_repo(existing_repo, int_params, state_mock):
         desired_state=[updated_repo],
         dry_run=False,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff == [updated_repo]
@@ -296,7 +293,6 @@ def test_delete_repo_without_flag(existing_repo, int_params):
             desired_state=[],
             dry_run=True,
             state=None,
-            recreate_state=False,
         )
 
 
@@ -316,6 +312,7 @@ def test_get_repo_state(s3_state_builder, int_params, existing_repo, tf_variable
                 "tfVersion": A_REPO_VERSION,
                 "variables": tf_variables,
                 "forceRerunTimestamp": None,
+                "app": None,
                 "account": {
                     "name": "foo",
                     "uid": AWS_UID,
@@ -358,7 +355,6 @@ def test_update_repo_state(int_params, existing_repo, state_mock):
         desired_state=desired_state,
         dry_run=False,
         state=state_mock,
-        recreate_state=False,
     )
 
     state_mock.add.assert_called_once_with(
@@ -381,7 +377,6 @@ def test_output_correct_statefile(
         desired_state=desired_state,
         dry_run=True,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff
@@ -403,7 +398,6 @@ def test_output_correct_no_statefile(
         desired_state=desired_state,
         dry_run=True,
         state=state_mock,
-        recreate_state=False,
     )
 
     assert diff
@@ -412,21 +406,6 @@ def test_output_correct_no_statefile(
     assert new_repo_output == current_output
 
 
-def test_fail_on_multiple_repos_dry_run(int_params, existing_repo, new_repo):
-    integration = TerraformRepoIntegration(params=int_params)
-
-    desired_state = [existing_repo, new_repo]
-
-    with pytest.raises(Exception):
-        integration.calculate_diff(
-            existing_state=[],
-            desired_state=desired_state,
-            dry_run=True,
-            state=None,
-            recreate_state=False,
-        )
-
-
 def test_succeed_on_multiple_repos_non_dry_run(int_params, existing_repo, new_repo):
     integration = TerraformRepoIntegration(params=int_params)
 
@@ -437,7 +416,6 @@ def test_succeed_on_multiple_repos_non_dry_run(int_params, existing_repo, new_re
         desired_state=desired_state,
         dry_run=False,
         state=None,
-        recreate_state=False,
     )
 
     assert diff
@@ -457,7 +435,6 @@ def test_no_op_succeeds(int_params, existing_repo):
         desired_state=state,
         dry_run=True,
         state=None,
-        recreate_state=False,
     )
 
     assert diff is None