Only use one token

Author: clnoll

.github/actions/run-airbyte-ci/action.yml

@@ -10,9 +10,6 @@ inputs:
   github_token:
     description: "GitHub token"
     required: false
-  github_maintenance_token:
-    description: "GitHub maintenance token"
-    required: false
   dagger_cloud_token:
     description: "Dagger Cloud token"
     required: false
@@ -124,7 +121,6 @@ runs:
         CI_GIT_REPO_URL: ${{ inputs.git_repo_url }}
         CI_GIT_REVISION: ${{ inputs.git_revision || github.sha }}
         CI_GITHUB_ACCESS_TOKEN: ${{ inputs.github_token }}
-        CI_GITHUB_MAINTENANCE_TOKEN: ${{ inputs.github_maintenance_token }}
         CI_JOB_KEY: ${{ inputs.ci_job_key }}
         CI_REPORT_BUCKET_NAME: ${{ inputs.report_bucket_name }}
         DAGGER_CLOUD_TOKEN: "${{ inputs.dagger_cloud_token }}"

.github/workflows/connectors_tests.yml

@@ -131,7 +131,6 @@ jobs:
           git_branch: ${{ github.head_ref }}
           git_revision: ${{ steps.fetch_last_commit_id_pr.outputs.commit_id }}
           github_token: ${{ env.PAT }}
-          github_maintenance_token: ${{ secrets.GH_PAT_MAINTENANCE_OSS }}
           s3_build_cache_access_key_id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           s3_build_cache_secret_key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           # A connector test can't take more than 5 hours to run (5 * 60 * 60 = 18000 seconds)

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/context.py

@@ -50,7 +50,6 @@ def __init__(
         ci_gcp_credentials: Optional[Secret] = None,
         ci_git_user: Optional[str] = None,
         ci_github_access_token: Optional[Secret] = None,
-        ci_github_maintenance_token: Optional[Secret] = None,
         connector_acceptance_test_image: str = DEFAULT_CONNECTOR_ACCEPTANCE_TEST_IMAGE,
         gha_workflow_run_url: Optional[str] = None,
         dagger_logs_url: Optional[str] = None,
@@ -135,7 +134,6 @@ def __init__(
             ci_gcp_credentials=ci_gcp_credentials,
             ci_git_user=ci_git_user,
             ci_github_access_token=ci_github_access_token,
-            ci_github_maintenance_token=ci_github_maintenance_token,
             run_step_options=run_step_options,
             enable_report_auto_open=enable_report_auto_open,
             secret_stores=secret_stores,

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/commands.py

@@ -146,7 +146,6 @@ async def test(
             git_repo_url=ctx.obj["git_repo_url"],
             ci_git_user=ctx.obj["ci_git_user"],
             ci_github_access_token=ctx.obj["ci_github_access_token"],
-            ci_github_maintenance_token=ctx.obj["ci_github_maintenance_token"],
             ci_report_bucket=ctx.obj["ci_report_bucket_name"],
             report_output_prefix=ctx.obj["report_output_prefix"],
             gha_workflow_run_url=ctx.obj.get("gha_workflow_run_url"),

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py

@@ -714,17 +714,16 @@ async def _build_test_container(self, target_container_id: str) -> Container:
                     ]
                 )
                 .with_secret_variable(
-                    "CI_GITHUB_MAINTENANCE_TOKEN",
+                    "CI_GITHUB_ACCESS_TOKEN",
                     self.context.dagger_client.set_secret(
-                        "CI_GITHUB_MAINTENANCE_TOKEN",
-                        self.context.ci_github_maintenance_token.value if self.context.ci_github_maintenance_token else "",
+                        "CI_GITHUB_ACCESS_TOKEN", self.context.ci_github_access_token.value if self.context.ci_github_access_token else ""
                     ),
                 )
                 .with_exec(
                     [
                         "/bin/sh",
                         "-c",
-                        f"poetry config http-basic.airbyte-platform-internal-source {self.github_user} $CI_GITHUB_MAINTENANCE_TOKEN",
+                        f"poetry config http-basic.airbyte-platform-internal-source {self.github_user} $CI_GITHUB_ACCESS_TOKEN",
                     ]
                 )
                 # Add GCP credentials from the environment and point google to their location (also required for connection-retriever)

airbyte-ci/connectors/pipelines/pipelines/cli/airbyte_ci.py

@@ -164,7 +164,6 @@ def is_current_process_wrapped_by_dagger_run() -> bool:
 @click.option("--pull-request-number", envvar="PULL_REQUEST_NUMBER", type=int)
 @click.option("--ci-git-user", default="octavia-squidington-iii", envvar="CI_GIT_USER", type=str)
 @click.option("--ci-github-access-token", envvar="CI_GITHUB_ACCESS_TOKEN", type=str, callback=wrap_in_secret)
-@click.option("--ci-github-maintenance-token", envvar="CI_GITHUB_MAINTENANCE_TOKEN", type=str, callback=wrap_in_secret)
 @click.option("--ci-report-bucket-name", envvar="CI_REPORT_BUCKET_NAME", type=str)
 @click.option("--ci-artifact-bucket-name", envvar="CI_ARTIFACT_BUCKET_NAME", type=str)
 @click.option(

airbyte-ci/connectors/pipelines/pipelines/models/contexts/pipeline_context.py

@@ -83,7 +83,6 @@ def __init__(
         ci_gcp_credentials: Optional[Secret] = None,
         ci_git_user: Optional[str] = None,
         ci_github_access_token: Optional[Secret] = None,
-        ci_github_maintenance_token: Optional[Secret] = None,
         run_step_options: RunStepOptions = RunStepOptions(),
         enable_report_auto_open: bool = True,
         secret_stores: Dict[str, SecretStore] | None = None,
@@ -130,7 +129,6 @@ def __init__(
         self.ci_report_bucket = ci_report_bucket
         self.ci_git_user = ci_git_user
         self.ci_github_access_token = ci_github_access_token
-        self.ci_github_maintenance_token = ci_github_maintenance_token
         self.started_at = None
         self.stopped_at = None
         self.secrets_to_mask = []