Fix wrong deletion message on flux diff

If implemented, when an error happens when dry-running an object, we return early. This match pkg ssa implementation Signed-off-by: Soule BA <[email protected]>
fluxcd · Feb 5, 2022 · 8dc2a98 · 8dc2a98
1 parent 4b4e6b1
commit 8dc2a98
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/internal/build/diff.go b/internal/build/diff.go
@@ -78,6 +78,7 @@ func (b *Builder) Diff() (string, bool, error) {
 
 	// create an inventory of objects to be reconciled
 	newInventory := newInventory()
+	oldStatus := b.kustomization.Status.DeepCopy()
 	for _, obj := range objects {
 		diffOptions := ssa.DiffOptions{
 			Exclusions: map[string]string{
@@ -86,12 +87,7 @@ func (b *Builder) Diff() (string, bool, error) {
 		}
 		change, liveObject, mergedObject, err := resourceManager.Diff(ctx, obj, diffOptions)
 		if err != nil {
-			if b.kustomization.Spec.Force && ssa.IsImmutableError(err) {
-				output.WriteString(writeString(fmt.Sprintf("► %s created\n", obj.GetName()), bunt.Green))
-			} else {
-				output.WriteString(writeString(fmt.Sprintf("✗ %v\n", err), bunt.Red))
-			}
-			continue
+			return "", createdOrDrifted, err
 		}
 
 		// if the object is a sops secret, we need to
@@ -125,7 +121,6 @@ func (b *Builder) Diff() (string, bool, error) {
 	}
 
 	if b.kustomization.Spec.Prune {
-		oldStatus := b.kustomization.Status.DeepCopy()
 		if oldStatus.Inventory != nil {
 			diffObjects, err := diffInventory(oldStatus.Inventory, newInventory)
 			if err != nil {