feat(bump-version): bump-version support for explicit version (#42970)

Author: bnchrch

.github/workflows/publish-cdk-command-manually.yml

@@ -239,7 +239,7 @@ jobs:
           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 }}
           # There is no pull request number as we do this manually, so will just reference when we started doing it manually for now
-          subcommand: "connectors --concurrency=1 --execute-timeout=3600 --name=source-declarative-manifest bump-version ${{ github.event.inputs.release-type }} 'Bump CDK version to ${{needs.bump-version.outputs.new_cdk_version}}' --pr-number=36501"
+          subcommand: "connectors --concurrency=1 --execute-timeout=3600 --name=source-declarative-manifest bump-version version:${{needs.bump-version.outputs.new_cdk_version}} 'Bump CDK version to ${{needs.bump-version.outputs.new_cdk_version}}' --pr-number=36501"
           python_registry_token: ${{ secrets.PYPI_TOKEN }}
       - name: Commit and Push Changes
         uses: stefanzweifel/git-auto-commit-action@v4

airbyte-ci/connectors/pipelines/README.md

@@ -551,7 +551,7 @@ Bump source-openweather:
 
 | Argument          | Description                                                            |
 | ----------------- | ---------------------------------------------------------------------- |
-| `BUMP_TYPE`       | major, minor or patch                                                  |
+| `BUMP_TYPE`       | major, minor, patch, or version:<explicit-version>                     |
 | `CHANGELOG_ENTRY` | The changelog entry that will get added to the connector documentation |
 
 #### Options
@@ -789,6 +789,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only
 
 | Version | PR                                                         | Description                                                                                                                  |
 |---------| ---------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------|
+| 4.31.0  | [#42970](https://github.com/airbytehq/airbyte/pull/42970)  | Add explicit version set to bump version                                                                   |
 | 4.30.1  | [#43386](https://github.com/airbytehq/airbyte/pull/43386)  | Fix 'format' command usage bug in airbyte-enterprise.                                                                        |
 | 4.30.0  | [#42583](https://github.com/airbytehq/airbyte/pull/42583)  | Updated dependencies                                                                                                         |
 | 4.29.0  | [#42576](https://github.com/airbytehq/airbyte/pull/42576)  | New command: `migrate-to-manifest-only`                                                                                      |

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

@@ -2,15 +2,40 @@
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
+from typing import TYPE_CHECKING
+
 import asyncclick as click
+import semver
 from pipelines.airbyte_ci.connectors.bump_version.pipeline import run_connector_version_bump_pipeline
 from pipelines.airbyte_ci.connectors.context import ConnectorContext
 from pipelines.airbyte_ci.connectors.pipeline import run_connectors_pipelines
 from pipelines.cli.dagger_pipeline_command import DaggerPipelineCommand
 
+if TYPE_CHECKING:
+    from typing import Optional
+
+
+class BumpType(click.ParamType):
+    name = "bump-type"
+
+    def __init__(self) -> None:
+        self.choices = ["patch", "minor", "major"]
+
+    def convert(self, value: str, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> str:
+        if value in self.choices:
+            return value
+        if value.startswith("version:"):
+            version_str = value.split("version:", 1)[1]
+            if semver.VersionInfo.is_valid(version_str):
+                return value
+        self.fail(f"{value} is not a valid bump type. Valid choices are {self.choices} or 'version:<semver-version>'.", param, ctx)
+
+    def __repr__(self) -> str:
+        return "BumpType"
+
 
 @click.command(cls=DaggerPipelineCommand, short_help="Bump a connector version and update its changelog.")
-@click.argument("bump-type", type=click.Choice(["patch", "minor", "major"]))
+@click.argument("bump-type", type=BumpType())
 @click.argument("changelog-entry", type=str)
 @click.option("--pr-number", type=int, help="Pull request number.")
 @click.pass_context

airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/steps/bump_version.py

@@ -137,6 +137,12 @@ def get_bumped_version(version: str | None, bump_type: str) -> str:
             new_version = current_version.bump_minor()
         elif bump_type == "major":
             new_version = current_version.bump_major()
+        elif bump_type.startswith("version:"):
+            version_str = bump_type.split("version:", 1)[1]
+            if semver.VersionInfo.is_valid(version_str):
+                return version_str
+            else:
+                raise ValueError(f"Invalid version: {version_str}")
         else:
             raise ValueError(f"Unknown bump type: {bump_type}")
         return str(new_version)

airbyte-ci/connectors/pipelines/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pipelines"
-version = "4.30.1"
+version = "4.31.0"
 description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
 authors = ["Airbyte <[email protected]>"]