Skip to content

Commit 77cca0a

Browse files
jbardinjbardin
committed
remove import transformer
1 parent c002bab commit 77cca0a

3 files changed

Lines changed: 1 addition & 117 deletions

File tree

‎internal/terraform/graph_builder_plan.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer {
128128

129129
// We also need nodes for any deposed instance objects present in the
130130
// state, so we can plan to destroy them. (During plan this will
131-
// intentionally skips creating nodes for _current_ objects, since
131+
// intentionally skip creating nodes for _current_ objects, since
132132
// ConfigTransformer created nodes that will do that during
133133
// DynamicExpand.)
134134
&StateTransformer{

internal/terraform/transform_import_state.go renamed to internal/terraform/node_resource_import.go

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,11 @@ import (
55
"log"
66

77
"github.com/hashicorp/terraform/internal/addrs"
8-
"github.com/hashicorp/terraform/internal/configs"
98
"github.com/hashicorp/terraform/internal/providers"
109
"github.com/hashicorp/terraform/internal/states"
1110
"github.com/hashicorp/terraform/internal/tfdiags"
1211
)
1312

14-
// ImportStateTransformer is a GraphTransformer that adds nodes to the
15-
// graph to represent the imports we want to do for resources.
16-
type ImportStateTransformer struct {
17-
Targets []*ImportTarget
18-
Config *configs.Config
19-
skip bool
20-
}
21-
22-
func (t *ImportStateTransformer) Transform(g *Graph) error {
23-
if t.skip {
24-
return nil
25-
}
26-
27-
for _, target := range t.Targets {
28-
// This is only likely to happen in misconfigured tests
29-
if t.Config == nil {
30-
return fmt.Errorf("cannot import into an empty configuration")
31-
}
32-
33-
// Get the module config
34-
modCfg := t.Config.Descendent(target.Addr.Module.Module())
35-
if modCfg == nil {
36-
return fmt.Errorf("module %s not found", target.Addr.Module.Module())
37-
}
38-
39-
providerAddr := addrs.AbsProviderConfig{
40-
Module: target.Addr.Module.Module(),
41-
}
42-
43-
// Try to find the resource config
44-
rsCfg := modCfg.Module.ResourceByAddr(target.Addr.Resource.Resource)
45-
if rsCfg != nil {
46-
// Get the provider FQN for the resource from the resource configuration
47-
providerAddr.Provider = rsCfg.Provider
48-
49-
// Get the alias from the resource's provider local config
50-
providerAddr.Alias = rsCfg.ProviderConfigAddr().Alias
51-
} else {
52-
// Resource has no matching config, so use an implied provider
53-
// based on the resource type
54-
rsProviderType := target.Addr.Resource.Resource.ImpliedProvider()
55-
providerAddr.Provider = modCfg.Module.ImpliedProviderForUnqualifiedType(rsProviderType)
56-
}
57-
58-
node := &graphNodeImportState{
59-
Addr: target.Addr,
60-
ID: target.ID,
61-
ProviderAddr: providerAddr,
62-
}
63-
g.Add(node)
64-
}
65-
return nil
66-
}
67-
6813
type graphNodeImportState struct {
6914
Addr addrs.AbsResourceInstance // Addr is the resource address to import into
7015
ID string // ID is the ID to import as

‎internal/terraform/transform_provider_test.go‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -49,58 +49,6 @@ func TestProviderTransformer(t *testing.T) {
4949
}
5050
}
5151

52-
func TestProviderTransformer_ImportModuleChild(t *testing.T) {
53-
mod := testModule(t, "import-module")
54-
55-
g := testProviderTransformerGraph(t, mod)
56-
57-
{
58-
tf := &ImportStateTransformer{
59-
Config: mod,
60-
Targets: []*ImportTarget{
61-
&ImportTarget{
62-
Addr: addrs.RootModuleInstance.
63-
Child("child", addrs.NoKey).
64-
ResourceInstance(
65-
addrs.ManagedResourceMode,
66-
"aws_instance",
67-
"foo",
68-
addrs.NoKey,
69-
),
70-
ID: "bar",
71-
},
72-
},
73-
}
74-
75-
if err := tf.Transform(g); err != nil {
76-
t.Fatalf("err: %s", err)
77-
}
78-
t.Logf("graph after ImportStateTransformer:\n%s", g.String())
79-
}
80-
81-
{
82-
tf := &MissingProviderTransformer{}
83-
if err := tf.Transform(g); err != nil {
84-
t.Fatalf("err: %s", err)
85-
}
86-
t.Logf("graph after MissingProviderTransformer:\n%s", g.String())
87-
}
88-
89-
{
90-
tf := &ProviderTransformer{}
91-
if err := tf.Transform(g); err != nil {
92-
t.Fatalf("err: %s", err)
93-
}
94-
t.Logf("graph after ProviderTransformer:\n%s", g.String())
95-
}
96-
97-
actual := strings.TrimSpace(g.String())
98-
expected := strings.TrimSpace(testTransformImportModuleChildStr)
99-
if actual != expected {
100-
t.Fatalf("wrong result\n\ngot:\n%s\n\nwant:\n%s", actual, expected)
101-
}
102-
}
103-
10452
// Test providers with FQNs that do not match the typeName
10553
func TestProviderTransformer_fqns(t *testing.T) {
10654
for _, mod := range []string{"fqns", "fqns-module"} {
@@ -505,12 +453,3 @@ module.child.module.grandchild.aws_instance.baz
505453
provider["registry.terraform.io/hashicorp/aws"].foo
506454
provider["registry.terraform.io/hashicorp/aws"].foo
507455
`
508-
509-
const testTransformImportModuleChildStr = `
510-
module.child.aws_instance.foo
511-
provider["registry.terraform.io/hashicorp/aws"]
512-
module.child.aws_instance.foo (import id "bar")
513-
provider["registry.terraform.io/hashicorp/aws"]
514-
module.child.module.nested.aws_instance.foo
515-
provider["registry.terraform.io/hashicorp/aws"]
516-
provider["registry.terraform.io/hashicorp/aws"]`

0 commit comments

Comments
 (0)