tfversion: Treat Terraform CLI prerelease versions as equal to patch versions in SkipBelow

.changes/unreleased/ENHANCEMENTS-20240327-171628.yaml

@@ -0,0 +1,6 @@
+kind: ENHANCEMENTS
+body: 'tfversion: Ensured semantically equivalent Terraform CLI prerelease versions
+  are considered equal to patch versions in `SkipBelow`'
+time: 2024-03-27T17:16:28.49466-04:00
+custom:
+  Issue: "303"

tfversion/skip_below.go

@@ -14,6 +14,16 @@ import (
 // version is below the given version. For example, if given
 // version.Must(version.NewVersion("0.15.0")), then 0.14.x or
 // any other prior minor versions will skip the test.
+//
+// Prereleases of Terraform CLI (whether alpha, beta, or rc) are considered
+// equal to a given patch version. For example, if given
+// version.Must(version.NewVersion("1.8.0")), then 1.8.0-rc1 will run, not skip,
+// the test. Terraform prereleases are considered as potential candidates for
+// the upcoming version and therefore are treated as important for testing to
+// run. If skipping prereleases of the same patch release is desired, give a
+// higher prerelease version. For example, if given
+// version.Must(version.NewVersion("1.8.0-rc2")), then 1.8.0-rc1 will skip the
+// test.
 func SkipBelow(minimumVersion *version.Version) TerraformVersionCheck {
 	return skipBelowCheck{
 		minimumVersion: minimumVersion,
@@ -27,8 +37,17 @@ type skipBelowCheck struct {
 
 // CheckTerraformVersion satisfies the TerraformVersionCheck interface.
 func (s skipBelowCheck) CheckTerraformVersion(ctx context.Context, req CheckTerraformVersionRequest, resp *CheckTerraformVersionResponse) {
+	var terraformVersion *version.Version
 
-	if req.TerraformVersion.LessThan(s.minimumVersion) {
+	// If given a prerelease version, check the Terraform CLI version directly,
+	// otherwise use the core version so that prereleases are treated as equal.
+	if s.minimumVersion.Prerelease() != "" {
+		terraformVersion = req.TerraformVersion
+	} else {
+		terraformVersion = req.TerraformVersion.Core()
+	}
+
+	if terraformVersion.LessThan(s.minimumVersion) {
 		resp.Skip = fmt.Sprintf("Terraform CLI version %s is below minimum version %s: skipping test",
 			req.TerraformVersion, s.minimumVersion)
 	}

tfversion/skip_below_test.go

@@ -62,3 +62,114 @@ func Test_SkipBelow_RunTest(t *testing.T) { //nolint:paralleltest
 		},
 	})
 }
+
+func Test_SkipBelow_Prerelease_EqualCoreVersion(t *testing.T) { //nolint:paralleltest
+	t.Setenv("TF_ACC_TERRAFORM_PATH", "")
+	t.Setenv("TF_ACC_TERRAFORM_VERSION", "1.8.0-rc1")
+
+	// Pragmatic compromise that 1.8.0-rc1 prerelease is considered to
+	// be equivalent to the 1.8.0 core release. This enables developers
+	// to assert that prerelease versions are compatible with upcoming
+	// core versions.
+	//
+	// Reference: https://github.com/hashicorp/terraform-plugin-testing/issues/303
+	r.UnitTest(t, r.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"test": providerserver.NewProviderServer(testprovider.Provider{}),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.8.0"))),
+		},
+		Steps: []r.TestStep{
+			{
+				Config: `//non-empty config`,
+			},
+		},
+	})
+}
+
+func Test_SkipBelow_Prerelease_HigherCoreVersion(t *testing.T) { //nolint:paralleltest
+	t.Setenv("TF_ACC_TERRAFORM_PATH", "")
+	t.Setenv("TF_ACC_TERRAFORM_VERSION", "1.7.0-rc1")
+
+	// The 1.7.0-rc1 prerelease should always be considered to be below the
+	// 1.8.0 core version. This intentionally verifies that the logic does not
+	// ignore the core version of the prerelease version when compared against
+	// the core version of the check.
+	r.UnitTest(t, r.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"test": providerserver.NewProviderServer(testprovider.Provider{}),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.8.0"))),
+		},
+		Steps: []r.TestStep{
+			{
+				Config: `//non-empty config`,
+			},
+		},
+	})
+}
+
+func Test_SkipBelow_Prerelease_HigherPrerelease(t *testing.T) { //nolint:paralleltest
+	t.Setenv("TF_ACC_TERRAFORM_PATH", "")
+	t.Setenv("TF_ACC_TERRAFORM_VERSION", "1.7.0-rc1")
+
+	// The 1.7.0-rc1 prerelease should always be considered to be
+	// below the 1.7.0-rc2 prerelease.
+	r.UnitTest(t, r.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"test": providerserver.NewProviderServer(testprovider.Provider{}),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.7.0-rc2"))),
+		},
+		Steps: []r.TestStep{
+			{
+				Config: `//non-empty config`,
+			},
+		},
+	})
+}
+
+func Test_SkipBelow_Prerelease_LowerCoreVersion(t *testing.T) { //nolint:paralleltest
+	t.Setenv("TF_ACC_TERRAFORM_PATH", "")
+	t.Setenv("TF_ACC_TERRAFORM_VERSION", "1.8.0-rc1")
+
+	// The 1.8.0-rc1 prerelease should always be considered to be
+	// above the 1.7.0 core version.
+	r.UnitTest(t, r.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"test": providerserver.NewProviderServer(testprovider.Provider{}),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.7.0"))),
+		},
+		Steps: []r.TestStep{
+			{
+				Config: `//non-empty config`,
+			},
+		},
+	})
+}
+
+func Test_SkipBelow_Prerelease_LowerPrerelease(t *testing.T) { //nolint:paralleltest
+	t.Setenv("TF_ACC_TERRAFORM_PATH", "")
+	t.Setenv("TF_ACC_TERRAFORM_VERSION", "1.8.0-rc1")
+
+	// The 1.8.0-rc1 prerelease should always be considered to be
+	// above the 1.8.0-beta1 prerelease.
+	r.UnitTest(t, r.TestCase{
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"test": providerserver.NewProviderServer(testprovider.Provider{}),
+		},
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.8.0-beta1"))),
+		},
+		Steps: []r.TestStep{
+			{
+				Config: `//non-empty config`,
+			},
+		},
+	})
+}