aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Testing updates

Browse Source
pull/36062/head
Mark DeCrane 1 year ago
parent 8d0db63571
commit b2a90cf587
9 changed files with 189 additions and 30 deletions
Show Stats Download Patch File Download Diff File

56
internal/command/modules_test.go
Unescape View File

@ -11,6 +11,8 @@ import (
"strings"
"testing"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/cli"
"github.com/hashicorp/terraform/internal/moduleref"
)
@ -18,8 +20,9 @@ import (
func TestModules_noJsonFlag(t *testing.T) {
dir := t.TempDir()
os.MkdirAll(dir, 0755)
testCopyDir(t, testFixturePath("modules-nested-dependencies"), dir)
ui := new(cli.MockUi)
view, _ := testView(t)
view, done := testView(t)
defer testChdir(t, dir)()
cmd := &ModulesCommand{
@ -32,24 +35,51 @@ func TestModules_noJsonFlag(t *testing.T) {
args := []string{}
code := cmd.Run(args)
if code == 0 {
t.Fatal("expected an non zero exit status\n")
if code != 0 {
t.Fatalf("Got a non-zero exit code: %d\n", code)
}
output := ui.ErrorWriter.String()
if !strings.Contains(output, "The `terraform modules` command requires the `-json` flag.\n") {
t.Fatal("expected an error message about requiring -json flag.\n")
actual := done(t).All()
for _, part := range expectedOutputHuman {
if !strings.Contains(actual, part) {
t.Fatalf("unexpected output: %s\n", part)
}
}
}
if !strings.Contains(output, modulesCommandHelp) {
t.Fatal("expected the modules command help to be displayed\n")
func TestModules_noJsonFlag_noModules(t *testing.T) {
dir := t.TempDir()
os.MkdirAll(dir, 0755)
ui := new(cli.MockUi)
view, done := testView(t)
defer testChdir(t, dir)()
cmd := &ModulesCommand{
Meta: Meta{
testingOverrides: metaOverridesForProvider(testProvider()),
Ui: ui,
View: view,
},
}
args := []string{}
code := cmd.Run(args)
if code != 0 {
t.Fatalf("Got a non-zero exit code: %d\n", code)
}
actual := done(t).All()
if diff := cmp.Diff("No modules found in configuration.\n", actual); diff != "" {
t.Fatalf("unexpected output (-want +got):\n%s", diff)
}
}
func TestModules_fullCmd(t *testing.T) {
dir := t.TempDir()
os.MkdirAll(dir, 0755)
testCopyDir(t, testFixturePath("modules"), dir)
testCopyDir(t, testFixturePath("modules-nested-dependencies"), dir)
ui := new(cli.MockUi)
view, done := testView(t)
@ -70,7 +100,7 @@ func TestModules_fullCmd(t *testing.T) {
}
output := done(t).All()
compareJSONOutput(t, output, expectedOutput)
compareJSONOutput(t, output, expectedOutputJSON)
}
func TestModules_fullCmd_unreferencedEntries(t *testing.T) {
@ -96,7 +126,7 @@ func TestModules_fullCmd_unreferencedEntries(t *testing.T) {
t.Fatalf("Got a non-zero exit code: %d\n", code)
}
output := done(t).All()
compareJSONOutput(t, output, expectedOutput)
compareJSONOutput(t, output, expectedOutputJSON)
}
func TestModules_uninstalledModules(t *testing.T) {
@ -154,4 +184,6 @@ func compareJSONOutput(t *testing.T, got string, want string) {
}
}
var expectedOutput = `{"format_version":"1.0","modules":[{"key":"child","source":"./child","version":""},{"key":"count_child","source":"./child","version":""}]}`
var expectedOutputJSON = `{"format_version":"1.0","modules":[{"key":"test","source":"./mods/test","version":""},{"key":"test2","source":"./test2","version":""},{"key":"test3","source":"./test3","version":""},{"key":"other","source":"./mods/other","version":""}]}`
var expectedOutputHuman = []string{"── \"other\"[./mods/other]", "── \"test\"[./mods/test]\n └── \"test2\"[./test2]\n └── \"test3\"[./test3]"}

29
internal/command/testdata/modules-nested-dependencies/.terraform/modules/modules.json vendored
Unescape View File

@ -0,0 +1,29 @@
{
"Modules": [
{
"Key": "",
"Source": "",
"Dir": "."
},
{
"Key": "other",
"Source": "./mods/other",
"Dir": "mods/other"
},
{
"Key": "test",
"Source": "./mods/test",
"Dir": "mods/test"
},
{
"Key": "test.test2",
"Source": "./test2",
"Dir": "mods/test/test2"
},
{
"Key": "test.test2.test3",
"Source": "./test3",
"Dir": "mods/test/test2/test3"
}
]
}

7
internal/command/testdata/modules-nested-dependencies/main.tf vendored
Unescape View File

@ -0,0 +1,7 @@
module "test" {
source = "./mods/test"
}
module "other" {
source = "./mods/other"
}

5
internal/command/testdata/modules-nested-dependencies/mods/other/main.tf vendored
Unescape View File

@ -0,0 +1,5 @@
resource "test_instance" "test" {
}
output "myoutput" {
value = "bar"
}

3
internal/command/testdata/modules-nested-dependencies/mods/test/main.tf vendored
Unescape View File

@ -0,0 +1,3 @@
module "test2" {
source = "./test2"
}

3
internal/command/testdata/modules-nested-dependencies/mods/test/test2/main.tf vendored
Unescape View File

@ -0,0 +1,3 @@
module "test3" {
source = "./test3"
}

5
internal/command/testdata/modules-nested-dependencies/mods/test/test2/test3/main.tf vendored
Unescape View File

@ -0,0 +1,5 @@
resource "test_instance" "test" {
}
output "myoutput" {
value = "bar"
}

0
internal/command/testdata/modules-nested-dependencies/terraform.tfstate vendored
Unescape View File

111
internal/moduleref/resolver_test.go
Unescape View File

@ -19,6 +19,18 @@ func TestResolver_Resolve(t *testing.T) {
},
}
cfg.Children = map[string]*configs.Config{
"foo": &configs.Config{
Path: addrs.Module{"foo"},
Parent: cfg,
Children: make(map[string]*configs.Config),
SourceAddr: addrs.ModuleSourceLocal("./foo"),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{},
},
},
}
manifest := modsdir.Manifest{
"foo": modsdir.Record{
Key: "foo",
@ -48,12 +60,27 @@ func TestResolver_ResolveNestedChildren(t *testing.T) {
cfg.Children = make(map[string]*configs.Config)
cfg.Module = &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{
"foo": {Name: "foo"},
"foo": {Name: "foo"},
"fellowship": {Name: "fellowship"},
},
}
cfg.Children["foo"] = &configs.Config{
Path: addrs.Module{"foo"},
Parent: cfg,
SourceAddr: addrs.ModuleSourceLocal("./foo"),
Children: make(map[string]*configs.Config),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{},
},
}
childCfg := &configs.Config{
Path: addrs.Module{"fellowship"},
childCfgFellowship := &configs.Config{
Path: addrs.Module{"fellowship"},
Parent: cfg,
SourceAddr: addrs.ModuleSourceRemote{
Package: addrs.ModulePackage("fellowship"),
},
Children: make(map[string]*configs.Config),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{
@ -61,9 +88,26 @@ func TestResolver_ResolveNestedChildren(t *testing.T) {
},
},
}
cfg.Children["fellowship"] = childCfgFellowship
childCfgFellowship.Children["frodo"] = &configs.Config{
Path: addrs.Module{"fellowship", "frodo"},
Parent: childCfgFellowship,
SourceAddr: addrs.ModuleSourceRemote{
Package: addrs.ModulePackage("fellowship/frodo"),
},
Children: make(map[string]*configs.Config),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{},
},
}
childCfg2 := &configs.Config{
Path: addrs.Module{"fellowship", "weapons"},
childCfgWeapons := &configs.Config{
Path: addrs.Module{"fellowship", "weapons"},
Parent: childCfgFellowship,
SourceAddr: addrs.ModuleSourceRemote{
Package: addrs.ModulePackage("fellowship/weapons"),
},
Children: make(map[string]*configs.Config),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{
@ -71,9 +115,19 @@ func TestResolver_ResolveNestedChildren(t *testing.T) {
},
},
}
childCfgFellowship.Children["weapons"] = childCfgWeapons
cfg.Children["fellowship"] = childCfg
childCfg.Children["weapons"] = childCfg2
childCfgWeapons.Children["sting"] = &configs.Config{
Path: addrs.Module{"fellowship", "weapons", "sting"},
Parent: childCfgWeapons,
SourceAddr: addrs.ModuleSourceRemote{
Package: addrs.ModulePackage("fellowship/weapons/sting"),
},
Children: make(map[string]*configs.Config),
Module: &configs.Module{
ModuleCalls: map[string]*configs.ModuleCall{},
},
}
manifest := modsdir.Manifest{
"foo": modsdir.Record{
@ -84,10 +138,18 @@ func TestResolver_ResolveNestedChildren(t *testing.T) {
Key: "bar",
SourceAddr: "./bar",
},
"fellowship": modsdir.Record{
Key: "fellowship",
SourceAddr: "fellowship",
},
"fellowship.frodo": modsdir.Record{
Key: "fellowship.frodo",
SourceAddr: "fellowship/frodo",
},
"fellowship.weapons": modsdir.Record{
Key: "fellowship.weapons",
SourceAddr: "fellowship/weapons",
},
"fellowship.weapons.sting": modsdir.Record{
Key: "fellowship.weapons.sting",
SourceAddr: "fellowship/weapons/sting",
@ -100,23 +162,36 @@ func TestResolver_ResolveNestedChildren(t *testing.T) {
resolver := NewResolver(manifest)
result := resolver.Resolve(cfg)
if len(result.Records) != 3 {
t.Fatalf("expected the resolved number of entries to equal 3, got: %d", len(result.Records))
recordsCount, sources := countAndListSources(result.Records)
if recordsCount != 5 {
t.Fatalf("expected the resolved number of entries to equal 5, got: %d", recordsCount)
}
assertions := map[string]bool{
"foo": true,
"bar": false,
"fellowship.frodo": true,
"fellowship.weapons.sting": true,
"fellowship.weapons.anduril": false,
"./foo": true,
"./bar": false,
"fellowship": true,
"fellowship/frodo": true,
"fellowship/weapons": true,
"fellowship/weapons/sting": true,
"fellowship/weapons/anduril": false,
}
for _, record := range result.Records {
referenced, ok := assertions[record.Key]
for _, source := range sources {
referenced, ok := assertions[source]
if !ok || !referenced {
t.Fatalf("expected to find referenced entry with key: %s", record.Key)
t.Fatalf("expected to find referenced entry with key: %s", source)
}
}
}
func countAndListSources(records []*Record) (count int, sources []string) {
for _, record := range records {
sources = append(sources, record.Source.String())
count++
childCount, childSources := countAndListSources(record.Children)
count += childCount
sources = append(sources, childSources...)
}
return
}

Write Preview
Loading…
Cancel
Save