Unite all minimum version validation functions (#659)

jfrog · Jan 2, 2023 · a479005 · a479005
1 parent 090fe89
commit a479005
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/artifactory/commands/transferfiles/transfer.go b/artifactory/commands/transferfiles/transfer.go
@@ -653,7 +653,7 @@ func validateDataTransferPluginMinimumVersion(currentVersion string) error {
 	if strings.Contains(currentVersion, "SNAPSHOT") {
 		return nil
 	}
-	return coreutils.ValidateMinimumVersion("data-transfer", currentVersion, dataTransferPluginMinVersion)
+	return coreutils.ValidateMinimumVersion(coreutils.DataTransfer, currentVersion, dataTransferPluginMinVersion)
 }
 
 // Verify connection to the source Artifactory instance, and that the user plugin is installed, responsive, and stands in the minimal version requirement.

diff --git a/artifactory/commands/transferfiles/transfer_test.go b/artifactory/commands/transferfiles/transfer_test.go
@@ -67,7 +67,7 @@ func testValidateDataTransferPluginMinimumVersion(t *testing.T, curVersion strin
 	pluginVersion = curVersion
 	err := getAndValidateDataTransferPlugin(srcPluginManager)
 	if errorExpected {
-		assert.EqualError(t, err, coreutils.ValidateMinimumVersion("data-transfer", curVersion, dataTransferPluginMinVersion).Error())
+		assert.EqualError(t, err, coreutils.ValidateMinimumVersion(coreutils.DataTransfer, curVersion, dataTransferPluginMinVersion).Error())
 		return
 	}
 	assert.NoError(t, err)

diff --git a/artifactory/utils/container/containermanager.go b/artifactory/utils/container/containermanager.go
@@ -254,5 +254,5 @@ func ValidateClientApiVersion() error {
 		log.Error("The Docker client Api version is expected to be 'major.minor'. The actual output is:", content)
 		return errorutils.CheckError(err)
 	}
-	return coreutils.ValidateMinimumVersion("Docker API", content, MinSupportedApiVersion)
+	return coreutils.ValidateMinimumVersion(coreutils.DockerApi, content, MinSupportedApiVersion)
 }