Skip to content

Commit 6d63683

Browse files
andrii-korotkov-verkadaandrii-korotkov-verkada
authored
chore(deps): Update some dependencies versions (argoproj#22228) (argoproj#22260)
Signed-off-by: Andrii Korotkov <[email protected]>
1 parent 401e835 commit 6d63683

File tree

18 files changed

+150
-76
lines changed

18 files changed

+150
-76
lines changed

‎.mockery.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ packages:
1818
interfaces:
1919
AWSCodeCommitClient:
2020
AWSTaggingClient:
21-
github.com/microsoft/azure-devops-go-api/azuredevops/git:
21+
github.com/microsoft/azure-devops-go-api/azuredevops/v7/git:
2222
config:
2323
dir: "applicationset/services/scm_provider/azure_devops/git/mocks"
2424
interfaces:

‎applicationset/services/internal/github_app/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66

77
"github.com/bradleyfalzon/ghinstallation/v2"
8-
"github.com/google/go-github/v66/github"
8+
"github.com/google/go-github/v69/github"
99

1010
"github.com/argoproj/argo-cd/v3/applicationset/services/github_app_auth"
1111
)

‎applicationset/services/pull_request/azure_devops.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/microsoft/azure-devops-go-api/azuredevops"
9-
"github.com/microsoft/azure-devops-go-api/azuredevops/core"
10-
"github.com/microsoft/azure-devops-go-api/azuredevops/git"
8+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7"
9+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/core"
10+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/git"
1111
)
1212

1313
const AZURE_DEVOPS_DEFAULT_URL = "https://dev.azure.com"

‎applicationset/services/pull_request/azure_devops_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/microsoft/azure-devops-go-api/azuredevops/webapi"
8-
9-
"github.com/microsoft/azure-devops-go-api/azuredevops/core"
10-
"github.com/microsoft/azure-devops-go-api/azuredevops/git"
7+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/core"
8+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/git"
9+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/webapi"
1110
"github.com/stretchr/testify/assert"
1211
"github.com/stretchr/testify/mock"
1312
"github.com/stretchr/testify/require"

‎applicationset/services/pull_request/github.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"os"
88

9-
"github.com/google/go-github/v66/github"
9+
"github.com/google/go-github/v69/github"
1010
)
1111

1212
type GithubService struct {

‎applicationset/services/pull_request/github_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pull_request
33
import (
44
"testing"
55

6-
"github.com/google/go-github/v66/github"
6+
"github.com/google/go-github/v69/github"
77
"github.com/stretchr/testify/require"
88
)
99

‎applicationset/services/scm_provider/azure_devops.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strings"
99

1010
"github.com/google/uuid"
11-
"github.com/microsoft/azure-devops-go-api/azuredevops"
12-
azureGit "github.com/microsoft/azure-devops-go-api/azuredevops/git"
11+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7"
12+
azureGit "github.com/microsoft/azure-devops-go-api/azuredevops/v7/git"
1313
)
1414

1515
const AZURE_DEVOPS_DEFAULT_URL = "https://dev.azure.com"

‎applicationset/services/scm_provider/azure_devops/git/mocks/Client.go

+93-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎applicationset/services/scm_provider/azure_devops_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/stretchr/testify/require"
1313
"k8s.io/utils/ptr"
1414

15-
"github.com/microsoft/azure-devops-go-api/azuredevops"
16-
azureGit "github.com/microsoft/azure-devops-go-api/azuredevops/git"
15+
"github.com/microsoft/azure-devops-go-api/azuredevops/v7"
16+
azureGit "github.com/microsoft/azure-devops-go-api/azuredevops/v7/git"
1717

1818
azureMock "github.com/argoproj/argo-cd/v3/applicationset/services/scm_provider/azure_devops/git/mocks"
1919
)

‎applicationset/services/scm_provider/github.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"os"
88

9-
"github.com/google/go-github/v66/github"
9+
"github.com/google/go-github/v69/github"
1010
)
1111

