Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff: update Action references to typed Action

Browse Source 
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals
2023-03-09 13:09:05 +01:00
parent 9274e80d71
commit 16e0b93bec
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/build/diff.go
View File

@@ -105,16 +105,16 @@ func (b *Builder) Diff() (string, bool, error) {
// if the object is a sops secret, we need to // if the object is a sops secret, we need to
// make sure we diff only if the keys are different // make sure we diff only if the keys are different
if obj.GetKind() == "Secret" && change.Action == string(ssa.ConfiguredAction) { if obj.GetKind() == "Secret" && change.Action == ssa.ConfiguredAction {
diffSopsSecret(obj, liveObject, mergedObject, change) diffSopsSecret(obj, liveObject, mergedObject, change)
} }
if change.Action == string(ssa.CreatedAction) { if change.Action == ssa.CreatedAction {
output.WriteString(writeString(fmt.Sprintf("► %s created\n", change.Subject), bunt.Green)) output.WriteString(writeString(fmt.Sprintf("► %s created\n", change.Subject), bunt.Green))
createdOrDrifted = true createdOrDrifted = true
} }
if change.Action == string(ssa.ConfiguredAction) { if change.Action == ssa.ConfiguredAction {
output.WriteString(bunt.Sprint(fmt.Sprintf("► %s drifted\n", change.Subject))) output.WriteString(bunt.Sprint(fmt.Sprintf("► %s drifted\n", change.Subject)))
liveFile, mergedFile, tmpDir, err := writeYamls(liveObject, mergedObject) liveFile, mergedFile, tmpDir, err := writeYamls(liveObject, mergedObject)
if err != nil { if err != nil {
@@ -232,10 +232,10 @@ func applySopsDiff(data map[string]interface{}, liveObject, mergedObject *unstru
if bytes.Contains(v, []byte(mask)) { if bytes.Contains(v, []byte(mask)) {
if liveObject != nil && mergedObject != nil { if liveObject != nil && mergedObject != nil {
change.Action = string(ssa.UnchangedAction) change.Action = ssa.UnchangedAction
liveKeys, mergedKeys := sopsComparableByKeys(liveObject), sopsComparableByKeys(mergedObject) liveKeys, mergedKeys := sopsComparableByKeys(liveObject), sopsComparableByKeys(mergedObject)
if cmp.Diff(liveKeys, mergedKeys) != "" { if cmp.Diff(liveKeys, mergedKeys) != "" {
change.Action = string(ssa.ConfiguredAction) change.Action = ssa.ConfiguredAction
} }
} }
} }