Nicer plan diff output.

[apollo13]

This commit takes the marker length into account properly so
objects/fields are always at parent + 2 no matter how long the marker
is.

Given this job:

job "example" {
  datacenters = ["dc1"]

  group "cache" {
    network {
      port "db" {
        to = 6379
      }
    }

    service {
      name = "test2"
      tags = [
        "x",
        "c",
      ]
    }

    task "redis" {
      driver = "docker"

      config {
        image = "redis:3.2"

        ports = ["db"]
      }

      resources {
        cpu    = 500
        memory = 256
      }
    }
  }
}

and removing the tags yields (without this patch):

+/- Job: "example"
+/- Task Group: "cache" (1 in-place update)
  +/- Service {
      AddressMode:       "auto"
      EnableTagOverride: "false"
      Name:              "test2"
      Namespace:         "default"
      OnUpdate:          "require_healthy"
      PortLabel:         ""
      TaskName:          ""
    - Tags {
      - Tags: "c"
      - Tags: "x"
      }
      }
      Task: "redis"

and with the patch:

+/- Job: "example"
+/- Task Group: "cache" (1 in-place update)
  +/- Service {
        AddressMode:       "auto"
        EnableTagOverride: "false"
        Name:              "test2"
        Namespace:         "default"
        OnUpdate:          "require_healthy"
        PortLabel:         ""
        TaskName:          ""
      - Tags {
        - Tags: "c"
        - Tags: "x"
        }
      }
      Task: "redis"

Imo the new behavior seems better (ymmv). The patch also right aligns markers which I also find nicer.

@lgfa29 I ran into this while working on #11255 -- do you have any thoughts on this?

[apollo13]

Also there might be some other occurances where this one is uglier (?) though I do not hope so, let's see what the tests say.

[lgfa29]

Your output looks great, so 👍 from me.

With regards to the code, I must admit that these two functions have always being confusing to me 😅

[apollo13]

Ok there are a few more small things to fix and I will document it clearly how the offsets are calculated.

…

On Tue, Mar 1, 2022, at 22:02, Luiz Aoqui wrote: Your output looks great, so 👍 from me. With regards to the code, I must admit that these two functions have always being confusing to me 😅 — Reply to this email directly, view it on GitHub <#12136 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAT5C5JEQQ6WRPWVXRAAZLU52AVVANCNFSM5PLC4XNQ>. Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. You are receiving this because you authored the thread.Message ID: ***@***.***>

[hashicorp-cla]

All committers have signed the CLA.