Skip to content

Commit 8935a0e

Browse files
authored
Fancy(er) Diff output (#89)
* Add initial support for fancy diff in diffLiveVsTargetObject function + test * Fix test data to reflect format change * Pin github.com/cyphar/filepath-securejoin to v0.3.6 to avoid argoproj/argo-cd#22007 * Revert ArgoCD version to avoid possible issues that caused #101
1 parent 636784a commit 8935a0e

File tree

6 files changed

+360
-381
lines changed

6 files changed

+360
-381
lines changed

Diff for: go.mod

+87-65
Original file line numberDiff line numberDiff line change
@@ -7,96 +7,108 @@ require github.com/alexliesenfeld/health v0.8.0
77
require (
88
github.com/argoproj/argo-cd/v2 v2.13.3
99
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b
10-
github.com/bradleyfalzon/ghinstallation/v2 v2.11.0
10+
github.com/bradleyfalzon/ghinstallation/v2 v2.14.0
1111
github.com/cenkalti/backoff/v4 v4.3.0
1212
github.com/go-test/deep v1.1.1
13+
github.com/gonvenience/ytbx v1.4.4
1314
github.com/google/go-github/v62 v62.0.0
1415
github.com/hashicorp/golang-lru/v2 v2.0.7
1516
github.com/hexops/gotextdiff v1.0.3
17+
github.com/homeport/dyff v1.9.4
1618
github.com/migueleliasweb/go-github-mock v1.1.0
1719
github.com/mikefarah/yq/v4 v4.43.1
1820
github.com/nao1215/markdown v0.7.0
19-
github.com/prometheus/client_golang v1.20.5
21+
github.com/prometheus/client_golang v1.21.1
2022
github.com/shurcooL/githubv4 v0.0.0-20240727222349-48295856cce7
2123
github.com/sirupsen/logrus v1.9.3
22-
github.com/spf13/cobra v1.8.1
24+
github.com/spf13/cobra v1.9.1
2325
github.com/stretchr/testify v1.10.0
2426
go.uber.org/mock v0.5.0
2527
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
26-
golang.org/x/oauth2 v0.23.0
28+
golang.org/x/oauth2 v0.28.0
2729
golang.org/x/tools v0.29.0
28-
google.golang.org/grpc v1.66.2
30+
google.golang.org/grpc v1.71.0
2931
gopkg.in/yaml.v2 v2.4.0
30-
k8s.io/api v0.32.1
31-
k8s.io/apimachinery v0.32.1
32+
gopkg.in/yaml.v3 v3.0.1
33+
k8s.io/api v0.32.2
34+
k8s.io/apimachinery v0.32.2
3235
)
3336

3437
require (
35-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
38+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
3639
dario.cat/mergo v1.0.1 // indirect
3740
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
41+
github.com/BurntSushi/toml v1.4.0 // indirect
3842
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3943
github.com/Masterminds/goutils v1.1.1 // indirect
40-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
44+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4145
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
4246
github.com/Microsoft/go-winio v0.6.2 // indirect
43-
github.com/ProtonMail/go-crypto v1.1.3 // indirect
47+
github.com/ProtonMail/go-crypto v1.1.5 // indirect
4448
github.com/a8m/envsubst v1.4.2 // indirect
4549
github.com/alecthomas/participle/v2 v2.1.1 // indirect
46-
github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 // indirect
50+
github.com/alicebob/miniredis/v2 v2.34.0 // indirect
51+
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
4752
github.com/beorn7/perks v1.0.1 // indirect
4853
github.com/blang/semver/v4 v4.0.0 // indirect
49-
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
54+
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
5055
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
5156
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5257
github.com/chai2010/gettext-go v1.0.2 // indirect
53-
github.com/cloudflare/circl v1.3.7 // indirect
54-
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
55-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
58+
github.com/cloudflare/circl v1.6.0 // indirect
59+
github.com/coreos/go-oidc/v3 v3.13.0 // indirect
60+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
5661
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5762
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
5863
github.com/dimchansky/utfbom v1.1.1 // indirect
5964
github.com/distribution/reference v0.6.0 // indirect
60-
github.com/dlclark/regexp2 v1.11.4 // indirect
65+
github.com/dlclark/regexp2 v1.11.5 // indirect
6166
github.com/elliotchance/orderedmap v1.5.1 // indirect
6267
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
6368
github.com/emirpasic/gods v1.18.1 // indirect
64-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
65-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
69+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
70+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
6671
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6772
github.com/fatih/camelcase v1.0.0 // indirect
6873
github.com/fatih/color v1.16.0 // indirect
6974
github.com/felixge/httpsnoop v1.0.4 // indirect
7075
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7176
github.com/go-errors/errors v1.5.1 // indirect
7277
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
73-
github.com/go-git/go-billy/v5 v5.6.1 // indirect
74-
github.com/go-git/go-git/v5 v5.13.1 // indirect
75-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
78+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
79+
github.com/go-git/go-git/v5 v5.14.0 // indirect
80+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
7681
github.com/go-logr/logr v1.4.2 // indirect
7782
github.com/go-logr/stdr v1.2.2 // indirect
7883
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7984
github.com/go-openapi/jsonreference v0.21.0 // indirect
8085
github.com/go-openapi/swag v0.23.0 // indirect
8186
github.com/go-redis/cache/v9 v9.0.0 // indirect
8287
github.com/gobwas/glob v0.2.3 // indirect
83-
github.com/goccy/go-json v0.10.2 // indirect
88+
github.com/goccy/go-json v0.10.5 // indirect
8489
github.com/goccy/go-yaml v1.11.3 // indirect
90+
github.com/gogits/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 // indirect
8591
github.com/gogo/protobuf v1.3.2 // indirect
86-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
87-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
92+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
93+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8894
github.com/golang/protobuf v1.5.4 // indirect
95+
github.com/gonvenience/bunt v1.3.5 // indirect
96+
github.com/gonvenience/neat v1.3.13 // indirect
97+
github.com/gonvenience/term v1.0.2 // indirect
98+
github.com/gonvenience/text v1.0.7 // indirect
99+
github.com/gonvenience/wrap v1.2.0 // indirect
89100
github.com/google/btree v1.1.3 // indirect
90-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
91-
github.com/google/go-cmp v0.6.0 // indirect
101+
github.com/google/gnostic-models v0.6.9 // indirect
102+
github.com/google/go-cmp v0.7.0 // indirect
92103
github.com/google/go-github/v64 v64.0.0 // indirect
104+
github.com/google/go-github/v69 v69.2.0 // indirect
93105
github.com/google/go-querystring v1.1.0 // indirect
94106
github.com/google/gofuzz v1.2.0 // indirect
95107
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
96108
github.com/google/uuid v1.6.0 // indirect
97109
github.com/gorilla/mux v1.8.0 // indirect
98110
github.com/gorilla/websocket v1.5.3 // indirect
99-
github.com/gosimple/slug v1.14.0 // indirect
111+
github.com/gosimple/slug v1.15.0 // indirect
100112
github.com/gosimple/unidecode v1.0.1 // indirect
101113
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
102114
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -105,7 +117,7 @@ require (
105117
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
106118
github.com/huandu/xstrings v1.5.0 // indirect
107119
github.com/inconshreveable/mousetrap v1.1.0 // indirect
108-
github.com/itchyny/gojq v0.12.16 // indirect
120+
github.com/itchyny/gojq v0.12.17 // indirect
109121
github.com/itchyny/timefmt-go v0.1.6 // indirect
110122
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
111123
github.com/jinzhu/copier v0.4.0 // indirect
@@ -115,16 +127,20 @@ require (
115127
github.com/karrick/godirwalk v1.17.0 // indirect
116128
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
117129
github.com/kevinburke/ssh_config v1.2.0 // indirect
118-
github.com/klauspost/compress v1.17.9 // indirect
130+
github.com/klauspost/compress v1.17.11 // indirect
119131
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
132+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
120133
github.com/magiconair/properties v1.8.7 // indirect
121134
github.com/mailru/easyjson v0.7.7 // indirect
135+
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
122136
github.com/mattn/go-colorable v0.1.13 // indirect
123137
github.com/mattn/go-isatty v0.0.20 // indirect
124138
github.com/mattn/go-runewidth v0.0.15 // indirect
125139
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
126140
github.com/mitchellh/copystructure v1.2.0 // indirect
141+
github.com/mitchellh/go-ps v1.0.0 // indirect
127142
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
143+
github.com/mitchellh/hashstructure v1.1.0 // indirect
128144
github.com/mitchellh/reflectwalk v1.0.2 // indirect
129145
github.com/moby/spdystream v0.5.0 // indirect
130146
github.com/moby/term v0.5.0 // indirect
@@ -133,79 +149,85 @@ require (
133149
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
134150
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
135151
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
136-
github.com/olekukonko/tablewriter v0.0.5 // indirect
152+
github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77 // indirect
137153
github.com/opencontainers/go-digest v1.0.0 // indirect
138154
github.com/opencontainers/image-spec v1.1.0 // indirect
139155
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
140156
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
141157
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
142-
github.com/pjbgf/sha1cd v0.3.0 // indirect
158+
github.com/pjbgf/sha1cd v0.3.2 // indirect
143159
github.com/pkg/errors v0.9.1 // indirect
144160
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
145161
github.com/prometheus/client_model v0.6.1 // indirect
146-
github.com/prometheus/common v0.55.0 // indirect
162+
github.com/prometheus/common v0.62.0 // indirect
147163
github.com/prometheus/procfs v0.15.1 // indirect
148164
github.com/r3labs/diff v1.1.0 // indirect
149-
github.com/redis/go-redis/v9 v9.6.1 // indirect
165+
github.com/redis/go-redis/v9 v9.7.1 // indirect
150166
github.com/rivo/uniseg v0.4.7 // indirect
151167
github.com/robfig/cron/v3 v3.0.1 // indirect
152168
github.com/russross/blackfriday/v2 v2.1.0 // indirect
153169
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
154170
github.com/shopspring/decimal v1.4.0 // indirect
155171
github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 // indirect
156-
github.com/skeema/knownhosts v1.3.0 // indirect
157-
github.com/spf13/cast v1.7.0 // indirect
158-
github.com/spf13/pflag v1.0.5 // indirect
172+
github.com/skeema/knownhosts v1.3.1 // indirect
173+
github.com/spf13/cast v1.7.1 // indirect
174+
github.com/spf13/pflag v1.0.6 // indirect
175+
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
159176
github.com/valyala/bytebufferpool v1.0.0 // indirect
160177
github.com/valyala/fasttemplate v1.2.2 // indirect
178+
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
161179
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
162180
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
163181
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
164182
github.com/x448/float16 v0.8.4 // indirect
165183
github.com/xanzy/ssh-agent v0.3.3 // indirect
166184
github.com/xlab/treeprint v1.2.0 // indirect
167185
github.com/yuin/gopher-lua v1.1.1 // indirect
168-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
169-
go.opentelemetry.io/otel v1.30.0 // indirect
170-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
171-
go.opentelemetry.io/otel/trace v1.30.0 // indirect
172-
go.uber.org/automaxprocs v1.5.3 // indirect
173-
golang.org/x/crypto v0.32.0 // indirect
174-
golang.org/x/net v0.34.0 // indirect
175-
golang.org/x/sync v0.10.0 // indirect
176-
golang.org/x/sys v0.29.0 // indirect
177-
golang.org/x/term v0.28.0 // indirect
178-
golang.org/x/text v0.21.0 // indirect
179-
golang.org/x/time v0.7.0 // indirect
186+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
187+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
188+
go.opentelemetry.io/otel v1.35.0 // indirect
189+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
190+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
191+
go.uber.org/automaxprocs v1.6.0 // indirect
192+
golang.org/x/crypto v0.36.0 // indirect
193+
golang.org/x/net v0.37.0 // indirect
194+
golang.org/x/sync v0.12.0 // indirect
195+
golang.org/x/sys v0.31.0 // indirect
196+
golang.org/x/term v0.30.0 // indirect
197+
golang.org/x/text v0.23.0 // indirect
198+
golang.org/x/time v0.11.0 // indirect
180199
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
181200
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
182-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
183-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
184-
google.golang.org/protobuf v1.35.1 // indirect
201+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
202+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
203+
google.golang.org/protobuf v1.36.5 // indirect
185204
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
186205
gopkg.in/inf.v0 v0.9.1 // indirect
187206
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
188207
gopkg.in/warnings.v0 v0.1.2 // indirect
189-
gopkg.in/yaml.v3 v3.0.1 // indirect
190-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
191-
k8s.io/apiserver v0.32.1 // indirect
192-
k8s.io/cli-runtime v0.32.1 // indirect
193-
k8s.io/client-go v0.32.1 // indirect
194-
k8s.io/component-base v0.32.1 // indirect
195-
k8s.io/component-helpers v0.32.1 // indirect
208+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
209+
k8s.io/apiserver v0.32.2 // indirect
210+
k8s.io/cli-runtime v0.32.2 // indirect
211+
k8s.io/client-go v0.32.2 // indirect
212+
k8s.io/component-base v0.32.2 // indirect
213+
k8s.io/component-helpers v0.32.2 // indirect
196214
k8s.io/controller-manager v0.32.1 // indirect
197215
k8s.io/klog/v2 v2.130.1 // indirect
198-
k8s.io/kube-aggregator v0.31.2 // indirect
199-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
200-
k8s.io/kubectl v0.32.1 // indirect
201-
k8s.io/kubernetes v1.32.1 // indirect
202-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
216+
k8s.io/kube-aggregator v0.32.2 // indirect
217+
k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9 // indirect
218+
k8s.io/kubectl v0.32.2 // indirect
219+
k8s.io/kubernetes v1.32.2 // indirect
220+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
203221
layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 // indirect
204222
oras.land/oras-go/v2 v2.5.0 // indirect
205-
sigs.k8s.io/controller-runtime v0.20.0 // indirect
223+
sigs.k8s.io/controller-runtime v0.20.1 // indirect
206224
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
207225
sigs.k8s.io/kustomize/api v0.18.0 // indirect
208226
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
209-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
227+
sigs.k8s.io/randfill v1.0.0 // indirect
228+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
210229
sigs.k8s.io/yaml v1.4.0 // indirect
211230
)
231+
232+
// temporarily replace github.com/cyphar/filepath-securejoin to avoid https://github.com/argoproj/argo-cd/issues/22007 should be removed after we move to ArgoCD 3.0
233+
replace github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.3.6

0 commit comments

Comments
 (0)