changed yaml_incluster structure and added additional debug message (#…

…112)

go.mod

@@ -97,6 +97,7 @@ require (
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/sergi/go-diff v1.3.1 // indirect
  github.com/spf13/cobra v1.7.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect

go.sum

@@ -455,6 +455,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
 github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
@@ -475,6 +477,7 @@ github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -721,6 +724,7 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=

kubernetes/resource_kubectl_manifest.go

@@ -5,6 +5,7 @@ import (
  "crypto/sha256"
  "encoding/base64"
  "fmt"
+ "github.com/sergi/go-diff/diffmatchpatch"
  "k8s.io/cli-runtime/pkg/genericiooptions"
  k8sdelete "k8s.io/kubectl/pkg/cmd/delete"
  "log"
@@ -303,7 +304,11 @@ metadata:
  stateYaml := d.Get("yaml_incluster").(string)
  liveStateYaml := d.Get("live_manifest_incluster").(string)
  if stateYaml != liveStateYaml {
- log.Printf("[TRACE] DETECTED YAML STATE %s vs %s", stateYaml, liveStateYaml)
+ log.Printf("[TRACE] DETECTED YAML STATE DIFFERENCE %s vs %s", stateYaml, liveStateYaml)
+ dmp := diffmatchpatch.New()
+ patches := dmp.PatchMake(stateYaml, liveStateYaml)
+ patchText := dmp.PatchToText(patches)
+ log.Printf("[DEBUG] DETECTED YAML INCLUSTER STATE DIFFERENCE. Patch diff: %s", patchText)
  _ = d.SetNewComputed("yaml_incluster")
  }
 
@@ -1010,9 +1015,7 @@ func getLiveManifestFingerprint(d *schema.ResourceData, userProvided *yaml.Manif
  if hasIgnoreFields {
  ignoreFields = expandStringList(ignoreFieldsRaw.([]interface{}))
  }
-
- fields := getLiveManifestFields_WithIgnoredFields(ignoreFields, userProvided, liveManifest)
- return getFingerprint(fields)
+ return getLiveManifestFields_WithIgnoredFields(ignoreFields, userProvided, liveManifest)
 }
 
 func getFingerprint(s string) string {
@@ -1065,10 +1068,10 @@ func getLiveManifestFields_WithIgnoredFields(ignoredFields []string, userProvide
  if _, exists := flattenedLive[userKey]; exists {
  userKeys = append(userKeys, userKey)
  normalizedLiveValue := strings.TrimSpace(flattenedLive[userKey])
- flattenedUser[userKey] = normalizedLiveValue
  if normalizedUserValue != normalizedLiveValue {
  log.Printf("[TRACE] yaml drift detected in %s for %s, was: %s now: %s", userProvided.GetSelfLink(), userKey, normalizedUserValue, normalizedLiveValue)
  }
+ flattenedUser[userKey] = getFingerprint(normalizedLiveValue)
  } else {
  if normalizedUserValue != "" {
  log.Printf("[TRACE] yaml drift detected in %s for %s, was %s now blank", userProvided.GetSelfLink(), userKey, normalizedUserValue)
@@ -1077,12 +1080,12 @@ func getLiveManifestFields_WithIgnoredFields(ignoredFields []string, userProvide
  }
 
  sort.Strings(userKeys)
- returnedValues := []string{}
+ var returnedValues []string
  for _, k := range userKeys {
  returnedValues = append(returnedValues, fmt.Sprintf("%s=%s", k, flattenedUser[k]))
  }
 
- return strings.Join(returnedValues, ",")
+ return strings.Join(returnedValues, "\n")
 }
 
 var kubernetesControlFields = []string{