pin terraform version constraint as terraform add is removed after v1.1.0-alpha20211020

Author: magodo

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/charmbracelet/bubbletea v0.15.0
 	github.com/charmbracelet/lipgloss v0.4.0
 	github.com/hashicorp/go-azure-helpers v0.16.5
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-version v1.3.0
 	github.com/hashicorp/hcl/v2 v2.10.1
 	github.com/hashicorp/terraform-exec v0.14.1-0.20210812105923-7fa6ba66697a
@@ -20,5 +19,76 @@ require (
 	github.com/muesli/reflow v0.3.0
 	github.com/stretchr/testify v1.7.0
 	github.com/zclconf/go-cty v1.9.0
+)
+
+require (
+	cloud.google.com/go v0.61.0 // indirect
+	cloud.google.com/go/storage v1.10.0 // indirect
+	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
+	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
+	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
+	github.com/Azure/go-autorest/logger v0.2.1 // indirect
+	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/atotto/clipboard v0.1.2 // indirect
+	github.com/aws/aws-sdk-go v1.25.3 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/charmbracelet/harmonica v0.1.0 // indirect
+	github.com/containerd/console v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dimchansky/utfbom v1.1.1 // indirect
+	github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-getter v1.5.3 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.1 // indirect
+	github.com/hashicorp/terraform-json v0.12.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.3.0 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/klauspost/compress v1.11.2 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/muesli/termenv v0.9.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/sahilm/fuzzy v0.1.0 // indirect
+	github.com/ulikunitz/xz v0.5.8 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
+	go.opencensus.io v0.22.4 // indirect
+	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/mod v0.3.0 // indirect
+	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 // indirect
+	golang.org/x/term v0.0.0-20210422114643-f5beecf764ed // indirect
+	golang.org/x/text v0.3.5 // indirect
 	golang.org/x/tools v0.0.0-20201119191246-c0d5e8918928 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.29.0 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
+	google.golang.org/grpc v1.32.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )

internal/meta/meta_impl.go

@@ -21,8 +21,9 @@ import (
 	"github.com/hashicorp/terraform-exec/tfexec"
 )
 
-// The minimun required terraform version that has the `terraform add` command.
-var minRequiredTFVersion = version.Must(version.NewSemver("1.1.0-alpha20210811"))
+// The required terraform version that has the `terraform add` command.
+var minRequiredTFVersion = version.Must(version.NewSemver("v1.1.0-alpha20210630"))
+var maxRequiredTFVersion = version.Must(version.NewSemver("v1.1.0-alpha20211006"))
 
 type MetaImpl struct {
 	subscriptionId string
@@ -92,7 +93,7 @@ func newMetaImpl(rg string, outputDir string) (Meta, error) {
 	}
 
 	// Initialize the Terraform
-	execPath, err := FindTerraform(ctx, tfDir, minRequiredTFVersion)
+	execPath, err := FindTerraform(ctx, tfDir, minRequiredTFVersion, maxRequiredTFVersion)
 	if err != nil {
 		return nil, fmt.Errorf("error finding a terraform exectuable: %w", err)
 	}

internal/meta/tfinstall_find.go

@@ -5,22 +5,20 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
-	"strings"
 
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-exec/tfexec"
 	"github.com/hashicorp/terraform-exec/tfinstall"
 )
 
-// FindTerraform finds the path to the terraform executable whose version meets the min version constraint.
+// FindTerraform finds the path to the terraform executable whose version meets the min/max version constraint.
 // It first tries to find from the local OS PATH. If there is no match, it will then download the release of the minVersion from hashicorp to the tfDir.
-func FindTerraform(ctx context.Context, tfDir string, minVersion *version.Version) (string, error) {
+func FindTerraform(ctx context.Context, tfDir string, minVersion, maxVersion *version.Version) (string, error) {
 	var terraformPath string
 	opts := []tfinstall.ExecPathFinder{
 		tfinstall.LookPath(),
 		tfinstall.ExactPath(filepath.Join(tfDir, terraformBinary)),
-		tfinstall.ExactVersion(minVersion.String(), tfDir),
+		tfinstall.ExactVersion(maxVersion.String(), tfDir),
 	}
 
 	// go through the options in order
@@ -41,7 +39,7 @@ func FindTerraform(ctx context.Context, tfDir string, minVersion *version.Versio
 			return "", fmt.Errorf("error getting terraform version for executable found at path %s: %w", p, err)
 		}
 
-		if stripPrereleaseAndMeta(v).LessThan(stripPrereleaseAndMeta(minVersion)) {
+		if v.LessThan(minVersion) || v.GreaterThan(maxVersion) {
 			continue
 		}
 
@@ -67,16 +65,3 @@ func getTerraformVersion(ctx context.Context, execPath string) (*version.Version
 	}
 	return ver, nil
 }
-
-func stripPrereleaseAndMeta(v *version.Version) *version.Version {
-	if v == nil {
-		return nil
-	}
-	segs := []string{}
-	for _, s := range v.Segments() {
-		segs = append(segs, strconv.Itoa(s))
-	}
-	vs := strings.Join(segs, ".")
-	clean, _ := version.NewVersion(vs)
-	return clean
-}