Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dbanck committed Jan 16, 2025
1 parent 0688a44 commit 6fa3566
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 46 deletions.
6 changes: 0 additions & 6 deletions internal/terraform/eval_context_builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,6 @@ func (ctx *BuiltinEvalContext) ClientCapabilities() providers.ClientCapabilities

func (ctx *BuiltinEvalContext) ReferencableDeprecationMessage(m addrs.Module, x addrs.Referenceable) (string, bool) {
// TODO: We want to make this available in node_resource_validation, therefore we want to talk about config objects, the referencable should somehow contain the config object, how do we get it out?
fmt.Printf("\n\t XXX T --> %#v \n", x)
if mcio, ok := x.(addrs.ModuleCallInstanceOutput); ok {
cov := addrs.ConfigOutputValue{
Module: m.Child(mcio.Call.Call.Name),
Expand All @@ -633,8 +632,6 @@ func (ctx *BuiltinEvalContext) ReferencableDeprecationMessage(m addrs.Module, x
},
}

fmt.Printf("\n\t ctx.DeprecatedReferencables --> %#v \n", ctx.DeprecatedReferencables)
fmt.Printf("\n\t cov.String() --> %#v \n", cov.String())
msg, ok := ctx.DeprecatedReferencables[cov.String()]
return msg, ok
} else if mc, ok := x.(addrs.ModuleCall); ok {
Expand All @@ -645,7 +642,6 @@ func (ctx *BuiltinEvalContext) ReferencableDeprecationMessage(m addrs.Module, x
},
}

fmt.Printf("\n\t cov.String() --> %#v \n", cov.String())
msg, ok := ctx.DeprecatedReferencables[cov.String()]
return msg, ok
}
Expand All @@ -654,7 +650,5 @@ func (ctx *BuiltinEvalContext) ReferencableDeprecationMessage(m addrs.Module, x
}

func (ctx *BuiltinEvalContext) MarkReferencableAsDeprecated(x addrs.ConfigOutputValue, msg string) {
fmt.Printf("\n\t marking x --> %q \n", x.String())
fmt.Printf("\n\t msg --> %#v \n", msg)
ctx.DeprecatedReferencables[x.String()] = msg
}
2 changes: 0 additions & 2 deletions internal/terraform/graph_builder_apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
&ReferenceTransformer{},
&AttachDependenciesTransformer{},

&OutputReferencesTransformer{},

// Nested data blocks should be loaded after every other resource has
// done its thing.
&checkStartTransformer{Config: b.Config, Operation: b.Operation},
Expand Down
2 changes: 0 additions & 2 deletions internal/terraform/graph_builder_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer {

&ReferenceTransformer{},

&OutputReferencesTransformer{},

&AttachDependenciesTransformer{},

// Make sure data sources are aware of any depends_on from the
Expand Down
5 changes: 0 additions & 5 deletions internal/terraform/node_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ type nodeExpandOutput struct {
Overrides *mocking.Overrides

Dependencies []addrs.ConfigResource

Dependants []*addrs.Reference
}

var (
Expand Down Expand Up @@ -138,7 +136,6 @@ func (n *nodeExpandOutput) DynamicExpand(ctx EvalContext) (*Graph, tfdiags.Diagn
Planning: n.Planning,
Override: n.getOverrideValue(absAddr.Module),
Dependencies: n.Dependencies,
Dependants: n.Dependants,
}
}

Expand Down Expand Up @@ -286,8 +283,6 @@ type NodeApplyableOutput struct {
// Dependencies is the full set of resources that are referenced by this
// output.
Dependencies []addrs.ConfigResource

Dependants []*addrs.Reference
}

var (
Expand Down
1 change: 0 additions & 1 deletion internal/terraform/transform_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func (t *OutputTransformer) transform(g *Graph, c *configs.Config) error {
RefreshOnly: t.RefreshOnly,
Planning: t.Planning,
Overrides: t.Overrides,
Dependants: []*addrs.Reference{},
}

log.Printf("[TRACE] OutputTransformer: adding %s as %T", o.Name, node)
Expand Down
30 changes: 0 additions & 30 deletions internal/terraform/transform_output_references.go

This file was deleted.

0 comments on commit 6fa3566

Please sign in to comment.