From 7b51af72b24c33a07429a45613de9b129aec4143 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Wed, 19 Dec 2018 17:28:32 +0100 Subject: [PATCH] backend/remote: compare versions without the prerelease --- backend/remote/backend.go | 4 ++-- backend/remote/backend_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/remote/backend.go b/backend/remote/backend.go index 8823384e0a..3d35989262 100644 --- a/backend/remote/backend.go +++ b/backend/remote/backend.go @@ -370,7 +370,7 @@ func (b *Remote) checkConstraints(c *disco.Constraints) tfdiags.Diagnostics { } // Create the version to check. - v, err := version.NewVersion(tfversion.String()) + v, err := version.NewVersion(tfversion.Version) if err != nil { return diags.Append(checkConstraintsWarning(err)) } @@ -433,7 +433,7 @@ func (b *Remote) checkConstraints(c *disco.Constraints) tfdiags.Diagnostics { summary := fmt.Sprintf("Incompatible Terraform version v%s", v.String()) details := fmt.Sprintf( "The configured Terraform Enterprise backend is compatible with Terraform "+ - "versions >= %s, < %s%s.", c.Minimum, c.Maximum, excluding, + "versions >= %s, <= %s%s.", c.Minimum, c.Maximum, excluding, ) if action != "" && toVersion != "" { diff --git a/backend/remote/backend_test.go b/backend/remote/backend_test.go index c250b37459..7edbd43588 100644 --- a/backend/remote/backend_test.go +++ b/backend/remote/backend_test.go @@ -379,7 +379,7 @@ func TestRemote_checkConstraints(t *testing.T) { Maximum: "0.11.11", }, version: "0.10.1", - result: "versions >= 0.11.0, < 0.11.11.", + result: "versions >= 0.11.0, <= 0.11.11.", }, "list exclusion": { constraints: &disco.Constraints{