Feat/improved version checking output (#2862)

* add dependency name to output * reduce repeated code --------- Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>
armadaproject · Aug 16, 2023 · 3656d4f · 3656d4f
1 parent 969cf19
commit 3656d4f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 53 deletions.
diff --git a/magefiles/docker.go b/magefiles/docker.go
@@ -74,13 +74,13 @@ func dockerVersion() (*semver.Version, error) {
 	return version, nil
 }
 
-func constraintCheck(version *semver.Version, versionRequirement string) error {
+func constraintCheck(version *semver.Version, versionRequirement string, dependencyName string) error {
 	constraint, err := semver.NewConstraint(versionRequirement)
 	if err != nil {
 		return errors.Errorf("error parsing constraint: %v", err)
 	}
 	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
+		return errors.Errorf("found %s version %v but it failed constraint %v", dependencyName, version, constraint)
 	}
 	return nil
 }
@@ -90,15 +90,15 @@ func dockerComposeCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	return constraintCheck(version, DOCKER_COMPOSE_VERSION_CONSTRAINT)
+	return constraintCheck(version, DOCKER_COMPOSE_VERSION_CONSTRAINT, "docker-compose")
 }
 
 func dockerBuildxCheck() error {
 	version, err := dockerBuildxVersion()
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	return constraintCheck(version, DOCKER_BUILDX_VERSION_CONSTRAINT)
+	return constraintCheck(version, DOCKER_BUILDX_VERSION_CONSTRAINT, "docker-buildx")
 }
 
 func dockerCheck() error {
@@ -111,7 +111,7 @@ func dockerCheck() error {
 		return errors.Errorf("error parsing constraint: %v", err)
 	}
 	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
+		return errors.Errorf("found docker version %v but it failed constraint %v", version, constraint)
 	}
 	return nil
 }
diff --git a/magefiles/go.go b/magefiles/go.go
@@ -43,14 +43,7 @@ func goCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(GO_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, GO_VERSION_CONSTRAINT, "Go")
 }
 
 func goEnv(name string) (string, error) {

diff --git a/magefiles/kind.go b/magefiles/kind.go
@@ -70,14 +70,7 @@ func kindCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(KIND_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, KIND_VERSION_CONSTRAINT, "kind")
 }
 
 // Images that need to be available in the Kind cluster,

diff --git a/magefiles/kubectl.go b/magefiles/kubectl.go
@@ -48,12 +48,5 @@ func kubectlCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(KUBECTL_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, KUBECTL_VERSION_CONSTRAINT, "kubectl")
 }
diff --git a/magefiles/linting.go b/magefiles/linting.go
@@ -35,14 +35,7 @@ func golangciLintCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(GOLANGCI_LINT_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, GOLANGCI_LINT_VERSION_CONSTRAINT, "golangci-lint")
 }
 
 // Fixing Linting

diff --git a/magefiles/protoc.go b/magefiles/protoc.go
@@ -43,12 +43,5 @@ func protocCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(PROTOC_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, PROTOC_VERSION_CONSTRAINT, "protoc")
 }
diff --git a/magefiles/sqlc.go b/magefiles/sqlc.go
@@ -37,12 +37,5 @@ func sqlcCheck() error {
 	if err != nil {
 		return errors.Errorf("error getting version: %v", err)
 	}
-	constraint, err := semver.NewConstraint(SQLC_VERSION_CONSTRAINT)
-	if err != nil {
-		return errors.Errorf("error parsing constraint: %v", err)
-	}
-	if !constraint.Check(version) {
-		return errors.Errorf("found version %v but it failed constraint %v", version, constraint)
-	}
-	return nil
+	return constraintCheck(version, SQLC_VERSION_CONSTRAINT, "sqlc")
 }