-
Notifications
You must be signed in to change notification settings - Fork 110
/
diff.go
496 lines (440 loc) · 11.9 KB
/
diff.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
package config
import (
"crypto/tls"
"encoding/json"
"reflect"
"sort"
"github.com/sergi/go-diff/diffmatchpatch"
"go.viam.com/utils/pexec"
"go.viam.com/rdk/resource"
)
// A Diff is the difference between two configs, left and right
// where left is usually old and right is new. So the diff is the
// changes from left to right.
type Diff struct {
Left, Right *Config
Added *Config
Modified *ModifiedConfigDiff
Removed *Config
ResourcesEqual bool
NetworkEqual bool
PrettyDiff string
}
// ModifiedConfigDiff is the modificative different between two configs.
type ModifiedConfigDiff struct {
Remotes []Remote
Components []resource.Config
Processes []pexec.ProcessConfig
Services []resource.Config
Packages []PackageConfig
Modules []Module
}
// DiffConfigs returns the difference between the two given configs
// from left to right.
func DiffConfigs(left, right Config, revealSensitiveConfigDiffs bool) (_ *Diff, err error) {
var PrettyDiff string
if revealSensitiveConfigDiffs {
PrettyDiff, err = prettyDiff(left, right)
if err != nil {
return nil, err
}
}
diff := Diff{
Left: &left,
Right: &right,
Added: &Config{},
Modified: &ModifiedConfigDiff{},
Removed: &Config{},
PrettyDiff: PrettyDiff,
}
// All diffs use the following logic:
// If left contains something right does not => removed
// If right contains something left does not => added
// If left contains something right does and they are not equal => modified
// If left contains something right does and they are equal => no diff
// Note: generics would be nice here!
different := diffRemotes(left.Remotes, right.Remotes, &diff)
componentsDifferent := diffComponents(left.Components, right.Components, &diff)
different = componentsDifferent || different
servicesDifferent := diffServices(left.Services, right.Services, &diff)
different = servicesDifferent || different
processesDifferent := diffProcesses(left.Processes, right.Processes, &diff) || different
different = processesDifferent || different
packagesDifferent := diffPackages(left.Packages, right.Packages, &diff) || different
different = packagesDifferent || different
different = diffModules(left.Modules, right.Modules, &diff) || different
diff.ResourcesEqual = !different
networkDifferent := diffNetworkingCfg(&left, &right)
diff.NetworkEqual = !networkDifferent
return &diff, nil
}
func prettyDiff(left, right Config) (string, error) {
leftMd, err := json.Marshal(left)
if err != nil {
return "", err
}
rightMd, err := json.Marshal(right)
if err != nil {
return "", err
}
var leftClone, rightClone Config
if err := json.Unmarshal(leftMd, &leftClone); err != nil {
return "", err
}
if err := json.Unmarshal(rightMd, &rightClone); err != nil {
return "", err
}
left = leftClone
right = rightClone
mask := "******"
sanitizeConfig := func(conf *Config) {
// Note(erd): keep in mind this will destroy the actual pretty diffing of these which
// is fine because we aren't considering pretty diff changes to these fields at this level
// of the stack.
if conf.Cloud != nil {
if conf.Cloud.Secret != "" {
conf.Cloud.Secret = mask
}
if conf.Cloud.LocationSecret != "" {
conf.Cloud.LocationSecret = mask
}
for i := range conf.Cloud.LocationSecrets {
if conf.Cloud.LocationSecrets[i].Secret != "" {
conf.Cloud.LocationSecrets[i].Secret = mask
}
}
// Not really a secret but annoying to diff
if conf.Cloud.TLSCertificate != "" {
conf.Cloud.TLSCertificate = mask
}
if conf.Cloud.TLSPrivateKey != "" {
conf.Cloud.TLSPrivateKey = mask
}
}
for _, hdlr := range conf.Auth.Handlers {
for key := range hdlr.Config {
hdlr.Config[key] = mask
}
}
for i := range conf.Remotes {
rem := &conf.Remotes[i]
if rem.Secret != "" {
rem.Secret = mask
}
if rem.Auth.Credentials != nil {
rem.Auth.Credentials.Payload = mask
}
if rem.Auth.SignalingCreds != nil {
rem.Auth.SignalingCreds.Payload = mask
}
}
}
sanitizeConfig(&left)
sanitizeConfig(&right)
leftMd, err = json.MarshalIndent(left, "", " ")
if err != nil {
return "", err
}
rightMd, err = json.MarshalIndent(right, "", " ")
if err != nil {
return "", err
}
dmp := diffmatchpatch.New()
diffs := dmp.DiffMain(string(leftMd), string(rightMd), true)
filteredDiffs := make([]diffmatchpatch.Diff, 0, len(diffs))
for _, d := range diffs {
if d.Type == diffmatchpatch.DiffEqual {
continue
}
filteredDiffs = append(filteredDiffs, d)
}
return dmp.DiffPrettyText(filteredDiffs), nil
}
// String returns a pretty version of the diff.
func (diff *Diff) String() string {
return diff.PrettyDiff
}
//nolint:dupl
func diffRemotes(left, right []Remote, diff *Diff) bool {
leftIndex := make(map[string]int)
leftM := make(map[string]Remote)
for idx, l := range left {
leftM[l.Name] = l
leftIndex[l.Name] = idx
}
var removed []int
var different bool
for _, r := range right {
l, ok := leftM[r.Name]
delete(leftM, r.Name)
if ok {
different = diffRemote(l, r, diff) || different
continue
}
diff.Added.Remotes = append(diff.Added.Remotes, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Remotes = append(diff.Removed.Remotes, left[idx])
}
return different
}
func diffRemote(left, right Remote, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Remotes = append(diff.Modified.Remotes, right)
return true
}
//nolint:dupl
func diffComponents(left, right []resource.Config, diff *Diff) bool {
leftIndex := make(map[resource.Name]int)
leftM := make(map[resource.Name]resource.Config)
for idx, l := range left {
leftM[l.ResourceName()] = l
leftIndex[l.ResourceName()] = idx
}
var removed []int
var different bool
for _, r := range right {
l, ok := leftM[r.ResourceName()]
delete(leftM, r.ResourceName())
if ok {
componentDifferent := diffComponent(l, r, diff)
different = componentDifferent || different
continue
}
diff.Added.Components = append(diff.Added.Components, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Components = append(diff.Removed.Components, left[idx])
}
return different
}
func diffComponent(left, right resource.Config, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Components = append(diff.Modified.Components, right)
return true
}
func diffProcesses(left, right []pexec.ProcessConfig, diff *Diff) bool {
leftIndex := make(map[string]int)
leftM := make(map[string]pexec.ProcessConfig)
for idx, l := range left {
leftM[l.ID] = l
leftIndex[l.ID] = idx
}
var removed []int
var different bool
for _, r := range right {
l, ok := leftM[r.ID]
delete(leftM, r.ID)
if ok {
different = diffProcess(l, r, diff) || different
continue
}
diff.Added.Processes = append(diff.Added.Processes, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Processes = append(diff.Removed.Processes, left[idx])
}
return different
}
func diffProcess(left, right pexec.ProcessConfig, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Processes = append(diff.Modified.Processes, right)
return true
}
//nolint:dupl
func diffPackages(left, right []PackageConfig, diff *Diff) bool {
leftIndex := make(map[string]int)
leftM := make(map[string]PackageConfig)
for idx, l := range left {
leftM[l.Name] = l
leftIndex[l.Name] = idx
}
var removed []int
var different bool
for _, r := range right {
l, ok := leftM[r.Name]
delete(leftM, r.Name)
if ok {
different = diffPackage(l, r, diff) || different
continue
}
diff.Added.Packages = append(diff.Added.Packages, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Packages = append(diff.Removed.Packages, left[idx])
}
return different
}
func diffPackage(left, right PackageConfig, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Packages = append(diff.Modified.Packages, right)
return true
}
//nolint:dupl
func diffServices(left, right []resource.Config, diff *Diff) bool {
leftIndex := make(map[resource.Name]int)
leftM := make(map[resource.Name]resource.Config)
for idx, l := range left {
leftM[l.ResourceName()] = l
leftIndex[l.ResourceName()] = idx
}
var removed []int
var different bool
for _, r := range right {
l, ok := leftM[r.ResourceName()]
delete(leftM, r.ResourceName())
if ok {
serviceDifferent := diffService(l, r, diff)
different = serviceDifferent || different
continue
}
diff.Added.Services = append(diff.Added.Services, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Services = append(diff.Removed.Services, left[idx])
}
return different
}
func diffService(left, right resource.Config, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Services = append(diff.Modified.Services, right)
return true
}
// diffNetworkingCfg returns true if any part of the networking config is different.
func diffNetworkingCfg(left, right *Config) bool {
if !reflect.DeepEqual(left.Cloud, right.Cloud) {
return true
}
// for network, we have to check each field separately
if diffNetwork(left.Network, right.Network) {
return true
}
if !reflect.DeepEqual(left.Auth, right.Auth) {
return true
}
return false
}
// diffNetwork returns true if any part of the network config is different.
func diffNetwork(leftCopy, rightCopy NetworkConfig) bool {
if diffTLS(leftCopy.TLSConfig, rightCopy.TLSConfig) {
return true
}
// TLSConfig holds funcs, which will never deeply equal so ignore them here
leftCopy.TLSConfig = nil
rightCopy.TLSConfig = nil
return !reflect.DeepEqual(leftCopy, rightCopy)
}
// diffTLS returns true if any part of the TLS config is different.
func diffTLS(leftTLS, rightTLS *tls.Config) bool {
switch {
case leftTLS == nil && rightTLS == nil:
return false
case leftTLS == nil && rightTLS != nil:
fallthrough
case leftTLS != nil && rightTLS == nil:
return true
}
if leftTLS.MinVersion != rightTLS.MinVersion {
return true
}
leftCert, err := leftTLS.GetCertificate(nil)
if err != nil {
return true
}
rightCert, err := rightTLS.GetCertificate(nil)
if err != nil {
return true
}
if !reflect.DeepEqual(leftCert, rightCert) {
return true
}
leftClientCert, err := leftTLS.GetClientCertificate(nil)
if err != nil {
return true
}
rightClientCert, err := rightTLS.GetClientCertificate(nil)
if err != nil {
return true
}
if !reflect.DeepEqual(leftClientCert, rightClientCert) {
return true
}
return false
}
//nolint:dupl
func diffModules(leftModules, rightModules []Module, diff *Diff) bool {
leftIndex := make(map[string]int)
leftM := make(map[string]Module)
for idx, l := range leftModules {
leftM[l.Name] = l
leftIndex[l.Name] = idx
}
var removed []int
var different bool
for _, r := range rightModules {
l, ok := leftM[r.Name]
delete(leftM, r.Name)
if ok {
different = diffModule(l, r, diff) || different
continue
}
diff.Added.Modules = append(diff.Added.Modules, r)
different = true
}
for k := range leftM {
removed = append(removed, leftIndex[k])
different = true
}
sort.Ints(removed)
for _, idx := range removed {
diff.Removed.Modules = append(diff.Removed.Modules, leftModules[idx])
}
return different
}
func diffModule(left, right Module, diff *Diff) bool {
if left.Equals(right) {
return false
}
diff.Modified.Modules = append(diff.Modified.Modules, right)
return true
}