-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathdiff.go
More file actions
462 lines (400 loc) · 12.1 KB
/
Copy pathdiff.go
File metadata and controls
462 lines (400 loc) · 12.1 KB
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
package cmd
import (
"context"
"fmt"
"sort"
"strings"
"github.com/fatih/color"
"github.com/keywaysh/cli/internal/analytics"
envpkg "github.com/keywaysh/cli/internal/env"
"github.com/keywaysh/cli/internal/ui"
"github.com/spf13/cobra"
)
var yellow = color.New(color.FgYellow)
var diffCmd = &cobra.Command{
Use: "diff [env1] [env2]",
Short: "Compare secrets between two environments",
Long: `Compare secrets between two environments to find differences.
When run without arguments in an interactive terminal, prompts for environment selection.
Examples:
keyway diff # Interactive selection
keyway diff production staging
keyway diff development production --show-values
keyway diff prod dev --keys-only`,
Args: cobra.RangeArgs(0, 2),
RunE: runDiff,
}
func init() {
diffCmd.Flags().Bool("show-values", false, "Show actual value differences (sensitive!)")
diffCmd.Flags().Bool("keys-only", false, "Only show key names, no status details")
diffCmd.Flags().Bool("json", false, "Output as JSON")
}
// DiffResult represents the comparison between two environments
type DiffResult struct {
Env1 string `json:"env1"`
Env2 string `json:"env2"`
OnlyInEnv1 []string `json:"onlyInEnv1"`
OnlyInEnv2 []string `json:"onlyInEnv2"`
Different []DiffEntry `json:"different"`
Same []string `json:"same"`
Stats DiffStats `json:"stats"`
}
type DiffEntry struct {
Key string `json:"key"`
Value1 string `json:"value1,omitempty"`
Value2 string `json:"value2,omitempty"`
Preview1 string `json:"preview1,omitempty"`
Preview2 string `json:"preview2,omitempty"`
}
type DiffStats struct {
TotalEnv1 int `json:"totalEnv1"`
TotalEnv2 int `json:"totalEnv2"`
OnlyInEnv1 int `json:"onlyInEnv1"`
OnlyInEnv2 int `json:"onlyInEnv2"`
Different int `json:"different"`
Same int `json:"same"`
}
// DiffOptions contains the parsed flags for the diff command
type DiffOptions struct {
Env1 string
Env2 string
ShowValues bool
KeysOnly bool
JSONOutput bool
}
// runDiff is the entry point for the diff command (uses default dependencies)
func runDiff(cmd *cobra.Command, args []string) error {
opts := DiffOptions{}
opts.ShowValues, _ = cmd.Flags().GetBool("show-values")
opts.KeysOnly, _ = cmd.Flags().GetBool("keys-only")
opts.JSONOutput, _ = cmd.Flags().GetBool("json")
if len(args) >= 1 {
opts.Env1 = args[0]
}
if len(args) >= 2 {
opts.Env2 = args[1]
}
return runDiffWithDeps(opts, defaultDeps)
}
// runDiffWithDeps is the testable version of runDiff
func runDiffWithDeps(opts DiffOptions, deps *Dependencies) error {
deps.UI.Intro("diff")
repo, err := deps.Git.DetectRepo()
if err != nil {
deps.UI.Error("Not in a git repository with GitHub remote")
return err
}
deps.UI.Step(fmt.Sprintf("Repository: %s", deps.UI.Value(repo)))
token, err := deps.Auth.EnsureLogin()
if err != nil {
return err
}
client := deps.APIFactory.NewClient(token)
ctx := context.Background()
env1 := opts.Env1
env2 := opts.Env2
// If arguments not provided, prompt interactively
if env1 == "" || env2 == "" {
if !deps.UI.IsInteractive() {
deps.UI.Error("Two environment arguments required in non-interactive mode")
return fmt.Errorf("missing arguments")
}
// Fetch available environments
var environments []string
err = deps.UI.Spin("Fetching environments...", func() error {
var fetchErr error
environments, fetchErr = client.GetVaultEnvironments(ctx, repo)
return fetchErr
})
if err != nil {
deps.UI.Error(fmt.Sprintf("Failed to fetch environments: %v", err))
return err
}
if len(environments) < 2 {
deps.UI.Error("At least 2 environments are needed to compare")
deps.UI.Message(deps.UI.Dim("Push secrets to more environments first with: keyway push -e <env>"))
return fmt.Errorf("not enough environments")
}
// First environment selection
if env1 == "" {
env1, err = deps.UI.Select("Select first environment:", environments)
if err != nil {
return err
}
} else {
env1 = normalizeEnvName(env1)
}
// Filter out selected env1 for second selection
remaining := make([]string, 0, len(environments)-1)
for _, e := range environments {
if e != env1 {
remaining = append(remaining, e)
}
}
if len(remaining) == 0 {
deps.UI.Error("No other environments to compare with")
return fmt.Errorf("no environments")
}
env2, err = deps.UI.Select("Select second environment:", remaining)
if err != nil {
return err
}
} else {
env1 = normalizeEnvName(env1)
env2 = normalizeEnvName(env2)
}
deps.UI.Message(deps.UI.Dim(fmt.Sprintf("Comparing %s vs %s", deps.UI.Bold(env1), deps.UI.Bold(env2))))
if env1 == env2 {
deps.UI.Error("Cannot compare an environment with itself")
return fmt.Errorf("same environment")
}
// Pull secrets from both environments
var secrets1, secrets2 map[string]string
var pullErr1, pullErr2 error
err = deps.UI.Spin(fmt.Sprintf("Fetching %s and %s...", env1, env2), func() error {
resp1, err := client.PullSecrets(ctx, repo, env1)
if err != nil {
pullErr1 = err
} else {
secrets1 = envpkg.Parse(resp1.Content)
}
resp2, err := client.PullSecrets(ctx, repo, env2)
if err != nil {
pullErr2 = err
} else {
secrets2 = envpkg.Parse(resp2.Content)
}
return nil
})
if err != nil {
return err
}
// Handle pull errors
if pullErr1 != nil && pullErr2 != nil {
deps.UI.Error(fmt.Sprintf("Failed to fetch both environments: %s, %s", env1, env2))
return fmt.Errorf("failed to fetch environments")
}
if pullErr1 != nil {
deps.UI.Warn(fmt.Sprintf("Environment '%s' is empty or doesn't exist", env1))
secrets1 = make(map[string]string)
}
if pullErr2 != nil {
deps.UI.Warn(fmt.Sprintf("Environment '%s' is empty or doesn't exist", env2))
secrets2 = make(map[string]string)
}
// Compare secrets
result := compareSecrets(env1, env2, secrets1, secrets2, opts.ShowValues)
// Track diff event
analytics.Track(analytics.EventDiff, map[string]interface{}{
"env1": env1,
"env2": env2,
"differences_count": result.Stats.Different + result.Stats.OnlyInEnv1 + result.Stats.OnlyInEnv2,
"same_count": result.Stats.Same,
"total_env1": result.Stats.TotalEnv1,
"total_env2": result.Stats.TotalEnv2,
})
if opts.JSONOutput {
return printDiffJSON(result)
}
// Display results
printDiffResults(result, env1, env2, opts.ShowValues, opts.KeysOnly)
deps.UI.Outro("")
return nil
}
func normalizeEnvName(name string) string {
return envpkg.NormalizeEnvName(name)
}
func compareSecrets(env1, env2 string, secrets1, secrets2 map[string]string, includeValues bool) *DiffResult {
result := &DiffResult{
Env1: env1,
Env2: env2,
OnlyInEnv1: []string{},
OnlyInEnv2: []string{},
Different: []DiffEntry{},
Same: []string{},
}
// Get all keys
allKeys := make(map[string]bool)
for k := range secrets1 {
allKeys[k] = true
}
for k := range secrets2 {
allKeys[k] = true
}
// Sort keys for consistent output
sortedKeys := make([]string, 0, len(allKeys))
for k := range allKeys {
sortedKeys = append(sortedKeys, k)
}
sort.Strings(sortedKeys)
// Compare
for _, key := range sortedKeys {
val1, in1 := secrets1[key]
val2, in2 := secrets2[key]
if in1 && !in2 {
result.OnlyInEnv1 = append(result.OnlyInEnv1, key)
} else if !in1 && in2 {
result.OnlyInEnv2 = append(result.OnlyInEnv2, key)
} else if val1 != val2 {
entry := DiffEntry{
Key: key,
Preview1: previewValue(val1),
Preview2: previewValue(val2),
}
if includeValues {
entry.Value1 = val1
entry.Value2 = val2
}
result.Different = append(result.Different, entry)
} else {
result.Same = append(result.Same, key)
}
}
// Stats
result.Stats = DiffStats{
TotalEnv1: len(secrets1),
TotalEnv2: len(secrets2),
OnlyInEnv1: len(result.OnlyInEnv1),
OnlyInEnv2: len(result.OnlyInEnv2),
Different: len(result.Different),
Same: len(result.Same),
}
return result
}
// previewValue returns a safe preview of a secret value
// Shows last 2 chars + length to help identify changes without exposing sensitive data
// Last chars are more distinctive than first chars (which are often common prefixes like sk_, gh_, etc.)
func previewValue(value string) string {
length := len(value)
if length == 0 {
return "(empty)"
}
if length <= 2 {
return fmt.Sprintf("**%s (%d chars)", value, length)
}
return fmt.Sprintf("**%s (%d chars)", value[length-2:], length)
}
func maskValue(value string) string {
if len(value) <= 4 {
return "****"
}
return value[:2] + strings.Repeat("*", len(value)-4) + value[len(value)-2:]
}
func printDiffResults(result *DiffResult, env1, env2 string, showValues, keysOnly bool) {
// Summary
if result.Stats.OnlyInEnv1 == 0 && result.Stats.OnlyInEnv2 == 0 && result.Stats.Different == 0 {
ui.Success("Environments are identical!")
ui.Message(ui.Dim(fmt.Sprintf("%d secrets in both environments", result.Stats.Same)))
return
}
// Only in env1
if len(result.OnlyInEnv1) > 0 {
fmt.Println()
ui.Message(fmt.Sprintf("Only in %s (%d):", ui.Bold(env1), len(result.OnlyInEnv1)))
for _, key := range result.OnlyInEnv1 {
if keysOnly {
fmt.Printf(" %s\n", key)
} else {
fmt.Printf(" %s %s\n", ui.Value("-"), key)
}
}
}
// Only in env2
if len(result.OnlyInEnv2) > 0 {
fmt.Println()
ui.Message(fmt.Sprintf("Only in %s (%d):", ui.Bold(env2), len(result.OnlyInEnv2)))
for _, key := range result.OnlyInEnv2 {
if keysOnly {
fmt.Printf(" %s\n", key)
} else {
fmt.Printf(" %s %s\n", ui.Value("+"), key)
}
}
}
// Different values
if len(result.Different) > 0 {
fmt.Println()
ui.Message(fmt.Sprintf("Different values (%d):", len(result.Different)))
for _, entry := range result.Different {
if keysOnly {
fmt.Printf(" %s\n", entry.Key)
} else if showValues {
fmt.Printf(" %s %s\n", yellow.Sprint("~"), entry.Key)
fmt.Printf(" %s: %s\n", env1, maskValue(entry.Value1))
fmt.Printf(" %s: %s\n", env2, maskValue(entry.Value2))
} else {
fmt.Printf(" %s %s %s\n", yellow.Sprint("~"), entry.Key, ui.Dim(fmt.Sprintf("%s → %s", entry.Preview1, entry.Preview2)))
}
}
}
// Summary stats
fmt.Println()
ui.Step("Summary:")
ui.Message(ui.Dim(fmt.Sprintf(" %s: %d secrets", env1, result.Stats.TotalEnv1)))
ui.Message(ui.Dim(fmt.Sprintf(" %s: %d secrets", env2, result.Stats.TotalEnv2)))
if result.Stats.Same > 0 {
ui.Message(ui.Dim(fmt.Sprintf(" Identical: %d", result.Stats.Same)))
}
if result.Stats.Different > 0 {
ui.Message(fmt.Sprintf(" Different: %d", result.Stats.Different))
}
if result.Stats.OnlyInEnv1 > 0 {
ui.Message(fmt.Sprintf(" Only in %s: %d", env1, result.Stats.OnlyInEnv1))
}
if result.Stats.OnlyInEnv2 > 0 {
ui.Message(fmt.Sprintf(" Only in %s: %d", env2, result.Stats.OnlyInEnv2))
}
}
func printDiffJSON(result *DiffResult) error {
// Simple JSON output without external dependency
fmt.Println("{")
fmt.Printf(" \"env1\": %q,\n", result.Env1)
fmt.Printf(" \"env2\": %q,\n", result.Env2)
// OnlyInEnv1
fmt.Print(" \"onlyInEnv1\": [")
for i, k := range result.OnlyInEnv1 {
if i > 0 {
fmt.Print(", ")
}
fmt.Printf("%q", k)
}
fmt.Println("],")
// OnlyInEnv2
fmt.Print(" \"onlyInEnv2\": [")
for i, k := range result.OnlyInEnv2 {
if i > 0 {
fmt.Print(", ")
}
fmt.Printf("%q", k)
}
fmt.Println("],")
// Different
fmt.Print(" \"different\": [")
for i, d := range result.Different {
if i > 0 {
fmt.Print(", ")
}
fmt.Printf("{\"key\": %q, \"preview1\": %q, \"preview2\": %q}", d.Key, d.Preview1, d.Preview2)
}
fmt.Println("],")
// Same
fmt.Print(" \"same\": [")
for i, k := range result.Same {
if i > 0 {
fmt.Print(", ")
}
fmt.Printf("%q", k)
}
fmt.Println("],")
// Stats
fmt.Println(" \"stats\": {")
fmt.Printf(" \"totalEnv1\": %d,\n", result.Stats.TotalEnv1)
fmt.Printf(" \"totalEnv2\": %d,\n", result.Stats.TotalEnv2)
fmt.Printf(" \"onlyInEnv1\": %d,\n", result.Stats.OnlyInEnv1)
fmt.Printf(" \"onlyInEnv2\": %d,\n", result.Stats.OnlyInEnv2)
fmt.Printf(" \"different\": %d,\n", result.Stats.Different)
fmt.Printf(" \"same\": %d\n", result.Stats.Same)
fmt.Println(" }")
fmt.Println("}")
return nil
}