qontract-reconcile 0.10.1rc109__py3-none-any.whl → 0.10.1rc111__py3-none-any.whl

{qontract_reconcile-0.10.1rc109.dist-info → qontract_reconcile-0.10.1rc111.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc109
+Version: 0.10.1rc111
 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.1rc109.dist-info → qontract_reconcile-0.10.1rc111.dist-info}/RECORD

@@ -33,7 +33,7 @@ reconcile/gitlab_permissions.py,sha256=ciEKj_wnRbS_vs_ZwcUeD6HkWVe3osAuotFqJSmvd
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=ed1kFdGG6Z2agbN_agSp-pIyCQMyegF-OzH2EpUTkv8,8878
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
-reconcile/jenkins_job_builder.py,sha256=yUfr6s-Rxy5btskLtMmmYumXf_AheTVj82I9oqGV8U0,4128
+reconcile/jenkins_job_builder.py,sha256=tfar8m5dyYlOZxgoMBvs1Woa698PftZCrCsvTzL3tLg,3930
 reconcile/jenkins_job_builds_cleaner.py,sha256=zK8gQgXY5Ab5aDk8yPiXg0ogUEBOGmbyo8wEEtK342k,3190
 reconcile/jenkins_job_cleaner.py,sha256=8DetVJsUFf68ZtUwaO9Vg9ohAsua2uA0Q6ykI4j3K0w,1794
 reconcile/jenkins_roles.py,sha256=hOLPiPs2Juv7l8mGBj5-e88DqgvLbLldf0Xk0ylUzHE,4577
@@ -87,7 +87,7 @@ reconcile/quay_mirror.py,sha256=9pwl1gLzRpsVXF5yPULM4ET_C5F8_xPmH8Mv8AS2AfI,1340
 reconcile/quay_mirror_org.py,sha256=E1OdRe-ppxTkNCwu20iVRhEdG1fPDBroLY02NgiMN7c,10381
 reconcile/quay_permissions.py,sha256=_3PCWjNWoU7VHlYgHzUevvL_jJmEMsWfXV_nzjeiyhU,4099
 reconcile/quay_repos.py,sha256=7609RBVQihis96FNOOe-i9tCTYwcTVy4WpKAL6HpnkU,7031
-reconcile/queries.py,sha256=WitfyGldZ_GiC-BOiIpUL_T2baZnM-f6NYhaqcTk1io,48448
+reconcile/queries.py,sha256=lQpqysAzm2649BkJxhaue107LT-mOpmITTyKoLnTPls,48422
 reconcile/query_validator.py,sha256=oLEZIAsQCzxmmZ7b9dSw-OKuEjpI1dbVu4XfCfjpmi8,1503
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -104,7 +104,7 @@ reconcile/terraform_aws_route53.py,sha256=06VIlIb95BzVkxV_1TPiaY9sQO-TkvQXL4V_qz
 reconcile/terraform_cloudflare_dns.py,sha256=auU4bzeLwd4S8D8oqpqJbrCUoEdELXrgi7vHOedjYFk,13332
 reconcile/terraform_cloudflare_resources.py,sha256=BQg12mHm1iaxf086FFPZutPbWKUMaddqu-nREPR8ptA,14887
 reconcile/terraform_cloudflare_users.py,sha256=Bv0f9lOO_wTM7st8iltb8FR8gu4KpKu3qavMzAYcoMc,13965
-reconcile/terraform_repo.py,sha256=ErhpFetzBOtOL9rz9Hom5SRSuReTNhk5jnfJRHrDQ_s,11509
+reconcile/terraform_repo.py,sha256=g4CdusKWWb43SndlXg3K-jB2T1oSFJ_cWj1hjeWVU7s,11509
 reconcile/terraform_resources.py,sha256=gQ-LT0TGwf9OR4RF5EWDmNHUnKWnbhrIMtyIdUgP4D4,16782
 reconcile/terraform_tgw_attachments.py,sha256=ootT8zPxcm3-VHy9OiG0zBP0X7wzrvTCh53eYbxJvfI,13725
 reconcile/terraform_users.py,sha256=AzDvEQCdLpsXoS3nLbIQRraQvJHa8JmL40lZFv8YXMk,9321
@@ -354,7 +354,7 @@ reconcile/test/test_sql_query.py,sha256=l0QyIflcErIrAwSP8kOIub0jO6oi0Ncuns5IJtnu
 reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGYoBpT2d45ZxU_ECIQ6o,3425
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=cWNE2UIhz19rLSWdpJG8xRwuEEYoIZWEkDZY7e2QN_g,3426
 reconcile/test/test_terraform_cloudflare_users.py,sha256=8iAFjz-zbUW4xLS10Lk1XvYSk4B_W__YT9rgrBuigcQ,27482
