qontract-reconcile 0.9.1rc206__py3-none-any.whl → 0.9.1rc208__py3-none-any.whl

{qontract_reconcile-0.9.1rc206.dist-info → qontract_reconcile-0.9.1rc208.dist-info}/METADATA

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

@@ -116,7 +116,7 @@ reconcile/sentry_helper.py,sha256=Ym-SN16ICtqTgEPh3YOHDLNMtZRQOmhFzthj9XJiBlc,22
 reconcile/service_dependencies.py,sha256=L3GgAFGeqGxqh7_Fzt0L3geS4x2yAQz8zQ_wUiYmPXY,4654
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
 reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
-reconcile/slack_usergroups.py,sha256=I9lj-DCPnsSxM0IofKry0vKiAVaLZSsT-gZGh2YW9rU,26841
+reconcile/slack_usergroups.py,sha256=I6mjJkWZZ_37TyrYg0IEOwFooMHYQiBTo3qFwKAiOyU,27275
 reconcile/sql_query.py,sha256=Xbg6iqotgwwFMx5i5-dMX3L8w_HDn2XLWDkvNC1oG_A,22188
 reconcile/status.py,sha256=tRYtzPFsGETOfN57rcsLIJRl7cZVFkfQXNsUtoeJ7ns,545
 reconcile/template_tester.py,sha256=vZz8GM46waQUGd3OVnhW5OLTqctFMH_Hh1QXxT5hduM,2384
@@ -235,7 +235,7 @@ reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HB
 reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py,sha256=RH92JBJB4HpAv2TzEzy_RVvv2yAEqTSjxa8lju_Rlso,5655
 reconcile/gql_definitions/terraform_cloudflare_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_accounts.py,sha256=LDiLFs6ShmooOOXllNbFr-dN81zC8BOo_LBj4p-g_Dw,3673
-reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=Q3DV3Xa54nw3Q-U_JKHAko6quFCT-NX1mZ5qdL_nQQs,11379
+reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=nCktp5K26yn8rl0Dywfxhhn0oiitLY3O6C4YID8w62c,11607
 reconcile/gql_definitions/terraform_cloudflare_users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_cloudflare_users/app_interface_setting_cloudflare_and_vault.py,sha256=OHfIzX9qAePtRwARYNERuvafwVv0Zy0YUbT83Frt3eA,1984
 reconcile/gql_definitions/terraform_cloudflare_users/terraform_cloudflare_roles.py,sha256=CopEDfqnz6M-rW4kwkbFK_5FvAj7t8NzzffGZUhCTuo,4059
@@ -320,7 +320,7 @@ reconcile/test/test_saasherder.py,sha256=0eH84fV-FBwMWM3McFp9T4oCcXyatOVl18hZyAm
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=L9xoTm2BF76RfMacGgi9bHUQ9RUsobIBU83Yh47xxK8,4914
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=UqMjYt4hPmStJfog06qwJM_afbf-E9uzy-GX741KgTY,5058
-reconcile/test/test_slack_usergroups.py,sha256=FxAuKIS1bx4LiVxNidvirpyHtiZepqMaW3aGxYJn0OI,23609
+reconcile/test/test_slack_usergroups.py,sha256=d1XP3K0SSeGcopMYPhOEm_FVev6IY71hjtJU_IPKIkI,23629
 reconcile/test/test_sql_query.py,sha256=l0QyIflcErIrAwSP8kOIub0jO6oi0Ncuns5IJtnuaxM,455
 reconcile/test/test_terraform_cloudflare_dns.py,sha256=RDDlcxc-nl5V4ATy0dp8Q9iIl-5edCApdpEe4a-Aueo,2696
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=cWNE2UIhz19rLSWdpJG8xRwuEEYoIZWEkDZY7e2QN_g,3426
@@ -339,7 +339,7 @@ reconcile/test/test_utils_disabled_integrations.py,sha256=CIKV51ZIzzgYjPMxCe9fxE
 reconcile/test/test_utils_expiration.py,sha256=HHrjtLD9Wd7KSEO_4JxE5G7FlaaO0d7LTo5F3xt4KgE,2727
 reconcile/test/test_utils_external_resource_spec.py,sha256=o8r0THcXZADcgM4nHUXsgbKZwlW82U0Fq0qd6Ms-hdc,10752
 reconcile/test/test_utils_external_resources.py,sha256=KhY1SH3g-Z6-C1LMlL5igbvmCPH5M1Ed8umYbNzO4FE,7222
