Skip to content

Commit 327a992

Browse files
refactor: rename action trigger apply to instance apply
1 parent 4322ab2 commit 327a992

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

internal/terraform/node_action_trigger_apply.go renamed to internal/terraform/node_action_trigger_instance_apply.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ import (
1818
"github.com/hashicorp/terraform/internal/tfdiags"
1919
)
2020

21-
type nodeActionTriggerApply struct {
21+
type nodeActionTriggerApplyInstance struct {
2222
ActionInvocation *plans.ActionInvocationInstanceSrc
2323
resolvedProvider addrs.AbsProviderConfig
2424
ActionTriggerRange *hcl.Range
2525
ConditionExpr hcl.Expression
2626
}
2727

2828
var (
29-
_ GraphNodeExecutable = (*nodeActionTriggerApply)(nil)
30-
_ GraphNodeReferencer = (*nodeActionTriggerApply)(nil)
29+
_ GraphNodeExecutable = (*nodeActionTriggerApplyInstance)(nil)
30+
_ GraphNodeReferencer = (*nodeActionTriggerApplyInstance)(nil)
3131
)
3232

33-
func (n *nodeActionTriggerApply) Name() string {
33+
func (n *nodeActionTriggerApplyInstance) Name() string {
3434
return n.ActionInvocation.Addr.String() + " (instance)"
3535
}
3636

37-
func (n *nodeActionTriggerApply) Execute(ctx EvalContext, wo walkOperation) tfdiags.Diagnostics {
37+
func (n *nodeActionTriggerApplyInstance) Execute(ctx EvalContext, wo walkOperation) tfdiags.Diagnostics {
3838
var diags tfdiags.Diagnostics
3939
actionInvocation := n.ActionInvocation
4040

@@ -189,20 +189,20 @@ func (n *nodeActionTriggerApply) Execute(ctx EvalContext, wo walkOperation) tfdi
189189
return diags
190190
}
191191

192-
func (n *nodeActionTriggerApply) ProvidedBy() (addr addrs.ProviderConfig, exact bool) {
192+
func (n *nodeActionTriggerApplyInstance) ProvidedBy() (addr addrs.ProviderConfig, exact bool) {
193193
return n.ActionInvocation.ProviderAddr, true
194194

195195
}
196196

197-
func (n *nodeActionTriggerApply) Provider() (provider addrs.Provider) {
197+
func (n *nodeActionTriggerApplyInstance) Provider() (provider addrs.Provider) {
198198
return n.ActionInvocation.ProviderAddr.Provider
199199
}
200200

201-
func (n *nodeActionTriggerApply) SetProvider(config addrs.AbsProviderConfig) {
201+
func (n *nodeActionTriggerApplyInstance) SetProvider(config addrs.AbsProviderConfig) {
202202
n.resolvedProvider = config
203203
}
204204

205-
func (n *nodeActionTriggerApply) References() []*addrs.Reference {
205+
func (n *nodeActionTriggerApplyInstance) References() []*addrs.Reference {
206206
var refs []*addrs.Reference
207207

208208
refs = append(refs, &addrs.Reference{
@@ -221,16 +221,16 @@ func (n *nodeActionTriggerApply) References() []*addrs.Reference {
221221
}
222222

223223
// GraphNodeReferencer
224-
func (n *nodeActionTriggerApply) ModulePath() addrs.Module {
224+
func (n *nodeActionTriggerApplyInstance) ModulePath() addrs.Module {
225225
return n.ActionInvocation.Addr.Module.Module()
226226
}
227227

228228
// GraphNodeExecutable
229-
func (n *nodeActionTriggerApply) Path() addrs.ModuleInstance {
229+
func (n *nodeActionTriggerApplyInstance) Path() addrs.ModuleInstance {
230230
return n.ActionInvocation.Addr.Module
231231
}
232232

233-
func (n *nodeActionTriggerApply) AddSubjectToDiagnostics(input tfdiags.Diagnostics) tfdiags.Diagnostics {
233+
func (n *nodeActionTriggerApplyInstance) AddSubjectToDiagnostics(input tfdiags.Diagnostics) tfdiags.Diagnostics {
234234
var diags tfdiags.Diagnostics
235235
if len(input) > 0 {
236236
severity := hcl.DiagWarning

internal/terraform/transform_action_diff.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ func (t *ActionDiffTransformer) Transform(g *Graph) error {
3030
applyNodes.Put(applyableResource.Addr, applyableResource)
3131
}
3232

33-
invocationMap := map[*plans.ActionInvocationInstanceSrc]*nodeActionTriggerApply{}
33+
invocationMap := map[*plans.ActionInvocationInstanceSrc]*nodeActionTriggerApplyInstance{}
3434
triggerMap := addrs.MakeMap[addrs.AbsResourceInstance, []*plans.ActionInvocationInstanceSrc]()
3535
for _, action := range t.Changes.ActionInvocations {
3636
// Add nodes for each action invocation
37-
node := &nodeActionTriggerApply{
37+
node := &nodeActionTriggerApplyInstance{
3838
ActionInvocation: action,
3939
}
4040

internal/terraform/transform_targets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (t *TargetsTransformer) nodeIsTarget(v dag.Vertex, targets []addrs.Targetab
155155
vertexAddr = r.ResourceAddr()
156156
case *nodeActionInvokeExpand:
157157
vertexAddr = r.Target
158-
case *nodeActionTriggerApply:
158+
case *nodeActionTriggerApplyInstance:
159159
vertexAddr = r.ActionInvocation.Addr
160160

161161
default:

0 commit comments

Comments
 (0)