-reconcile/test/test_terraform_repo.py,sha256=cgCygXxo1FP-KqZnI7Oolv1jVop4oJcR_7fSiHZZOEE,6673
+reconcile/test/test_terraform_repo.py,sha256=u1Xb3eglJ3vJUOFD9wjnWG3XypX2nClBLhqB2Y_lcK8,6533
 reconcile/test/test_terraform_resources.py,sha256=dEpJwaTzE_FzkRjCozDtGzE4egBrb-VrwSoWr2Benv4,7955
 reconcile/test/test_terraform_tgw_attachments.py,sha256=ddf04h_uKYroJOWKOFGZxuJNL-1PSjW5EyddQB3CLSw,33744
 reconcile/test/test_terraform_users.py,sha256=Yt4iN5FMtn7cfVlVqBJ1MMH94Z0DGchyByhpfNUJFxM,1570
@@ -581,7 +581,7 @@ release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 release/test_version.py,sha256=4DKxDZkT0aoS6ibZFsH2fd_wNETij1qfn2pCgQtVCGo,2093
 release/version.py,sha256=Ud36t9FxGHLubMrE2o5aaaZRGB9_9hU_z0RN9go0TQM,3876
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/app_interface_reporter.py,sha256=7FqFzA9fYQzbMS4eJWfY-qA69vCSMRhLsm7R6lF9tg4,21902
+tools/app_interface_reporter.py,sha256=mLFxy-hmkrv_B_MdfNfM7CzYPgnTHxPAW7s_Vj5Zlt8,18271
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
 tools/qontract_cli.py,sha256=uH3Ouo5ce_ic36AL3-DAML0XEy447bHYER1EwmnrsVs,86963
@@ -592,8 +592,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc109.dist-info/METADATA,sha256=8Klgd15e7WWklHpOssq6VuL6qlrGVJiBfdEScAiAYZQ,2291
-qontract_reconcile-0.10.1rc109.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc109.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc109.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc109.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc111.dist-info/METADATA,sha256=hUSHlw5n1svKbjQbz_vdzbuN4BZR5ikP2VYpYQR1pYY,2291
+qontract_reconcile-0.10.1rc111.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc111.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc111.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc111.dist-info/RECORD,,

reconcile/jenkins_job_builder.py

@@ -44,11 +44,6 @@ QONTRACT_INTEGRATION = "jenkins-job-builder"
 GENERATE_TYPE = ["jobs", "views"]
 
 
-def get_openshift_saas_deploy_job_name(saas_file_name, env_name, settings):
-    job_template_name = settings["saasDeployJobTemplate"]
-    return f"{job_template_name}-{saas_file_name}-{env_name}"
-
-
 def get_jenkins_configs():
     gqlapi = gql.get_api()
     return gqlapi.query(QUERY)["jenkins_configs"]

reconcile/queries.py