-reconcile/test/test_utils_github_api.py,sha256=HhCWqo1MaKckyvbGYbbRZ7k2FPJxfKox3W5Au8UXzjc,665
+reconcile/test/test_utils_github_api.py,sha256=0QUz8D5OVc7zLHq6HEGq9J42vGz27VXxx0Q80m8wphc,2178
 reconcile/test/test_utils_gitlab_api.py,sha256=tuGcmsjUnRoC9O85KI_76V4Okvvkat--vm43VcTIC6M,578
 reconcile/test/test_utils_gpg.py,sha256=ZkSwrrkE9gJdPEa7a3bS8D4I31sJ6Dr96ZQwzZacdh8,3953
 reconcile/test/test_utils_gql.py,sha256=rur8FWMGoTVPqYWhsNVQ4Bk0zHz2e3LIwnvFiCWH7-E,3170
@@ -368,7 +368,7 @@ reconcile/test/test_utils_terraform.py,sha256=ER02AnPHwoV8Ry0sSe1HXvOxFv0cxcblf3
 reconcile/test/test_utils_terraform_client.py,sha256=kKVtMerDRx9Ienw5gQt-t2UZOBefnu7VW7xuGGX0nZM,13578
 reconcile/test/test_utils_terraform_config_client.py,sha256=DhONtE58zrzwcvxEKS0rv1_wN996DYcut_Yk7Y-ptaw,8298
 reconcile/test/test_utils_terrascript_aws_client.py,sha256=uwfY0xQu4WHFjjVgVR4o1xOLB63NO8ZyCo1S6ma30DE,8272
-reconcile/test/test_utils_terrascript_cloudflare_client.py,sha256=bZGkVkzh3Gdl823bZUNDCP40aRKkd0_BxDBn6I5DRKE,19531
+reconcile/test/test_utils_terrascript_cloudflare_client.py,sha256=tmb-wdm9gi8Q8i-OptatfhRhhphpIUb1vA_lwP9C0iU,19855
 reconcile/test/test_utils_terrascript_cloudflare_resources.py,sha256=h1wKs6XIGIjyBa8etuovOkQ_66DBDVUqHLOKpBfWNGQ,754
 reconcile/test/test_vault_replication.py,sha256=BKDuwy9C0dsb4n8KRwfZDGlEyXCKAZMMKOU-pS4ZWu8,16865
 reconcile/test/test_vault_utils.py,sha256=vbJnc89XAuE07qbTuWxHM5o9F6R9SO5aHXA38fwxT7A,1122
@@ -410,8 +410,8 @@ reconcile/utils/external_resource_spec.py,sha256=epSXhJU8PFmX0-YJWr4fre5mxbRDOyO
 reconcile/utils/external_resources.py,sha256=301hqVVDt78i88VLFTkSc5mq1KvVP4OiHh_DQX-B1G8,6492
 reconcile/utils/git.py,sha256=kgjN93MMB5mnkuNb1n53f5kldGGf5u0pBHj9YJbiE_c,1455
 reconcile/utils/git_secrets.py,sha256=Wot8ILeTyUhyxEDr15sr1KiRNZ3YsFlr3H8bJoYt7_4,2169
-reconcile/utils/github_api.py,sha256=jK4OKIVhmNU-UsRWqwfX3npwWp9kUXAmsIVUJk8b-Do,1537
-reconcile/utils/gitlab_api.py,sha256=SWF4BHBgIC5s_YSwSb-hNAVHoG_KbX1mMmt0Lxr9p1Q,24375
+reconcile/utils/github_api.py,sha256=gkcjT3qHco001CDbcXY-yBb2MXzBjV1njRx6-HB2a_s,1901
+reconcile/utils/gitlab_api.py,sha256=r0DE0uD5S7VzOirLHFxVQ-Kk9o2GZoDlBnxFZzrcxX4,24580
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=gs0prtFY_Jm_-o4Fobz4hmulW9NL6KYkcrCuyXIIn1s,11622
 reconcile/utils/helm.py,sha256=3b1AwIygMQA5e_WCbXzILaqZiRrGkKPmDqir2V_T0Zw,1070
