Skip to content

Commit ec8d7e4

Browse files
authored
metadata-service[lib]: skip dockerImageTag decrement validation on pre-release (#44580)
1 parent c54d1a6 commit ec8d7e4

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

airbyte-ci/connectors/metadata_service/lib/metadata_service/validators/metadata_validator.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ def validate_pypi_only_for_python(
178178
def validate_docker_image_tag_is_not_decremented(
179179
metadata_definition: ConnectorMetadataDefinitionV0, _validator_opts: ValidatorOptions
180180
) -> ValidationResult:
181+
if _validator_opts and _validator_opts.prerelease_tag:
182+
return True, None
181183
docker_image_name = get(metadata_definition, "data.dockerRepository")
182184
if not docker_image_name:
183185
return False, "The dockerRepository field is not set"
@@ -193,7 +195,10 @@ def validate_docker_image_tag_is_not_decremented(
193195
current_semver_version = semver.Version.parse(docker_image_tag)
194196
latest_released_semver_version = semver.Version.parse(latest_released_version)
195197
if current_semver_version < latest_released_semver_version:
196-
return False, f"The dockerImageTag value can't be decremented: it should be equal to or above {latest_released_version}."
198+
return (
199+
False,
200+
f"The dockerImageTag value ({current_semver_version}) can't be decremented: it should be equal to or above {latest_released_version}.",
201+
)
197202
return True, None
198203

199204

airbyte-ci/connectors/metadata_service/lib/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "metadata-service"
3-
version = "0.13.0"
3+
version = "0.13.1"
44
description = ""
55
authors = ["Ben Church <[email protected]>"]
66
readme = "README.md"

airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ def test_validation_fail_on_docker_image_tag_decrement(metadata_definition, decr
7171
metadata_definition.data.dockerImageTag = decremented_version
7272
success, error_message = metadata_validator.validate_docker_image_tag_is_not_decremented(metadata_definition, None)
7373
assert not success
74-
assert error_message == f"The dockerImageTag value can't be decremented: it should be equal to or above {current_version}."
74+
assert (
75+
error_message
76+
== f"The dockerImageTag value ({decremented_version}) can't be decremented: it should be equal to or above {current_version}."
77+
)
7578

7679

7780
def test_validation_pass_on_docker_image_tag_increment(metadata_definition, incremented_version):

0 commit comments

Comments
 (0)