marcel/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd.git synced 2026-02-20 01:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: enable noctx linter (#24765)

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-09-29 20:20:53 +02:00
committed by GitHub
parent 116707bed1
commit 7357465ea6
60 changed files with 507 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/apiclient/apiclient.go
View File

@@ -490,13 +490,13 @@ func (c jwtCredentials) GetRequestMetadata(context.Context, ...string) (map[stri
}, nil
}
func (c *client) newConn() (*grpc.ClientConn, io.Closer, error) {
func (c *client) newConn(ctx context.Context) (*grpc.ClientConn, io.Closer, error) {
closers := make([]io.Closer, 0)
serverAddr := c.ServerAddr
network := "tcp"
if c.GRPCWeb || c.GRPCWebRootPath != "" {
// start local grpc server which proxies requests using grpc-web protocol
addr, closer, err := c.useGRPCProxy()
addr, closer, err := c.useGRPCProxy(ctx)
if err != nil {
return nil, nil, err
}
@@ -527,8 +527,6 @@ func (c *client) newConn() (*grpc.ClientConn, io.Closer, error) {
dialOpts = append(dialOpts, grpc.WithUnaryInterceptor(grpc_retry.UnaryClientInterceptor(retryOpts...)))
dialOpts = append(dialOpts, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
ctx := context.Background()
headers, err := parseHeaders(c.Headers)
if err != nil {
return nil, nil, err
@@ -584,7 +582,7 @@ func (c *client) ClientOptions() ClientOptions {
}
func (c *client) NewRepoClient() (io.Closer, repositorypkg.RepositoryServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -601,7 +599,7 @@ func (c *client) NewRepoClientOrDie() (io.Closer, repositorypkg.RepositoryServic
}
func (c *client) NewRepoCredsClient() (io.Closer, repocredspkg.RepoCredsServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -618,7 +616,7 @@ func (c *client) NewRepoCredsClientOrDie() (io.Closer, repocredspkg.RepoCredsSer
}
func (c *client) NewCertClient() (io.Closer, certificatepkg.CertificateServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -635,7 +633,7 @@ func (c *client) NewCertClientOrDie() (io.Closer, certificatepkg.CertificateServ
}
func (c *client) NewClusterClient() (io.Closer, clusterpkg.ClusterServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -652,7 +650,7 @@ func (c *client) NewClusterClientOrDie() (io.Closer, clusterpkg.ClusterServiceCl
}
func (c *client) NewGPGKeyClient() (io.Closer, gpgkeypkg.GPGKeyServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -669,7 +667,7 @@ func (c *client) NewGPGKeyClientOrDie() (io.Closer, gpgkeypkg.GPGKeyServiceClien
}
func (c *client) NewApplicationClient() (io.Closer, applicationpkg.ApplicationServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -678,7 +676,7 @@ func (c *client) NewApplicationClient() (io.Closer, applicationpkg.ApplicationSe
}
func (c *client) NewApplicationSetClient() (io.Closer, applicationsetpkg.ApplicationSetServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -695,7 +693,7 @@ func (c *client) NewApplicationClientOrDie() (io.Closer, applicationpkg.Applicat
}
func (c *client) NewNotificationClient() (io.Closer, notificationpkg.NotificationServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -720,7 +718,7 @@ func (c *client) NewApplicationSetClientOrDie() (io.Closer, applicationsetpkg.Ap
}
func (c *client) NewSessionClient() (io.Closer, sessionpkg.SessionServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -737,7 +735,7 @@ func (c *client) NewSessionClientOrDie() (io.Closer, sessionpkg.SessionServiceCl
}
func (c *client) NewSettingsClient() (io.Closer, settingspkg.SettingsServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -754,7 +752,7 @@ func (c *client) NewSettingsClientOrDie() (io.Closer, settingspkg.SettingsServic
}
func (c *client) NewVersionClient() (io.Closer, versionpkg.VersionServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -771,7 +769,7 @@ func (c *client) NewVersionClientOrDie() (io.Closer, versionpkg.VersionServiceCl
}
func (c *client) NewProjectClient() (io.Closer, projectpkg.ProjectServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}
@@ -788,7 +786,7 @@ func (c *client) NewProjectClientOrDie() (io.Closer, projectpkg.ProjectServiceCl
}
func (c *client) NewAccountClient() (io.Closer, accountpkg.AccountServiceClient, error) {
conn, closer, err := c.newConn()
conn, closer, err := c.newConn(context.Background())
if err != nil {
return nil, nil, err
}

9
pkg/apiclient/grpcproxy.go
View File

@@ -103,13 +103,14 @@ func (c *client) executeRequest(ctx context.Context, fullMethodName string, msg
return resp, nil
}
func (c *client) startGRPCProxy() (*grpc.Server, net.Listener, error) {
func (c *client) startGRPCProxy(ctx context.Context) (*grpc.Server, net.Listener, error) {
randSuffix, err := rand.String(16)
if err != nil {
return nil, nil, fmt.Errorf("failed to generate random socket filename: %w", err)
}
serverAddr := fmt.Sprintf("%s/argocd-%s.sock", os.TempDir(), randSuffix)
ln, err := net.Listen("unix", serverAddr)
lc := &net.ListenConfig{}
ln, err := lc.Listen(ctx, "unix", serverAddr)
if err != nil {
return nil, nil, err
}
@@ -188,13 +189,13 @@ func (c *client) startGRPCProxy() (*grpc.Server, net.Listener, error) {
}
// useGRPCProxy ensures that grpc proxy server is started and return closer which stops server when no one uses it
func (c *client) useGRPCProxy() (net.Addr, io.Closer, error) {
func (c *client) useGRPCProxy(ctx context.Context) (net.Addr, io.Closer, error) {
c.proxyMutex.Lock()
defer c.proxyMutex.Unlock()
if c.proxyListener == nil {
var err error
c.proxyServer, c.proxyListener, err = c.startGRPCProxy()
c.proxyServer, c.proxyListener, err = c.startGRPCProxy(ctx)
if err != nil {
return nil, nil, err
}