1212
type GithubProvider struct {

‎cmpserver/apiclient/clientset.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import (
88
"github.com/argoproj/argo-cd/v3/common"
99
"github.com/argoproj/argo-cd/v3/util/env"
1010

11-
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
12-
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
11+
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
1312
log "github.com/sirupsen/logrus"
1413
"google.golang.org/grpc"
1514
"google.golang.org/grpc/credentials/insecure"
@@ -46,7 +45,7 @@ func NewConnection(address string) (*grpc.ClientConn, error) {
4645
unaryInterceptors := []grpc.UnaryClientInterceptor{grpc_retry.UnaryClientInterceptor(retryOpts...)}
4746
dialOpts := []grpc.DialOption{
4847
grpc.WithStreamInterceptor(grpc_retry.StreamClientInterceptor(retryOpts...)),
49-
grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(unaryInterceptors...)),
48+
grpc.WithChainUnaryInterceptor(unaryInterceptors...),
5049
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxGRPCMessageSize), grpc.MaxCallSendMsgSize(MaxGRPCMessageSize)),
5150
grpc.WithUnaryInterceptor(grpc_util.OTELUnaryClientInterceptor()),
5251
grpc.WithStreamInterceptor(grpc_util.OTELStreamClientInterceptor()),

‎docs/operator-manual/server-commands/argocd-applicationset-controller.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+11-13
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,15 @@ require (
4646
github.com/golang/protobuf v1.5.4
4747
github.com/google/btree v1.1.3
4848
github.com/google/go-cmp v0.7.0
49-
github.com/google/go-github/v66 v66.0.0
50-
github.com/google/go-jsonnet v0.20.0
49+
github.com/google/go-github/v69 v69.2.0
50+
github.com/google/go-jsonnet v0.21.0-rc1.0.20250311032901-bc787d68ca30
5151
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
52-
github.com/google/uuid v1.6.0
52+
github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518
5353
github.com/gorilla/handlers v1.5.2
5454
github.com/gorilla/websocket v1.5.3
5555
github.com/gosimple/slug v1.15.0
56-
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
5756
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
58-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
57+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
5958
github.com/grpc-ecosystem/grpc-gateway v1.16.0
6059
github.com/hashicorp/go-retryablehttp v0.7.7
6160
github.com/improbable-eng/grpc-web v0.15.1-0.20230209220825-1d9bbb09a099
@@ -65,15 +64,15 @@ require (
6564
github.com/ktrysmt/go-bitbucket v0.9.81
6665
github.com/mattn/go-isatty v0.0.20
6766
github.com/mattn/go-zglob v0.0.6
68-
github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5
67+
github.com/microsoft/azure-devops-go-api/azuredevops/v7 v7.1.1-0.20241014080628-3045bdf43455
6968
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
7069
github.com/olekukonko/tablewriter v0.0.6-0.20230925090304-df64c4bbad77
71-
github.com/patrickmn/go-cache v2.1.0+incompatible
70+
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible
7271
github.com/prometheus/client_golang v1.21.1
7372
github.com/prometheus/client_model v0.6.1
7473
github.com/r3labs/diff/v3 v3.0.1
7574
github.com/redis/go-redis/v9 v9.7.1
76-
github.com/robfig/cron/v3 v3.0.1
75+
github.com/robfig/cron/v3 v3.0.2-0.20210106135023-bc59245fe10e
7776
github.com/sirupsen/logrus v1.9.3
7877
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
7978
github.com/soheilhy/cmux v0.1.5
@@ -164,7 +163,7 @@ require (
164163
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
165164
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
166165
github.com/davidmz/go-pageant v1.0.2 // indirect
167-
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
166+
github.com/desertbit/timer v1.0.1 // indirect
168167
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
169168
github.com/distribution/reference v0.6.0 // indirect
170169
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -191,7 +190,6 @@ require (
191190
github.com/golang/glog v1.2.4 // indirect
192191
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
193192
github.com/google/gnostic-models v0.6.9 // indirect
194-
github.com/google/go-github/v69 v69.2.0 // indirect
195193
github.com/google/go-querystring v1.1.0 // indirect
196194
github.com/google/gofuzz v1.2.0 // indirect
197195
github.com/google/s2a-go v0.1.9 // indirect
@@ -217,7 +215,7 @@ require (
217215
github.com/kylelemons/godebug v1.1.0 // indirect
218216
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
219217
github.com/mailru/easyjson v0.7.7 // indirect
220-
github.com/mattn/go-runewidth v0.0.15 // indirect
218+
github.com/mattn/go-runewidth v0.0.16 // indirect
221219
github.com/mitchellh/copystructure v1.2.0 // indirect
222220
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
223221
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -241,7 +239,7 @@ require (
241239
github.com/prometheus/common v0.62.0 // indirect
242240
github.com/prometheus/procfs v0.15.1 // indirect
243241
github.com/rivo/uniseg v0.4.7 // indirect
244-
github.com/rs/cors v1.11.0 // indirect
242+
github.com/rs/cors v1.11.1 // indirect
245243
github.com/russross/blackfriday/v2 v2.1.0 // indirect
246244
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
247245
github.com/shopspring/decimal v1.4.0 // indirect
@@ -251,7 +249,7 @@ require (
251249
github.com/stretchr/objx v0.5.2 // indirect
252250
github.com/valyala/bytebufferpool v1.0.0 // indirect
253251
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
254-
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
252+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
255253
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
256254
github.com/x448/float16 v0.8.4 // indirect
257255
github.com/xanzy/ssh-agent v0.3.3 // indirect

0 commit comments

Comments
 (0)