@@ -42,7 +42,6 @@ APP_INTERFACE_SETTINGS_QUERY = """
     vault
     kubeBinary
     mergeRequestGateway
-    saasDeployJobTemplate
     hashLength
     smtp {
       mailAddress

reconcile/terraform_repo.py

@@ -149,7 +149,7 @@ class TerraformRepoIntegration(
         for key in keys:
             if value := state.get(key.lstrip("/"), None):
                 try:
-                    repo = TerraformRepoV1.parse_raw(value)
+                    repo = TerraformRepoV1.parse_obj(value)
                     repo_list.append(repo)
                 except ValidationError as err:
                     logging.error(

reconcile/test/test_terraform_repo.py

@@ -65,30 +65,6 @@ def int_params() -> TerraformRepoIntegrationParams:
     return TerraformRepoIntegrationParams(print_to_file=None, validate_git=False)
 
 
-@pytest.fixture()
-def a_repo_json() -> str:
-    # terraform repo expects a JSON string not a dict so we have to encode a multi-line JSON string
-    return f"""
-            {{
-                "name": "a_repo",
-                "repository": "{A_REPO}",
-                "ref": "{A_REPO_SHA}",
-                "projectPath": "tf",
-                "delete": false,
-                "account": {{
-                    "name": "foo",
-                    "uid": "{AWS_UID}",
-                    "automationToken": {{
-                        "path": "{AUTOMATION_TOKEN_PATH}",
-                        "field": "all",
-                        "version": 1,
-                        "format": null
-                    }}
-                }}
-            }}
-            """
-
-
 @pytest.fixture()
 def state_mock() -> MagicMock:
     return MagicMock(spec=State)
@@ -181,13 +157,31 @@ def test_delete_repo_without_flag(existing_repo, int_params):
         )
 
 
-def test_get_repo_state(s3_state_builder, int_params, existing_repo, a_repo_json):
+def test_get_repo_state(s3_state_builder, int_params, existing_repo):
     state = s3_state_builder(
         {
             "ls": [
                 "/a_repo",
             ],
-            "get": {"a_repo": a_repo_json},
+            "get": {
+                "a_repo": {
+                    "name": "a_repo",
+                    "repository": A_REPO,
+                    "ref": A_REPO_SHA,
+                    "projectPath": "tf",
+                    "delete": False,
+                    "account": {
+                        "name": "foo",
+                        "uid": AWS_UID,
+                        "automationToken": {
+                            "path": AUTOMATION_TOKEN_PATH,
+                            "field": "all",
+                            "version": 1,
+                            "format": None,
+                        },
+                    },
+                }
+            },
         }
     )
 

tools/app_interface_reporter.py

@@ -25,14 +25,7 @@ from reconcile.cli import (
     log_level,
     threaded,
 )
-from reconcile.jenkins_job_builder import (
-    get_openshift_saas_deploy_job_name,
-    init_jjb,
-)
-from reconcile.typed_queries.saas_files import (
-    export_model,
-    get_saas_files,
-)
+from reconcile.jenkins_job_builder import init_jjb
 from reconcile.utils.jjb_client import JJB
 from reconcile.utils.mr import CreateAppInterfaceReporter
 from reconcile.utils.runtime.environment import init_env
@@ -231,7 +224,6 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
     secret_reader = SecretReader(settings)
 
     apps = queries.get_apps()
-    saas_files = [export_model(saas_file) for saas_file in get_saas_files()]
     jjb: JJB = init_jjb(secret_reader)
     jenkins_map = jenkins_base.get_jenkins_map()
     time_limit = date - relativedelta(months=month_delta)
@@ -256,22 +248,6 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
     build_jobs = jjb.get_all_jobs(job_types=["build"])
     jobs_to_get = build_jobs.copy()
 
-    saas_deploy_jobs = []
-    for saas_file in saas_files:
-        saas_file_name = saas_file["name"]
-        for template in saas_file["resourceTemplates"]:
-            for target in template["targets"]:
-                job = {}
-                job["env"] = target["namespace"]["environment"]["name"]
-                job["app"] = target["namespace"]["app"]["name"]
-                job["cluster"] = target["namespace"]["cluster"]["name"]
-                job["namespace"] = target["namespace"]["name"]
-                job["name"] = get_openshift_saas_deploy_job_name(
-                    saas_file_name, job["env"], settings
-                )
-                job["saas_file_name"] = saas_file_name
-                saas_deploy_jobs.append(job)
-
     job_history = get_build_history_pool(
         jenkins_map, jobs_to_get, timestamp_limit, thread_pool_size
     )
@@ -283,84 +259,16 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
         app_name = app["name"]
 
         logging.info(f"collecting post-deploy jobs " f"information for {app_name}")
-        post_deploy_jobs = {}
-        for saas_file in saas_files:
-            if saas_file["app"]["name"] != app_name:
-                continue
-            resource_types = saas_file["managedResourceTypes"]
-
-            # Only jobs of these types are expected to have a
-            # further post-deploy job
-            if not any(
-                [
-                    "Deployment" in resource_types,
-                    "DeploymentConfig" not in resource_types,
-                ]
-            ):
-                continue
-
-            for resource_template in saas_file["resourceTemplates"]:
-                for target in resource_template["targets"]:
-                    cluster = target["namespace"]["cluster"]["name"]
-                    namespace = target["namespace"]["name"]
-                    post_deploy_jobs[cluster] = {}
-                    post_deploy_jobs[cluster][namespace] = False
-
-        for saas_file in saas_files:
-            if saas_file["app"]["name"] != app_name:
-                continue
-            resource_types = saas_file["managedResourceTypes"]
-            if "Job" not in resource_types:
-                continue
-            for resource_template in saas_file["resourceTemplates"]:
-                for target in resource_template["targets"]:
-
-                    cluster = target["namespace"]["cluster"]["name"]
-                    namespace = target["namespace"]["name"]
-
-                    # This block skips the check if the cluster/namespace
-                    # has no Deployment/DeploymentConfig job associated.
-                    if cluster not in post_deploy_jobs:
-                        continue
-                    if namespace not in post_deploy_jobs[cluster]:
-                        continue
-
-                    # Post-deploy job must depend on a openshift-saas-deploy
-                    # job
-                    if target["upstream"] is None or target["upstream"]["name"] is None:
-                        continue
-                    if target["upstream"]["name"].startswith("openshift-saas-deploy-"):
-                        post_deploy_jobs[cluster][namespace] = True
-
-        app["post_deploy_jobs"] = post_deploy_jobs
+        # this is now empty as it referred to post_deploy jobs via Jenkins. This section
+        # should be removed when we publish a new content format or if we get promotion data
+        # differently.
+        app["post_deploy_jobs"] = {}
 
         logging.info(f"collecting promotion history for {app_name}")
         app["promotions"] = {}
-        for job in saas_deploy_jobs:
-            if job["app"] != app_name:
-                continue
-            if job["name"] not in job_history:
-                continue
-            history = job_history[job["name"]]
-            saas_file_name = job["saas_file_name"]
-            if saas_file_name not in app["promotions"]:
-                app["promotions"][saas_file_name] = [
-                    {
-                        "env": job["env"],
-                        "cluster": job["cluster"],
-                        "namespace": job["namespace"],
-                        **history,
-                    }
-                ]
-            else:
-                app["promotions"][saas_file_name].append(
-                    {
-                        "env": job["env"],
-                        "cluster": job["cluster"],
-                        "namespace": job["namespace"],
-                        **history,
-                    }
-                )
+        # this is now empty as it referred to saas files promotions via Jenkins. This section
+        # should be removed when we publish a new content format or if we get promotion data
+        # differently.
 
         logging.info(f"collecting merge activity for {app_name}")
         app["merge_activity"] = {}