Skip to content

Commit 6bdc749

Browse files
fix: semvar compare logic fixed (#853) (#854)
(cherry picked from commit cb899e9) Co-authored-by: Tanmoy Sarkar <57363826+tanmoysrt@users.noreply.github.com>
1 parent 158e3b7 commit 6bdc749

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

swiftwave_service/graphql/stack.resolvers.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swiftwave_service/stack_parser/utils.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func ParseStackYaml(yamlStr string, currentSwiftwaveVersion string) (Stack, erro
2222
return Stack{}, err
2323
}
2424
// convert the version to integer
25-
if !isCurrentVersionLargerThanMinimum(stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion) {
25+
if !isCurrentVersionSameOrLargerThanMinimum(stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion) {
2626
return Stack{}, fmt.Errorf(`required Swiftwave %s. Current Version %s. Please upgrade to latest`, stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion)
2727
}
2828
// Pre-fill default values
@@ -391,13 +391,17 @@ func fillDefaultDockerProxyPermissionIfNotPresent(val DockerProxyPermissionType)
391391
return DockerProxyNoPermission
392392
}
393393

394-
func isCurrentVersionLargerThanMinimum(minimumVersion, currentVersion string) bool {
394+
func isCurrentVersionSameOrLargerThanMinimum(minimumVersion, currentVersion string) bool {
395395
if strings.Compare(currentVersion, "develop") == 0 || strings.Compare(currentVersion, "") == 0 {
396396
return true
397397
}
398398
minimumVersion = cleanUpVersion(minimumVersion)
399399
currentVersion = cleanUpVersion(currentVersion)
400400

401+
if strings.Compare(minimumVersion, currentVersion) == 0 {
402+
return true
403+
}
404+
401405
minParts := strings.Split(minimumVersion, ".")
402406
currentParts := strings.Split(currentVersion, ".")
403407

0 commit comments

Comments
 (0)