Skip to content

Commit 41111c2

Browse files
DanielMSchmidtDanielMSchmidt
committed
match naming scheme
1 parent 1ce5d48 commit 41111c2

11 files changed

+22
-22
lines changed

‎internal/deprecation/deprecation.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func deprecationMarkToDiagnostic(depMark marks.DeprecationMark, subject *hcl.Ran
100100
return diag
101101
}
102102

103-
// ValidateAsConfig checks the given value for deprecation marks and returns diagnostics
103+
// ValidateConfig checks the given value for deprecation marks and returns diagnostics
104104
// for each deprecation found, unless deprecation warnings are suppressed for the given module.
105105
// It checks for deeply nested deprecation marks as well.
106-
func (d *Deprecations) ValidateAsConfig(value cty.Value, schema *configschema.Block, module addrs.Module) (cty.Value, tfdiags.Diagnostics) {
106+
func (d *Deprecations) ValidateConfig(value cty.Value, schema *configschema.Block, module addrs.Module) (cty.Value, tfdiags.Diagnostics) {
107107
var diags tfdiags.Diagnostics
108108
unmarked, pvms := value.UnmarkDeepWithPaths()
109109

‎internal/terraform/node_action_instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (n *NodeActionDeclarationInstance) Execute(ctx EvalContext, _ walkOperation
7272
diags = diags.Append(valDiags.InConfigBody(n.Config.Config, n.Addr.String()))
7373

7474
var deprecationDiags tfdiags.Diagnostics
75-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, n.Schema.ConfigSchema, n.ModulePath())
75+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, n.Schema.ConfigSchema, n.ModulePath())
7676
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
7777

7878
if diags.HasErrors() {

‎internal/terraform/node_action_partialexp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (n *NodeActionDeclarationPartialExpanded) Execute(ctx EvalContext, op walkO
6969
return diags
7070
}
7171
var deprecationDiags tfdiags.Diagnostics
72-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, n.Schema.ConfigSchema, n.ActionAddr().Module)
72+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, n.Schema.ConfigSchema, n.ActionAddr().Module)
7373
diags = diags.Append(deprecationDiags.InConfigBody(n.config.Config, n.ActionAddr().String()))
7474
if diags.HasErrors() {
7575
return diags

‎internal/terraform/node_action_validate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (n *NodeValidatableAction) Execute(ctx EvalContext, _ walkOperation) tfdiag
102102
}
103103
}
104104
var deprecationDiags tfdiags.Diagnostics
105-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.ConfigSchema, n.ModulePath())
105+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.ConfigSchema, n.ModulePath())
106106
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
107107

108108
valDiags = validateResourceForbiddenEphemeralValues(ctx, configVal, schema.ConfigSchema)

‎internal/terraform/node_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (n *NodeApplyableProvider) ValidateProvider(ctx EvalContext, provider provi
8484
}
8585

8686
var deprecationDiags tfdiags.Diagnostics
87-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, configSchema, n.Addr.Module)
87+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, configSchema, n.Addr.Module)
8888
diags = diags.Append(deprecationDiags.InConfigBody(configBody, n.Addr.String()))
8989
if diags.HasErrors() {
9090
return diags

‎internal/terraform/node_resource_abstract_instance.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ func (n *NodeAbstractResourceInstance) plan(
867867
validateResourceForbiddenEphemeralValues(ctx, origConfigVal, schema.Body).InConfigBody(n.Config.Config, n.Addr.String()),
868868
)
869869
var deprecationDiags tfdiags.Diagnostics
870-
origConfigVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(origConfigVal, schema.Body, n.ModulePath())
870+
origConfigVal, deprecationDiags = ctx.Deprecations().ValidateConfig(origConfigVal, schema.Body, n.ModulePath())
871871
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
872872
if diags.HasErrors() {
873873
return nil, nil, deferred, keyData, diags
@@ -1775,7 +1775,7 @@ func (n *NodeAbstractResourceInstance) providerMetas(ctx EvalContext) (cty.Value
17751775
metaConfigVal, _, configDiags = ctx.EvaluateBlock(m.Config, providerSchema.ProviderMeta.Body, nil, EvalDataForNoInstanceKey)
17761776
diags = diags.Append(configDiags)
17771777
var deprecationDiags tfdiags.Diagnostics
1778-
metaConfigVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(metaConfigVal, providerSchema.ProviderMeta.Body, ctx.Path().Module())
1778+
metaConfigVal, deprecationDiags = ctx.Deprecations().ValidateConfig(metaConfigVal, providerSchema.ProviderMeta.Body, ctx.Path().Module())
17791779
diags = diags.Append(deprecationDiags.InConfigBody(m.Config, n.Addr.String()))
17801780
}
17811781
}
@@ -1855,7 +1855,7 @@ func (n *NodeAbstractResourceInstance) planDataSource(ctx EvalContext, checkRule
18551855
)
18561856

18571857
var deprecationDiags tfdiags.Diagnostics
1858-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module())
1858+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, ctx.Path().Module())
18591859
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
18601860

