fix: semvar compare logic fixed (#853) (#854)

(cherry picked from commit cb899e9) Co-authored-by: Tanmoy Sarkar <[email protected]>
swiftwave-org · Jun 23, 2024 · 6bdc749 · 6bdc749
1 parent 158e3b7
commit 6bdc749
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/swiftwave_service/graphql/stack.resolvers.go b/swiftwave_service/graphql/stack.resolvers.go
diff --git a/swiftwave_service/stack_parser/utils.go b/swiftwave_service/stack_parser/utils.go
@@ -22,7 +22,7 @@ func ParseStackYaml(yamlStr string, currentSwiftwaveVersion string) (Stack, erro
 		return Stack{}, err
 	}
 	// convert the version to integer
-	if !isCurrentVersionLargerThanMinimum(stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion) {
+	if !isCurrentVersionSameOrLargerThanMinimum(stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion) {
 		return Stack{}, fmt.Errorf(`required Swiftwave %s. Current Version %s. Please upgrade to latest`, stack.MinimumSwiftwaveVersion, currentSwiftwaveVersion)
 	}
 	// Pre-fill default values
@@ -391,13 +391,17 @@ func fillDefaultDockerProxyPermissionIfNotPresent(val DockerProxyPermissionType)
 	return DockerProxyNoPermission
 }
 
-func isCurrentVersionLargerThanMinimum(minimumVersion, currentVersion string) bool {
+func isCurrentVersionSameOrLargerThanMinimum(minimumVersion, currentVersion string) bool {
 	if strings.Compare(currentVersion, "develop") == 0 || strings.Compare(currentVersion, "") == 0 {
 		return true
 	}
 	minimumVersion = cleanUpVersion(minimumVersion)
 	currentVersion = cleanUpVersion(currentVersion)
 
+	if strings.Compare(minimumVersion, currentVersion) == 0 {
+		return true
+	}
+
 	minParts := strings.Split(minimumVersion, ".")
 	currentParts := strings.Split(currentVersion, ".")