WIP: Feature/terragrunt

README.md

@@ -1,6 +1,6 @@
 # terraform-module-versions
 
-Checks for updates of external terraform modules referenced in given Terraform (0.10.x - 0.12.x) modules. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
+Checks for updates of external terraform modules referenced in given Terraform modules. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
 
 Supported module sources:
 

README.template.md

@@ -1,6 +1,6 @@
 # ${APP}
 
-Checks for updates of external terraform modules referenced in given Terraform (0.10.x - 0.12.x) modules. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
+Checks for updates of external terraform modules referenced in given Terraform modules. Outputs Markdown tables by default, as well as JSONL (`-o jsonl`, one JSON object per line), JSON (`-o json`), and JUnit XML (`-o junit`).
 
 Supported module sources:
 

examples/terragrunt.hcl

@@ -0,0 +1,3 @@
+terraform {
+    source = "git@github.com:terraform-aws-modules/terraform-aws-iam.git//modules/iam-assumable-roles?ref=v2.21.0"
+}

go.mod

@@ -13,11 +13,12 @@ require (
 	github.com/gliderlabs/ssh v0.3.1 // indirect
 	github.com/go-git/go-git/v5 v5.2.0
 	github.com/go-test/deep v1.0.7 // indirect
+	github.com/gruntwork-io/terragrunt v0.28.2
 	github.com/hashicorp/go-getter v1.5.2
 	github.com/hashicorp/go-version v1.2.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/terraform v0.14.5
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20201102131242-0c45ba392e51
+	github.com/hashicorp/terraform/helper/pathorcontents v0.14.6 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/jstemmer/go-junit-report v0.9.1
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
@@ -37,3 +38,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 )
+
+replace github.com/hashicorp/terraform/helper/pathorcontents v0.14.6 => ./internal/terraform-helper-pathorcontents

internal/terraform-helper-pathorcontents/go.mod

@@ -0,0 +1,5 @@
+module github.com/hashicorp/terraform/helper/pathorcontents
+
+go 1.15
+
+require github.com/mitchellh/go-homedir v1.1.0

internal/terraform-helper-pathorcontents/go.sum

@@ -0,0 +1,2 @@
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=

internal/terraform-helper-pathorcontents/read.go

@@ -0,0 +1,40 @@
+// https://www.terraform.io/docs/extend/guides/v2-upgrade-guide.html#removal-of-helper-pathorcontents-package
+package pathorcontents
+
+import (
+	"io/ioutil"
+	"os"
+
+	"github.com/mitchellh/go-homedir"
+)
+
+// If the argument is a path, Read loads it and returns the contents,
+// otherwise the argument is assumed to be the desired contents and is simply
+// returned.
+//
+// The boolean second return value can be called `wasPath` - it indicates if a
+// path was detected and a file loaded.
+func Read(poc string) (string, bool, error) {
+	if len(poc) == 0 {
+		return poc, false, nil
+	}
+
+	path := poc
+	if path[0] == '~' {
+		var err error
+		path, err = homedir.Expand(path)
+		if err != nil {
+			return path, true, err
+		}
+	}
+
+	if _, err := os.Stat(path); err == nil {
+		contents, err := ioutil.ReadFile(path)
+		if err != nil {
+			return string(contents), true, err
+		}
+		return string(contents), true, nil
+	}
+
+	return poc, false, nil
+}

main.go

@@ -38,6 +38,7 @@ var (
 		Output                  flagvar.Enum
 		OutputFormat            output.Format
 		RegistryHeaders         flagvar.Assignments
+		Terragrunt              bool
 		Quiet                   bool
 		UpdatesFoundNonzeroExit bool
 		All                     bool
@@ -59,6 +60,7 @@ func main() {
 	checkFlagSet := flag.NewFlagSet(appName+" check", flag.ExitOnError)
 
 	rootFlagSet.BoolVar(&config.Quiet, "quiet", false, "suppress log output (stderr)")
+	rootFlagSet.BoolVar(&config.Terragrunt, "terragrunt", false, "include Terragrunt configurations")
 	rootFlagSet.BoolVar(&config.Quiet, "q", false, "(alias for -quiet)")
 	rootFlagSet.Var(&config.Output, "output", "output format, "+config.Output.Help())
 	rootFlagSet.Var(&config.Output, "o", "(alias for -output)")
@@ -151,6 +153,13 @@ func scanForModuleCalls() []scan.Result {
 	if err != nil {
 		log.Fatal(err)
 	}
+	if config.Terragrunt {
+		scanResultsTerragrunt, err := scan.ScanTerragrunt(config.Paths)
+		if err != nil {
+			log.Fatal(err)
+		}
+		scanResults = append(scanResults, scanResultsTerragrunt...)
+	}
 	moduleNamesFilter := config.ModuleNames.Value
 	moduleNamesFilterEmpty := len(moduleNamesFilter) == 0
 	scanResultsFiltered := make([]scan.Result, 0, len(scanResults))

pkg/modulecall/parse.go

@@ -14,15 +14,14 @@ type Parsed struct {
 	VersionString     string
 	Constraints       *semver.Constraints
 	ConstraintsString string
-	Raw               tfconfig.ModuleCall
 }
 
 func Parse(raw tfconfig.ModuleCall) (*Parsed, error) {
 	src, err := source.Parse(raw.Source)
 	if err != nil {
 		return nil, fmt.Errorf("parse module call source: %w", err)
 	}
-	out := Parsed{Source: src, Raw: raw}
+	out := Parsed{Source: src}
 	switch {
 	case src.Git != nil:
 		if ref := src.Git.RefValue; ref != nil {

pkg/scan/terragrunt.go

@@ -0,0 +1,52 @@
+package scan
+
+import (
+	"fmt"
+
+	tgconfig "github.com/gruntwork-io/terragrunt/config"
+	tgoptions "github.com/gruntwork-io/terragrunt/options"
+	"github.com/hashicorp/terraform-config-inspect/tfconfig"
+)
+
+func ScanTerragrunt(paths []string) ([]Result, error) {
+	var out []Result
+	for _, path := range paths {
+		opts, err := tgoptions.NewTerragruntOptions(path)
+		if err != nil {
+			return nil, fmt.Errorf("build terragrunt options for %q: %w", path, err)
+		}
+		paths, err := tgconfig.FindConfigFilesInPath(path, opts)
+		if err != nil {
+			return nil, fmt.Errorf("find terragrunt config files in %q: %w", path, err)
+		}
+		for _, path := range paths {
+			cfg, err := tgconfig.PartialParseConfigFile(
+				path,
+				opts,
+				nil,
+				[]tgconfig.PartialDecodeSectionType{tgconfig.TerraformSource},
+			)
+			if err != nil {
+				return nil, fmt.Errorf("read terragrunt config %q: %w", path, err)
+			}
+			if cfg.Terraform == nil {
+				continue
+			}
+			if cfg.Terraform.Source == nil {
+				continue
+			}
+			out = append(out, Result{
+				Path: path,
+				ModuleCall: tfconfig.ModuleCall{
+					Name:    path,
+					Source:  *cfg.Terraform.Source,
+					Version: "",
+					Pos: tfconfig.SourcePos{
+						Filename: path,
+					},
+				},
+			})
+		}
+	}
+	return out, nil
+}