18611861
if diags.HasErrors() {
@@ -2196,7 +2196,7 @@ func (n *NodeAbstractResourceInstance) applyDataSource(ctx EvalContext, planned
21962196
}
21972197

21982198
var deprecationDiags tfdiags.Diagnostics
2199-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath())
2199+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, n.ModulePath())
22002200
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, n.Addr.String()))
22012201

22022202
if diags.HasErrors() {
@@ -2515,7 +2515,7 @@ func (n *NodeAbstractResourceInstance) evalProvisionerConfig(ctx EvalContext, bo
25152515
config, _, configDiags := ctx.EvaluateBlock(body, schema, n.ResourceInstanceAddr().Resource, keyData)
25162516
diags = diags.Append(configDiags)
25172517
var deprecationDiags tfdiags.Diagnostics
2518-
config, deprecationDiags = ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath())
2518+
config, deprecationDiags = ctx.Deprecations().ValidateConfig(config, schema, n.ModulePath())
25192519
diags = diags.Append(deprecationDiags.InConfigBody(body, n.Addr.String()))
25202520

25212521
return config, diags
@@ -2535,7 +2535,7 @@ func (n *NodeAbstractResourceInstance) evalDestroyProvisionerConfig(ctx EvalCont
25352535
config, evalDiags := evalScope.EvalSelfBlock(body, self, schema, keyData)
25362536
diags = diags.Append(evalDiags)
25372537
var deprecationDiags tfdiags.Diagnostics
2538-
config, deprecationDiags = ctx.Deprecations().ValidateAsConfig(config, schema, n.ModulePath())
2538+
config, deprecationDiags = ctx.Deprecations().ValidateConfig(config, schema, n.ModulePath())
25392539
diags = diags.Append(deprecationDiags.InConfigBody(body, n.Addr.String()))
25402540
return config, diags
25412541
}

‎internal/terraform/node_resource_ephemeral.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func ephemeralResourceOpen(ctx EvalContext, inp ephemeralResourceInput) (*provid
7777
return nil, diags
7878
}
7979
var deprecationDiags tfdiags.Diagnostics
80-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, ctx.Path().Module())
80+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, ctx.Path().Module())
8181
diags = diags.Append(deprecationDiags.InConfigBody(config.Config, inp.addr.String()))
8282
if diags.HasErrors() {
8383
return nil, diags

‎internal/terraform/node_resource_plan_instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs.
639639
return nil, deferred, diags
640640
}
641641
var deprecationDiags tfdiags.Diagnostics
642-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ModulePath())
642+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, n.ModulePath())
643643
diags = diags.Append(deprecationDiags.InConfigBody(n.Config.Config, absAddr.String()))
644644
if diags.HasErrors() {
645645
return nil, deferred, diags

‎internal/terraform/node_resource_plan_instance_query.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (n *NodePlannableResourceInstance) listResourceExecute(ctx EvalContext) (di
5050
return diags
5151
}
5252
var deprecationDiags tfdiags.Diagnostics
53-
blockVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(blockVal, schema.FullSchema, n.ModulePath())
53+
blockVal, deprecationDiags = ctx.Deprecations().ValidateConfig(blockVal, schema.FullSchema, n.ModulePath())
5454
diags = diags.Append(deprecationDiags.InConfigBody(config.Config, n.Addr.String()))
5555
if diags.HasErrors() {
5656
return diags

‎internal/terraform/node_resource_plan_partialexp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func (n *nodePlannablePartialExpandedResource) managedResourceExecute(ctx EvalCo
201201
}
202202

203203
var deprecationDiags tfdiags.Diagnostics
204-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module)
204+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, n.ResourceAddr().Module)
205205
diags = diags.Append(deprecationDiags.InConfigBody(n.config.Config, n.addr.String()))
206206
if diags.HasErrors() {
207207
return &change, diags
@@ -362,7 +362,7 @@ func (n *nodePlannablePartialExpandedResource) dataResourceExecute(ctx EvalConte
362362
}
363363

364364
var deprecationDiags tfdiags.Diagnostics
365-
configVal, deprecationDiags = ctx.Deprecations().ValidateAsConfig(configVal, schema.Body, n.ResourceAddr().Module)
365+
configVal, deprecationDiags = ctx.Deprecations().ValidateConfig(configVal, schema.Body, n.ResourceAddr().Module)
366366
diags = diags.Append(deprecationDiags.InConfigBody(n.config.Config, n.addr.String()))
367367
if diags.HasErrors() {
368368
return &change, diags

0 commit comments

Comments
 (0)