File tree Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ require (
20
20
github.com/stretchr/testify v1.7.0
21
21
go.uber.org/ratelimit v0.1.1-0.20201110185707-e86515f0dda9
22
22
golang.org/x/crypto v0.1.0
23
+ golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
23
24
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
24
25
gopkg.in/yaml.v2 v2.4.0
25
26
k8s.io/api v1.22.4
@@ -128,7 +129,6 @@ require (
128
129
github.com/xanzy/ssh-agent v0.2.1 // indirect
129
130
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
130
131
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
131
- golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
132
132
golang.org/x/net v0.7.0 // indirect
133
133
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
134
134
golang.org/x/sys v0.5.0 // indirect
Original file line number Diff line number Diff line change @@ -415,7 +415,6 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
415
415
github.com/google/go-cmp v0.5.2 /go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE =
416
416
github.com/google/go-cmp v0.5.4 /go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE =
417
417
github.com/google/go-cmp v0.5.5 /go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE =
418
- github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ =
419
418
github.com/google/go-cmp v0.5.6 /go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE =
420
419
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg =
421
420
github.com/google/go-cmp v0.5.8 /go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY =
@@ -966,7 +965,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
966
965
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd /go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM =
967
966
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 /go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU =
968
967
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f /go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4 =
969
- golang.org/x/exp v0.0.0-20210901193431-a062eea981d2 h1:Or4Ra3AAlhUlNn8WmIzw2Yq2vUHSkrP6E2e/FIESpF8 =
970
968
golang.org/x/exp v0.0.0-20210901193431-a062eea981d2 /go.mod h1:a3o/VtDNHN+dCVLEpzjjUHOzR+Ln3DHX056ZPzoZGGA =
971
969
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc =
972
970
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 /go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w =
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ package argocd
3
3
import (
4
4
"context"
5
5
"fmt"
6
- "golang.org/x/exp/slices"
7
6
"path/filepath"
8
7
"strings"
9
8
"sync"
@@ -17,6 +16,7 @@ import (
17
16
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
18
17
"github.com/argoproj-labs/argocd-image-updater/pkg/registry"
19
18
"github.com/argoproj-labs/argocd-image-updater/pkg/tag"
19
+ "golang.org/x/exp/slices"
20
20
21
21
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
22
22
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@@ -398,7 +398,7 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
398
398
override , err = yaml .Marshal (newParams )
399
399
break
400
400
}
401
- err : = yaml .Unmarshal (originalData , & params )
401
+ err = yaml .Unmarshal (originalData , & params )
402
402
if err != nil {
403
403
override , err = yaml .Marshal (newParams )
404
404
break
You can’t perform that action at this time.
0 commit comments