ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Update context import tests for diagnostics, rather than errors 

ctx.Import now returns tfdiags.Diagnostics rather than "error", so these
tests need to now expect that API for proper behavior.

Several of these tests are still failing for other reasons. That will be
addressed in subsequent commits.
This commit is contained in:
Martin Atkins 2018-05-29 12:02:34 -07:00
parent 605e23db6b
commit 6bc702f09d
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
terraform/context_import_test.go
View File

@ -29,7 +29,7 @@ func TestContextImport_basic(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -40,8 +40,8 @@ func TestContextImport_basic(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
expected := strings.TrimSpace(testImportStr)
@ -69,7 +69,7 @@ func TestContextImport_countIndex(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -80,8 +80,8 @@ func TestContextImport_countIndex(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -126,7 +126,7 @@ func TestContextImport_collision(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -137,8 +137,8 @@ func TestContextImport_collision(t *testing.T) {
},
},
})
if err == nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -166,7 +166,7 @@ func TestContextImport_missingType(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -177,7 +177,7 @@ func TestContextImport_missingType(t *testing.T) {
},
},
})
if err == nil {
if !diags.HasErrors() {
t.Fatal("should error")
}
@ -218,7 +218,7 @@ func TestContextImport_moduleProvider(t *testing.T) {
return nil
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Config: m,
Targets: []*ImportTarget{
&ImportTarget{
@ -230,8 +230,8 @@ func TestContextImport_moduleProvider(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
if !configured {
@ -276,7 +276,7 @@ func TestContextImport_providerModule(t *testing.T) {
return nil
}
_, err := ctx.Import(&ImportOpts{
_, diags := ctx.Import(&ImportOpts{
Config: m,
Targets: []*ImportTarget{
&ImportTarget{
@ -288,8 +288,8 @@ func TestContextImport_providerModule(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
if !configured {
@ -335,7 +335,7 @@ func TestContextImport_providerVarConfig(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -346,8 +346,8 @@ func TestContextImport_providerVarConfig(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
if !configured {
@ -381,7 +381,7 @@ func TestContextImport_providerNonVarConfig(t *testing.T) {
},
}
_, err := ctx.Import(&ImportOpts{
_, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -392,7 +392,7 @@ func TestContextImport_providerNonVarConfig(t *testing.T) {
},
},
})
if err == nil {
if !diags.HasErrors() {
t.Fatal("should error")
}
}
@ -423,7 +423,7 @@ func TestContextImport_refresh(t *testing.T) {
}, nil
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -434,8 +434,8 @@ func TestContextImport_refresh(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -468,7 +468,7 @@ func TestContextImport_refreshNil(t *testing.T) {
return nil, nil
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -479,7 +479,7 @@ func TestContextImport_refreshNil(t *testing.T) {
},
},
})
if err == nil {
if !diags.HasErrors() {
t.Fatal("should error")
}
@ -509,7 +509,7 @@ func TestContextImport_module(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.Child("foo", addrs.NoKey).ResourceInstance(
@ -520,8 +520,8 @@ func TestContextImport_module(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -550,7 +550,7 @@ func TestContextImport_moduleDepth2(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.Child("a", addrs.NoKey).Child("b", addrs.NoKey).ResourceInstance(
@ -561,8 +561,8 @@ func TestContextImport_moduleDepth2(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -607,7 +607,7 @@ func TestContextImport_moduleDiff(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.Child("foo", addrs.NoKey).ResourceInstance(
@ -618,8 +618,8 @@ func TestContextImport_moduleDiff(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -664,7 +664,7 @@ func TestContextImport_moduleExisting(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.Child("foo", addrs.NoKey).ResourceInstance(
@ -675,8 +675,8 @@ func TestContextImport_moduleExisting(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -709,7 +709,7 @@ func TestContextImport_multiState(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -720,8 +720,8 @@ func TestContextImport_multiState(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -758,7 +758,7 @@ func TestContextImport_multiStateSame(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -769,8 +769,8 @@ func TestContextImport_multiStateSame(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())
@ -800,7 +800,7 @@ func TestContextImport_customProviderMissing(t *testing.T) {
},
}
_, err := ctx.Import(&ImportOpts{
_, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -811,7 +811,7 @@ func TestContextImport_customProviderMissing(t *testing.T) {
},
},
})
if err == nil {
if !diags.HasErrors() {
t.Fatal("expected error")
}
}
@ -835,7 +835,7 @@ func TestContextImport_customProvider(t *testing.T) {
},
}
state, err := ctx.Import(&ImportOpts{
state, diags := ctx.Import(&ImportOpts{
Targets: []*ImportTarget{
&ImportTarget{
Addr: addrs.RootModuleInstance.ResourceInstance(
@ -846,8 +846,8 @@ func TestContextImport_customProvider(t *testing.T) {
},
},
})
if err != nil {
t.Fatalf("err: %s", err)
if diags.HasErrors() {
t.Fatalf("unexpected errors: %s", diags.Err())
}
actual := strings.TrimSpace(state.String())