@@ -497,7 +497,7 @@ reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79
 reconcile/utils/terraform/config_client.py,sha256=t4novdX7GeYPMYms97C_BBtLmt0M8CJCmCT7QHENwxg,4687
 reconcile/utils/terrascript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/terrascript/cloudflare_client.py,sha256=ip8UAM7Kq25sB3WWtw3aplJAHqLhNFjFsFArYT6YrSQ,9568
-reconcile/utils/terrascript/cloudflare_resources.py,sha256=eBnX6dMEEnmu040en2Rw1M-C2jH-IxxUmnjVeoDRdL8,14495
+reconcile/utils/terrascript/cloudflare_resources.py,sha256=GM8nHTbqUej3mjVGrv34l9GY3cXU3fDGFN3QU9LWm7Q,13896
 reconcile/utils/terrascript/models.py,sha256=x9HReI0k71MHBpRTvvmPlE0G6rri5GTzPXM9cqyTWm0,475
 reconcile/utils/terrascript/resources.py,sha256=bQzglnO41KZZEIeXYgi-qlup1p8R03Qyx_V944LRPsc,1391
 release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -513,8 +513,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.9.1rc206.dist-info/METADATA,sha256=l4N7RKEpsnTtSLNX-fTe8g1tbhHEm1z5DX6bTt_GAt8,2248
-qontract_reconcile-0.9.1rc206.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc206.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc206.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc206.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc208.dist-info/METADATA,sha256=a9IgT3fr73kk3vGi-rWRl2nJpI0bhIHCKxfcRqCkeGY,2248
+qontract_reconcile-0.9.1rc208.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc208.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc208.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc208.dist-info/RECORD,,

reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py

