jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Structured Plan Renderer: Naming and package structure refactor (#32486)

Browse Source 
* change -> diff, value -> change

* also update readme#

* Update internal/command/jsonformat/computed/diff.go

Co-authored-by: Alisdair McDiarmid <alisdair@users.noreply.github.com>

* add interface assertions for diff renderers

Co-authored-by: Alisdair McDiarmid <alisdair@users.noreply.github.com>
This commit is contained in:
Liam Cervante
2023-01-10 17:24:48 +01:00
committed by GitHub
parent a086453783
commit 21bb677db7
41 changed files with 3496 additions and 3443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/command/jsonformat/differ/block.go
View File

@@ -1,41 +1,42 @@
package differ
import (
"github.com/hashicorp/terraform/internal/command/jsonformat/change"
"github.com/hashicorp/terraform/internal/command/jsonformat/computed"
"github.com/hashicorp/terraform/internal/command/jsonformat/computed/renderers"
"github.com/hashicorp/terraform/internal/command/jsonprovider"
"github.com/hashicorp/terraform/internal/plans"
)
func (v Value) ComputeChangeForBlock(block *jsonprovider.Block) change.Change {
if sensitive, ok := v.checkForSensitiveBlock(block); ok {
func (change Change) ComputeDiffForBlock(block *jsonprovider.Block) computed.Diff {
if sensitive, ok := change.checkForSensitiveBlock(block); ok {
return sensitive
}
if computed, ok := v.checkForComputedBlock(block); ok {
if computed, ok := change.checkForUnknownBlock(block); ok {
return computed
}
current := v.getDefaultActionForIteration()
current := change.getDefaultActionForIteration()
blockValue := v.asMap()
blockValue := change.asMap()
attributes := make(map[string]change.Change)
attributes := make(map[string]computed.Diff)
for key, attr := range block.Attributes {
childValue := blockValue.getChild(key)
childChange := childValue.ComputeChangeForAttribute(attr)
if childChange.Action() == plans.NoOp && childValue.Before == nil && childValue.After == nil {
childChange := childValue.ComputeDiffForAttribute(attr)
if childChange.Action == plans.NoOp && childValue.Before == nil && childValue.After == nil {
// Don't record nil values at all in blocks.
continue
}
attributes[key] = childChange
current = compareActions(current, childChange.Action())
current = compareActions(current, childChange.Action)
}
blocks := make(map[string][]change.Change)
blocks := make(map[string][]computed.Diff)
for key, blockType := range block.BlockTypes {
childValue := blockValue.getChild(key)
childChanges, next := childValue.computeChangesForBlockType(blockType)
childChanges, next := childValue.computeDiffsForBlockType(blockType)
if next == plans.NoOp && childValue.Before == nil && childValue.After == nil {
// Don't record nil values at all in blocks.
continue
@@ -44,20 +45,20 @@ func (v Value) ComputeChangeForBlock(block *jsonprovider.Block) change.Change {
current = compareActions(current, next)
}
return change.New(change.Block(attributes, blocks), current, v.replacePath())
return computed.NewDiff(renderers.Block(attributes, blocks), current, change.replacePath())
}
func (v Value) computeChangesForBlockType(blockType *jsonprovider.BlockType) ([]change.Change, plans.Action) {
func (change Change) computeDiffsForBlockType(blockType *jsonprovider.BlockType) ([]computed.Diff, plans.Action) {
switch NestingMode(blockType.NestingMode) {
case nestingModeSet:
return v.computeBlockChangesAsSet(blockType.Block)
return change.computeBlockDiffsAsSet(blockType.Block)
case nestingModeList:
return v.computeBlockChangesAsList(blockType.Block)
return change.computeBlockDiffsAsList(blockType.Block)
case nestingModeMap:
return v.computeBlockChangesAsMap(blockType.Block)
return change.computeBlockDiffsAsMap(blockType.Block)
case nestingModeSingle, nestingModeGroup:
ch := v.ComputeChangeForBlock(blockType.Block)
return []change.Change{ch}, ch.Action()
diff := change.ComputeDiffForBlock(blockType.Block)
return []computed.Diff{diff}, diff.Action
default:
panic("unrecognized nesting mode: " + blockType.NestingMode)
}