implement version bump comment

Author: alafanechere

airbyte-ci/connectors/pipelines/pipelines/actions/environments.py

@@ -88,7 +88,7 @@ def with_testing_dependencies(context: PipelineContext) -> Container:
     )
 
 
-def with_git(dagger_client, ci_github_access_token_secret, ci_git_user) -> Container:
+def with_git(dagger_client, ci_git_user: str = "octavia") -> Container:
     return (
         dagger_client.container()
         .from_("alpine:latest")
@@ -103,7 +103,6 @@ def with_git(dagger_client, ci_github_access_token_secret, ci_git_user) -> Conta
                 ]
             )
         )
-        .with_secret_variable("GITHUB_TOKEN", ci_github_access_token_secret)
         .with_workdir("/ghcli")
         .with_exec(
             sh_dash_c(

airbyte-ci/connectors/pipelines/pipelines/commands/groups/connectors.py

@@ -15,8 +15,9 @@
 from pipelines import main_logger
 from pipelines.bases import ConnectorWithModifiedFiles
 from pipelines.builds import run_connector_build_pipeline
+from pipelines.connector_changes.base_image_version_upgrade import run_connector_base_image_upgrade_pipeline
 from pipelines.connector_changes.format import run_connector_format_pipeline
-from pipelines.connector_changes.metadata_update import run_connector_base_image_upgrade_pipeline
+from pipelines.connector_changes.version_bump import run_connector_version_bump_pipeline
 from pipelines.contexts import ConnectorContext, ContextState, PublishConnectorContext
 from pipelines.github import update_global_commit_status_check_for_tests
 from pipelines.pipelines.connectors import run_connectors_pipelines
@@ -574,6 +575,70 @@ def upgrade_base_image(ctx: click.Context, commit_and_push: bool, export_to_host
     return True
 
 
+@connectors.command(cls=DaggerPipelineCommand, help="Upgrades the base image version used by the selected connectors..")
+@click.argument("bump-type", type=click.Choice(["patch", "minor", "major"]))
+@click.argument("pull-request-number", type=str)
+@click.argument("changelog-entry", type=str)
+@click.option("--commit-and-push", default=False)
+@click.option("--export-to-host", default=True)
+@click.option("--set-if-exists", default=True)
+@click.pass_context
+def bump_version(
+    ctx: click.Context,
+    bump_type: str,
+    pull_request_number: str,
+    changelog_entry: str,
+    commit_and_push: bool,
+    export_to_host: bool,
+    set_if_exists: bool,
+) -> bool:
+    """Upgrades the base image version used by the selected connectors."""
+
+    if ctx.obj["is_local"] and commit_and_push:
+        raise click.UsageError("You can't use the --commit-and-push option in local mode.")
+    if ctx.obj["is_local"] and not export_to_host:
+        main_logger.warning("Not using the --export-to-host option in local mode will not change anything on your local repo.")
+
+    connectors_contexts = [
+        ConnectorContext(
+            pipeline_name=f"Upgrade base image versions of connector {connector.technical_name}",
+            connector=connector,
+            is_local=ctx.obj["is_local"],
+            git_branch=ctx.obj["git_branch"],
+            git_revision=ctx.obj["git_revision"],
+            ci_report_bucket=ctx.obj["ci_report_bucket_name"],
+            report_output_prefix=ctx.obj["report_output_prefix"],
+            use_remote_secrets=ctx.obj["use_remote_secrets"],
+            gha_workflow_run_url=ctx.obj.get("gha_workflow_run_url"),
+            dagger_logs_url=ctx.obj.get("dagger_logs_url"),
+            pipeline_start_timestamp=ctx.obj.get("pipeline_start_timestamp"),
+            ci_context=ctx.obj.get("ci_context"),
+            ci_gcs_credentials=ctx.obj["ci_gcs_credentials"],
+            ci_git_user=ctx.obj["ci_git_user"],
+            ci_github_access_token=ctx.obj["ci_github_access_token"],
+            open_report_in_browser=False,
+        )
+        for connector in ctx.obj["selected_connectors_with_modified_files"]
+    ]
+
+    anyio.run(
+        run_connectors_pipelines,
+        connectors_contexts,
+        run_connector_version_bump_pipeline,
+        "Version bump pipeline pipeline",
+        ctx.obj["concurrency"],
+        ctx.obj["dagger_logs_path"],
+        ctx.obj["execute_timeout"],
+        commit_and_push,
+        export_to_host,
+        bump_type,
+        changelog_entry,
+        pull_request_number,
+    )
+
+    return True
+
+
 def log_selected_connectors(selected_connectors_with_modified_files: List[ConnectorWithModifiedFiles]) -> None:
     if selected_connectors_with_modified_files:
         selected_connectors_names = [c.technical_name for c in selected_connectors_with_modified_files]

airbyte-ci/connectors/pipelines/pipelines/connector_changes/metadata_update.py renamed to airbyte-ci/connectors/pipelines/pipelines/connector_changes/base_image_version_upgrade.py

@@ -1,36 +1,17 @@
 #
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
-from abc import abstractmethod
-from typing import Dict, Optional
+from typing import Optional
 
 import yaml
 from base_images import python
-from connector_ops.utils import METADATA_FILE_NAME, ConnectorLanguage
+from connector_ops.utils import ConnectorLanguage
 from dagger import Container
 from pipelines.bases import ConnectorReport, StepResult, StepStatus
-from pipelines.connector_changes.common import ConnectorChangeStep
+from pipelines.connector_changes.common import MetadataUpdateStep
 from pipelines.contexts import ConnectorContext
 
 
-class MetadataUpdateStep(ConnectorChangeStep):
-    @property
-    def metadata_path(self) -> str:
-        return str(self.context.connector.code_directory / METADATA_FILE_NAME)
-
-    async def get_current_metadata(self) -> Dict:
-        return yaml.safe_load(await self.container_with_airbyte_repo.file(self.metadata_path).contents())
-
-    @abstractmethod
-    async def get_updated_metadata(self) -> str:
-        raise NotImplementedError()
-
-    async def get_container_with_updated_metadata(self, container_with_airbyte_repo: Container) -> Container:
-        new_metadata = await self.get_updated_metadata()
-        absolute_path_to_new_metadata = f"/airbyte/{self.context.connector.code_directory}/{METADATA_FILE_NAME}"
-        return container_with_airbyte_repo.with_new_file(absolute_path_to_new_metadata, new_metadata)
-
-
 class UpgradeBaseImageMetadata(MetadataUpdateStep):
     title = "Upgrade the base image to the latest version in metadata.yaml"
     latest_python_version = python.VERSION_REGISTRY.latest_version.name_with_tag

airbyte-ci/connectors/pipelines/pipelines/connector_changes/common.py

@@ -2,8 +2,11 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 from abc import abstractmethod
-from typing import Optional
+from pathlib import Path
+from typing import Dict, List, Optional
 
+import yaml
+from connector_ops.utils import METADATA_FILE_NAME
 from dagger import Container, Directory, Secret
 from pipelines.actions import environments
 from pipelines.bases import Step, StepResult
@@ -28,6 +31,10 @@ def __init__(
         self.push = push
         self.skip_ci = skip_ci
 
+    @property
+    def modified_paths(self) -> List[str]:
+        return [self.context.connector.code_directory]
+
     async def get_airbyte_local_repo(self) -> Directory:
         return self.context.get_repo_dir()
 
@@ -54,13 +61,14 @@ def commit_message(self) -> str:
     async def get_fresh_git_container(self, authenticated: bool = False) -> Container:
         if not authenticated:
             return (
-                environments.with_git(self.dagger_client, self.context.ci_github_access_token_secret, self.context.ci_git_user)
+                environments.with_git(self.dagger_client, self.context.ci_git_user)
                 .with_mounted_directory("/airbyte", (await self.get_airbyte_repo()))
                 .with_workdir("/airbyte")
             )
         else:
             return (
                 await self.get_fresh_git_container(authenticated=False)
+                .with_secret_variable("GITHUB_TOKEN", self.context.ci_github_access_token_secret)
                 .with_secret_variable("AUTHENTICATED_REPO_URL", self.authenticated_repo_url)
                 .with_exec(environments.sh_dash_c(["git remote set-url origin $AUTHENTICATED_REPO_URL"]))
             )
@@ -91,12 +99,37 @@ async def _run(self) -> StepResult:
             self.container_with_airbyte_repo = self.push(self.container_with_airbyte_repo)
             self.logger.info("Changes pushed.")
         if self.export_changes_to_host:
-            await self.container_with_airbyte_repo.directory(str(self.context.connector.code_directory)).export(
-                str(self.context.connector.code_directory)
-            )
+            for modified_path in self.modified_paths:
+                if modified_path.is_dir():
+                    await self.container_with_airbyte_repo.directory(str(modified_path)).export(str(modified_path))
+                else:
+                    await self.container_with_airbyte_repo.file(str(modified_path)).export(str(modified_path))
+
             self.logger.info("Changes exported back to host.")
         return change_result
 
     @abstractmethod
     async def make_connector_change(self, container_with_airbyte_repo) -> StepResult:
         raise NotImplementedError()
+
+
+class MetadataUpdateStep(ConnectorChangeStep):
+    @property
+    def modified_paths(self) -> List[Path]:
+        return [self.context.connector.code_directory / METADATA_FILE_NAME]
+
+    @property
+    def metadata_path(self) -> str:
+        return str(self.context.connector.code_directory / METADATA_FILE_NAME)
+
+    async def get_current_metadata(self) -> Dict:
+        return yaml.safe_load(await self.container_with_airbyte_repo.file(self.metadata_path).contents())
+
+    @abstractmethod
+    async def get_updated_metadata(self) -> str:
+        raise NotImplementedError()
+
+    async def get_container_with_updated_metadata(self, container_with_airbyte_repo: Container) -> Container:
+        new_metadata = await self.get_updated_metadata()
+        absolute_path_to_new_metadata = f"/airbyte/{self.context.connector.code_directory}/{METADATA_FILE_NAME}"
+        return container_with_airbyte_repo.with_new_file(absolute_path_to_new_metadata, new_metadata)