@@ -148,6 +148,9 @@ query TerraformCloudflareResources {
             ownership_challenge
             dataset
             frequency
+            job_name: name
+            filter
+            kind
           }
           ... on NamespaceTerraformResourceLogpullRetention_v1
           {
@@ -304,6 +307,9 @@ class NamespaceTerraformResourceLogpushJobV1(NamespaceTerraformResourceCloudflar
     ownership_challenge: Optional[str] = Field(..., alias="ownership_challenge")
     dataset: Optional[str] = Field(..., alias="dataset")
     frequency: Optional[str] = Field(..., alias="frequency")
+    job_name: Optional[str] = Field(..., alias="job_name")
+    filter: Optional[str] = Field(..., alias="filter")
+    kind: Optional[str] = Field(..., alias="kind")
 
 
 class NamespaceTerraformResourceLogpullRetentionV1(

reconcile/slack_usergroups.py

@@ -37,6 +37,9 @@ from reconcile.gql_definitions.slack_usergroups.users import UserV1
 from reconcile.gql_definitions.slack_usergroups.users import query as users_query
 from reconcile.openshift_base import user_has_cluster_access
 from reconcile.slack_base import get_slackapi
+from reconcile.typed_queries.app_interface_vault_settings import (
+    get_app_interface_vault_settings,
+)
 from reconcile.typed_queries.pagerduty_instances import get_pagerduty_instances
 from reconcile.utils import gql
 from reconcile.utils.disabled_integrations import integration_is_enabled
@@ -44,7 +47,7 @@ from reconcile.utils.exceptions import (
     AppInterfaceSettingsError,
     UnknownError,
 )
-from reconcile.utils.github_api import GithubApi
+from reconcile.utils.github_api import GithubRepositoryApi
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.pagerduty_api import (
     PagerDutyApiException,
@@ -52,7 +55,10 @@ from reconcile.utils.pagerduty_api import (
     get_pagerduty_map,
 )
 from reconcile.utils.repo_owners import RepoOwners
-from reconcile.utils.secret_reader import SecretReader
+from reconcile.utils.secret_reader import (
+    SecretReader,
+    create_secret_reader,
+)
 from reconcile.utils.slack_api import (
     SlackApi,
     SlackApiError,
@@ -64,18 +70,25 @@ QONTRACT_INTEGRATION = "slack-usergroups"
 error_occurred = False
 
 
-def get_git_api(url: str) -> Union[GithubApi, GitLabApi]:
+def get_git_api(url: str) -> Union[GithubRepositoryApi, GitLabApi]:
     """Return GitHub/GitLab API based on url."""
     parsed_url = urlparse(url)
-    settings = queries.get_app_interface_settings()
 
     if parsed_url.hostname:
         if "github" in parsed_url.hostname:
+            vault_settings = get_app_interface_vault_settings()
+            secret_reader = create_secret_reader(use_vault=vault_settings.vault)
             instance = queries.get_github_instance()
-            return GithubApi(instance, repo_url=url, settings=settings)
+            token = secret_reader.read(instance["token"])
+
+            return GithubRepositoryApi(
+                repo_url=url,
+                token=token,
+            )
         if "gitlab" in parsed_url.hostname:
+            settings = queries.get_app_interface_settings()
             instance = queries.get_gitlab_instance()
-            return GitLabApi(instance, project_url=url, settings=settings)
+            return GitLabApi(instance=instance, project_url=url, settings=settings)
 
     raise ValueError(f"Unable to handle URL: {url}")
 
@@ -294,7 +307,7 @@ def get_slack_usernames_from_owners(
         if isinstance(repo_cli, GitLabApi):
             user_key = "org_username"
             missing_user_log_method = logging.warning
-        elif isinstance(repo_cli, GithubApi):
+        elif isinstance(repo_cli, GithubRepositoryApi):
             user_key = "github_username"
             missing_user_log_method = logging.debug
         else:

reconcile/test/test_slack_usergroups.py

@@ -46,7 +46,7 @@ from reconcile.slack_usergroups import (
     get_users,
 )
 from reconcile.utils import repo_owners
-from reconcile.utils.github_api import GithubApi
+from reconcile.utils.github_api import GithubRepositoryApi
 from reconcile.utils.pagerduty_api import PagerDutyMap
 from reconcile.utils.slack_api import SlackApi
 
@@ -216,7 +216,7 @@ def test_get_usernames_from_pagerduty(user: UserV1) -> None:
 def test_get_slack_usernames_from_owners(mocker: MockerFixture, user: UserV1) -> None:
     mocker.patch(
         "reconcile.slack_usergroups.get_git_api"
-    ).return_value = create_autospec(GithubApi)
+    ).return_value = create_autospec(GithubRepositoryApi)
     mock_repo_owner = create_autospec(repo_owners.RepoOwners)
     mock_repo_owner.return_value.get_root_owners.return_value = {
         "approvers": ["approver1"],

reconcile/test/test_utils_github_api.py

@@ -1,18 +1,73 @@
-from unittest import TestCase
-from unittest.mock import patch
+from unittest.mock import (
+    MagicMock,
+    create_autospec,
+)
 
-from requests.exceptions import ConnectTimeout
+from github import Github
+from github.ContentFile import ContentFile
+from github.Repository import Repository
 
-from reconcile.utils.github_api import GithubApi
+from reconcile.utils.github_api import GithubRepositoryApi
 
 
-class TestGithubApi(TestCase):
-    @patch("reconcile.utils.github_api.GH_BASE_URL", "http://198.18.0.1")
-    @patch("reconcile.utils.github_api.SecretReader", autospec=True)
-    def test_github_client_timeout(self, secret_reader_mock):
-        secret_reader_mock.return_value.read.return_value = "0000000"
-        instance = {
-            "token": "non-existent-token",
-        }
-        with self.assertRaises(ConnectTimeout):
-            GithubApi(instance, repo_url="repo", settings=None, timeout=1)
+def github(multiple_contents: bool = False):
+    github_mock = create_autospec(spec=Github)
+    repo_mock = create_autospec(spec=Repository)
+    get_content_mock = MagicMock()
+    repo_mock.get_contents = get_content_mock
+    content_file = create_autospec(spec=ContentFile)
+    content_file.decoded_content = b"test"
+    get_content_mock.side_effect = [content_file]
+    if multiple_contents:
+        get_content_mock.side_effect = [[content_file, content_file]]
+    github_mock.get_repo = MagicMock()
+    github_mock.get_repo.side_effect = [repo_mock]
+    return github_mock
+
+
+def test_create():
+    gh = github()
+    GithubRepositoryApi(
+        repo_url="https://github.com/my/repo",
+        token="some-token",
+        github=gh,
+    )
+    gh.get_repo.assert_called_once_with("my/repo")
+
+
+def test_get_file_default():
+    api = GithubRepositoryApi(
+        repo_url="https://github.com/my/repo", token="some-token", github=github()
+    )
+    content = api.get_file(path="some/path")
+    assert content == b"test"
+    api._repo.get_contents.assert_called_once_with(  # type: ignore[attr-defined]
+        path="some/path",
+        ref="master",
+    )
+
+
+def test_get_file_with_ref():
+    api = GithubRepositoryApi(
+        repo_url="https://github.com/my/repo", token="some-token", github=github()
+    )
+    content = api.get_file(path="some/path", ref="some-ref")
+    assert content == b"test"
+    api._repo.get_contents.assert_called_once_with(  # type: ignore[attr-defined]
+        path="some/path",
+        ref="some-ref",
+    )
+
+
+def test_get_file_list_returned():
+    api = GithubRepositoryApi(
+        repo_url="https://github.com/my/repo",
+        token="some-token",
+        github=github(multiple_contents=True),
+    )
+    content = api.get_file(path="some/path")
+    assert content is None
+    api._repo.get_contents.assert_called_once_with(  # type: ignore[attr-defined]
+        path="some/path",
+        ref="master",
+    )

reconcile/test/test_utils_terrascript_cloudflare_client.py

@@ -168,6 +168,7 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
             "ownership_challenge": "some-challenge",
             "dataset": "http_requests",
             "frequency": "high",
+            "kind": "edge",
         },
         {},
     )
@@ -183,6 +184,8 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
             "ownership_challenge": "some-challenge",
             "dataset": "http_requests",
             "frequency": "high",
+            "job_name": "Logpush job for account",
+            "filter": '{"key":"BotScore","operator":"lt","value":"30"}',
         },
         {},
     )
@@ -322,6 +325,7 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
                     "frequency": "high",
                     "logpull_options": "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                     "ownership_challenge": "some-challenge",
+                    "kind": "edge",
                 },
                 "logpush_job_account": {
                     "account_id": "${var.account_id}",
@@ -331,6 +335,8 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
                     "frequency": "high",
                     "logpull_options": "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                     "ownership_challenge": "some-challenge",
+                    "name": "Logpush job for account",
+                    "filter": '{"key":"BotScore","operator":"lt","value":"30"}',
                 },
             },
             "cloudflare_logpull_retention": {

reconcile/utils/github_api.py

@@ -1,47 +1,63 @@
 import os
 from pathlib import Path
+from typing import Optional
 from urllib.parse import urlparse
 
-import github
+from github import (
+    Github,
+    UnknownObjectException,
+)
 from sretoolbox.utils import retry
 
-from reconcile.utils.secret_reader import SecretReader
-
 GH_BASE_URL = os.environ.get("GITHUB_API", "https://api.github.com")
 
 
-class GithubApi:
+class GithubRepositoryApi:
     """
     Github client implementing the common interfaces used in
     the qontract-reconcile integrations.
 
-    :param instance: the Github instance and provided
-                     by the app-interface
     :param repo_url: the Github repository URL
-    :param settings: the app-interface settings
-    :type instance: dict
+    :param token: auth token for Github
     :type repo_url: str
-    :type settings: dict
+    :type token: str
     """
 
-    def __init__(self, instance, repo_url, settings, timeout=30):
+    def __init__(
+        self,
+        repo_url: str,
+        token: str,
+        timeout: int = 30,
+        github: Optional[Github] = None,
+    ):
         parsed_repo_url = urlparse(repo_url)
         repo = parsed_repo_url.path.strip("/")
-        secret_reader = SecretReader(settings=settings)
-        token = secret_reader.read(instance["token"])
-        git_cli = github.Github(token, base_url=GH_BASE_URL, timeout=timeout)
-        self.repo = git_cli.get_repo(repo)
 
-    def get_repository_tree(self, ref="master"):
+        git_cli = github
+        if not git_cli:
+            git_cli = Github(token, base_url=GH_BASE_URL, timeout=timeout)
+        self._repo = git_cli.get_repo(repo)
+
+    def get_repository_tree(self, ref: str = "master") -> list[dict[str, str]]:
         tree_items = []
-        for item in self.repo.get_git_tree(sha=ref, recursive=True).tree:
+        for item in self._repo.get_git_tree(sha=ref, recursive=True).tree:
             tree_item = {"path": item.path, "name": Path(item.path).name}
             tree_items.append(tree_item)
         return tree_items
 
     @retry()
-    def get_file(self, path, ref="master"):
+    def get_file(self, path: str, ref: str = "master") -> Optional[bytes]:
         try:
-            return self.repo.get_contents(path, ref).decoded_content
-        except github.UnknownObjectException:
+            content = self._repo.get_contents(path=path, ref=ref)
+            if isinstance(content, list):
+                # TODO: we should probably raise an exception here
+                # or handle this properly
+                # -> for now staying backwards compatible
+                return None
+            return content.decoded_content
+        except UnknownObjectException:
             return None
+
+    @retry()
+    def get_commit_sha(self, ref: str) -> str:
+        return self._repo.get_commit(sha=ref).sha

reconcile/utils/gitlab_api.py

@@ -662,3 +662,8 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
                 continue
             return comment
         return None
+
+    def get_commit_sha(self, ref: str, repo_url: str) -> str:
+        project = self.gl.get_project(repo_url)
+        commits = project.commits.list(ref_name=ref, per_page=1)
+        return commits[0].id

reconcile/utils/terrascript/cloudflare_resources.py

@@ -27,9 +27,13 @@ from terrascript.resource import (
 )
 
 from reconcile import queries
+from reconcile.typed_queries.app_interface_vault_settings import (
+    get_app_interface_vault_settings,
+)
 from reconcile.utils.external_resource_spec import ExternalResourceSpec
 from reconcile.utils.external_resources import ResourceValueResolver
-from reconcile.utils.github_api import GithubApi
+from reconcile.utils.github_api import GithubRepositoryApi
+from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.terraform import safe_resource_id
 from reconcile.utils.terrascript.resources import TerrascriptResource
 
@@ -118,10 +122,13 @@ class CloudflareWorkerScriptTerrascriptResource(TerrascriptResource):
         gh_repo = values["content_from_github"]["repo"]
         gh_path = values["content_from_github"]["path"]
         gh_ref = values["content_from_github"]["ref"]
-        gh = GithubApi(
-            queries.get_github_instance(),
-            gh_repo,
-            queries.get_app_interface_settings(),
+        instance = queries.get_github_instance()
+        vault_settings = get_app_interface_vault_settings()
+        secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+        token = secret_reader.read(instance["token"])
+        gh = GithubRepositoryApi(
+            repo_url=gh_repo,
+            token=token,
         )
         content = gh.get_file(gh_path, gh_ref)
         if content is None:
@@ -295,44 +302,21 @@ class CloudflareLogpushJob(TerrascriptResource):
     def populate(self) -> list[Union[Resource, Output, Data]]:
         resources = []
         values = ResourceValueResolver(self._spec).resolve()
-        destination_conf = values.get("destination_conf")
-        zone = values.get("zone_name")
-        enabled = values.get("enabled")
-        logpull_options = values.get("logpull_options")
-        dataset = values.get("dataset")
-        frequency = values.get("frequency")
-        ownership_challenge = values.get("ownership_challenge")
+        zone = values.pop("zone_name", None)
+        name = values.pop("job_name", None)
+
+        if name:
+            values["name"] = name
 
         if zone:
             resources.append(
                 self.cloudflare_zone(zone, name=zone, account_id="${var.account_id}")
             )
-            resources.append(
-                cloudflare_logpush_job(
-                    self._spec.identifier,
-                    enabled=enabled,
-                    logpull_options=logpull_options,
-                    ownership_challenge=ownership_challenge,
-                    dataset=dataset,
-                    frequency=frequency,
-                    destination_conf=destination_conf,
-                    zone_id=f"${{data.cloudflare_zone.{zone}.id}}",
-                )
-            )
+            values["zone_id"] = f"${{data.cloudflare_zone.{zone}.id}}"
         else:
-            resources.append(
-                cloudflare_logpush_job(
-                    self._spec.identifier,
-                    enabled=enabled,
-                    logpull_options=logpull_options,
-                    ownership_challenge=ownership_challenge,
-                    dataset=dataset,
-                    frequency=frequency,
-                    destination_conf=destination_conf,
-                    account_id="${var.account_id}",
-                )
-            )
+            values["account_id"] = "${var.account_id}"
 
+        resources.append(cloudflare_logpush_job(self._spec.identifier, **values))
         return resources