Skip to content

Commit 1b087d3

Browse files
committed
Remove rawNames from *conversionContext.applyDefaults
This is a pure refactor and doesn't have behavioral effects.
1 parent c9a4a8a commit 1b087d3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/tfbridge/schema.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ func (ctx *conversionContext) makeObjectTerraformInputs(
626626
}
627627

628628
// Now enumerate and propagate defaults if the corresponding values are still missing.
629-
if err := ctx.applyDefaults(result, olds, news, tfs, ps, false); err != nil {
629+
if err := ctx.applyDefaults(result, olds, news, tfs, ps); err != nil {
630630
return nil, err
631631
}
632632

@@ -710,7 +710,6 @@ func (ctx *conversionContext) applyDefaults(
710710
olds, news resource.PropertyMap,
711711
tfs shim.SchemaMap,
712712
ps map[string]*SchemaInfo,
713-
rawNames bool,
714713
) error {
715714

716715
if !ctx.ApplyDefaults {
@@ -756,7 +755,7 @@ func (ctx *conversionContext) applyDefaults(
756755
var source string
757756

758757
// If we already have a default value from a previous version of this resource, use that instead.
759-
key, tfi, psi := getInfoFromTerraformName(name, tfs, ps, rawNames)
758+
key, tfi, psi := getInfoFromTerraformName(name, tfs, ps, false)
760759

761760
if old, hasold := olds[key]; hasold && useOldDefault(key) {
762761
v, err := ctx.makeTerraformInput(name, resource.PropertyValue{},
@@ -908,8 +907,9 @@ func (ctx *conversionContext) applyDefaults(
908907
return true
909908
}
910909

911-
// Next, if we already have a default value from a previous version of this resource, use that instead.
912-
key, tfi, psi := getInfoFromTerraformName(name, tfs, ps, rawNames)
910+
// Next, if we already have a default value from a previous version of this
911+
// resource, use that instead.
912+
key, tfi, psi := getInfoFromTerraformName(name, tfs, ps, false)
913913

914914
if old, hasold := olds[key]; hasold && useOldDefault(key) {
915915
v, err := ctx.makeTerraformInput(name, resource.PropertyValue{}, old, tfi, psi)

0 commit comments

Comments
 (0)