Fix migrate command version matchers #1769
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sugmanue
approved these changes
May 11, 2023
Previously, Smithy models with versions without a decimal suffix (`.0`) would not be matched properly in the `smithy migrate` command. For Smithy models with a version of `"1"`, the upgraded files would result in conflicting version control statements, e.g. ```smithy $version: "2.0" $version: "1" // ... ``` Similarly for Smithy models with a version of `"2"`, the files would incorrectly attempt to be upgraded, e.g. ```smithy $version: "2.0" $version: "2" // ... ``` This change loosens the version matchers to match the [`Version::fromString`](https://github.com/awslabs/smithy/blob/c95943844a65a6623f79ac647e54326d87a68c24/smithy-model/src/main/java/software/amazon/smithy/model/loader/Version.java#L205-L216) implementation.
syall
force-pushed
the
fix-migrate-command-version-matcher
branch
from
7b3e309
to
e399ee7
Compare
syall
changed the title
sugmanue
approved these changes
May 12, 2023
haydenbaker
approved these changes
May 12, 2023
syall
pushed a commit
to Xtansia/smithy
that referenced
this pull request
Aug 11, 2023
Previously, Smithy models with versions without a decimal suffix (`.0`) would not be matched properly in the `smithy migrate` command. For Smithy models with a version of `"1"`, the upgraded files would result in conflicting version control statements, e.g. ```smithy $version: "2.0" $version: "1" // ... ``` Similarly for Smithy models with a version of `"2"`, the files would incorrectly attempt to be upgraded, e.g. ```smithy $version: "2.0" $version: "2" // ... ``` This change loosens the version matchers to match the [`Version::fromString`](https://github.com/awslabs/smithy/blob/c95943844a65a6623f79ac647e54326d87a68c24/smithy-model/src/main/java/software/amazon/smithy/model/loader/Version.java#L205-L216) implementation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
N/A.
Description of changes:
Previously, Smithy models with versions without a decimal suffix (
.0)would not be matched properly in the
smithy migratecommand.For Smithy models with a version of
"1", the upgraded files wouldresult in conflicting version control statements, e.g.
Similarly for Smithy models with a version of
"2", the files wouldincorrectly attempt to be upgraded, e.g.
This change loosens the version matchers to match the
Version::fromStringimplementation.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.