Skip to content

Commit c46a43f

Browse files
NutsaBNutsaB
committed
Fix linter issues
1 parent e08c459 commit c46a43f

File tree

6 files changed

+145
-49
lines changed

6 files changed

+145
-49
lines changed

‎internal/grpc/grpc.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,11 @@ func GetDialOptions(agentConfig *config.Config, resourceID string) []grpc.DialOp
225225
func addTransportCredentials(agentConfig *config.Config, opts []grpc.DialOption) ([]grpc.DialOption, bool) {
226226
transportCredentials, err := getTransportCredentials(agentConfig)
227227
if err != nil {
228-
slog.Error("Unable to add transport credentials to gRPC dial options, adding "+
229-
"default transport credentials", "error", err, logOrigin)
228+
slog.Error(
229+
"Unable to add transport credentials to gRPC dial options, adding default transport credentials",
230+
"error", err,
231+
logOrigin,
232+
)
230233
opts = append(opts,
231234
grpc.WithTransportCredentials(defaultCredentials),
232235
)

‎internal/logger/logger.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ func getLogWriter(logFile string) io.Writer {
7575
if logFile != "" {
7676
fileInfo, err := os.Stat(logPath)
7777
if err != nil {
78-
slog.Error("Error reading log directory, proceeding to log only to stdout/stderr",
79-
"error", err, logOrigin)
78+
slog.Error(
79+
"Error reading log directory, proceeding to log only to stdout/stderr",
80+
"error", err,
81+
logOrigin,
82+
)
8083

8184
return os.Stderr
8285
}
@@ -87,8 +90,11 @@ func getLogWriter(logFile string) io.Writer {
8790

8891
logFileHandle, err := os.OpenFile(logPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, filePermission)
8992
if err != nil {
90-
slog.Error("Failed to open log file, proceeding to log only to stdout/stderr",
91-
"error", err, logOrigin)
93+
slog.Error(
94+
"Failed to open log file, proceeding to log only to stdout/stderr",
95+
"error", err,
96+
logOrigin,
97+
)
9298

9399
return os.Stderr
94100
}
@@ -139,7 +145,9 @@ func GetCorrelationIDAttr(ctx context.Context) slog.Attr {
139145
slog.Debug(
140146
"Correlation ID not found in context, generating new correlation ID",
141147
"correlation_id",
142-
correlationID, logOrigin)
148+
correlationID,
149+
logOrigin,
150+
)
143151

144152
return GenerateCorrelationID()
145153
}

‎internal/plugin/plugin_manager.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ func addCollectorPlugin(ctx context.Context, agentConfig *config.Config, plugins
6868
slog.ErrorContext(ctx, "Failed to initialize collector plugin", "error", err, logOrigin)
6969
}
7070
} else {
71-
slog.InfoContext(ctx, "Agent OTel collector isn't started. "+
72-
"Configure a collector to begin collecting metrics.", logOrigin)
71+
slog.InfoContext(
72+
ctx,
73+
"Agent OTel collector isn't started. Configure a collector to begin collecting metrics.",
74+
logOrigin,
75+
)
7376
}
7477

7578
return plugins

‎internal/resource/nginx_instance_operator.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,19 @@ func (i *NginxInstanceOperator) validateConfigCheckResponse(out []byte) error {
7070

7171
func (i *NginxInstanceOperator) Reload(ctx context.Context, instance *mpi.Instance) error {
7272
var errorsFound error
73-
slog.InfoContext(ctx, "Reloading NGINX PID", "pid",
74-
instance.GetInstanceRuntime().GetProcessId(), logOrigin)
75-
76-
slog.InfoContext(ctx, "NGINX reloaded", "processid",
77-
instance.GetInstanceRuntime().GetProcessId(), logOrigin)
73+
slog.InfoContext(
74+
ctx,
75+
"Reloading NGINX PID",
76+
"pid", instance.GetInstanceRuntime().GetProcessId(),
77+
logOrigin,
78+
)
79+
80+
slog.InfoContext(
81+
ctx,
82+
"NGINX reloaded",
83+
"processid", instance.GetInstanceRuntime().GetProcessId(),
84+
logOrigin,
85+
)
7886

7987
errorLogs := i.errorLogs(instance)
8088

‎internal/resource/nginx_plus_actions.go‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type APIAction struct {
2323

2424
var plusActionsLogOrigin = slog.String("log_origin", "nginx_plus_actions.go")
2525

26+
// nolint: dupl
2627
func (a *APIAction) HandleUpdateStreamServersRequest(ctx context.Context, action *mpi.NGINXPlusAction,
2728
instance *mpi.Instance,
2829
) *mpi.DataPlaneResponse {
@@ -32,16 +33,27 @@ func (a *APIAction) HandleUpdateStreamServersRequest(ctx context.Context, action
3233
add, update, del, err := a.ResourceService.UpdateStreamServers(ctx, instance,
3334
action.GetUpdateStreamServers().GetUpstreamStreamName(), action.GetUpdateStreamServers().GetServers())
3435
if err != nil {
35-
slog.ErrorContext(ctx, "Unable to update stream servers of upstream", "request",
36-
action.GetUpdateHttpUpstreamServers(), "error", err, plusActionsLogOrigin)
36+
slog.ErrorContext(
37+
ctx,
38+
"Unable to update stream servers of upstream",
39+
"request", action.GetUpdateHttpUpstreamServers(),
40+
"error", err,
41+
plusActionsLogOrigin,
42+
)
3743

3844
return response.CreateDataPlaneResponse(correlationID, mpi.CommandResponse_COMMAND_STATUS_FAILURE,
3945
"", instanceID, err.Error())
4046
}
4147

42-
slog.DebugContext(ctx, "Successfully updated stream upstream servers", "http_upstream_name",
43-
action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(), "add", len(add), "update", len(update),
44-
"delete", len(del), plusActionsLogOrigin)
48+
slog.DebugContext(
49+
ctx,
50+
"Successfully updated stream upstream servers",
51+
"http_upstream_name", action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(),
52+
"add", len(add),
53+
"update", len(update),
54+
"delete", len(del),
55+
plusActionsLogOrigin,
56+
)
4557

4658
return response.CreateDataPlaneResponse(correlationID, mpi.CommandResponse_COMMAND_STATUS_OK,
4759
"Successfully updated stream upstream servers", instanceID, "")
@@ -98,6 +110,7 @@ func (a *APIAction) HandleGetUpstreamsRequest(ctx context.Context, instance *mpi
98110
upstreamsResponse, instanceID, "")
99111
}
100112

113+
// nolint: dupl
101114
func (a *APIAction) HandleUpdateHTTPUpstreamsRequest(ctx context.Context, action *mpi.NGINXPlusAction,
102115
instance *mpi.Instance,
103116
) *mpi.DataPlaneResponse {
@@ -108,16 +121,27 @@ func (a *APIAction) HandleUpdateHTTPUpstreamsRequest(ctx context.Context, action
108121
action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(),
109122
action.GetUpdateHttpUpstreamServers().GetServers())
110123
if err != nil {
111-
slog.ErrorContext(ctx, "Unable to update HTTP servers of upstream", "request",
112-
action.GetUpdateHttpUpstreamServers(), "error", err, plusActionsLogOrigin)
124+
slog.ErrorContext(
125+
ctx,
126+
"Unable to update HTTP servers of upstream",
127+
"request", action.GetUpdateHttpUpstreamServers(),
128+
"error", err,
129+
plusActionsLogOrigin,
130+
)
113131

114132
return response.CreateDataPlaneResponse(correlationID, mpi.CommandResponse_COMMAND_STATUS_FAILURE,
115133
"", instanceID, err.Error())
116134
}
117135

118-
slog.DebugContext(ctx, "Successfully updated http upstream servers", "http_upstream_name",
119-
action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(), plusActionsLogOrigin, "add", len(add),
120-
"update", len(update), "delete", len(del))
136+
slog.DebugContext(
137+
ctx,
138+
"Successfully updated http upstream servers",
139+
"http_upstream_name", action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(),
140+
"add", len(add),
141+
"update", len(update),
142+
"delete", len(del),
143+
plusActionsLogOrigin,
144+
)
121145

122146
return response.CreateDataPlaneResponse(correlationID, mpi.CommandResponse_COMMAND_STATUS_OK,
123147
"Successfully updated HTTP Upstreams", instanceID, "")

‎internal/resource/resource_service.go‎

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,13 @@ func (r *ResourceService) UpdateInstances(ctx context.Context, instanceList []*m
146146
}
147147
r.resource = resourceCopy
148148
} else {
149-
slog.WarnContext(ctx, "Unable to clone resource while updating instances", "resource",
150-
r.resource, "instances", instanceList, resourceServiceLogOrigin)
149+
slog.WarnContext(
150+
ctx,
151+
"Unable to clone resource while updating instances",
152+
"resource", r.resource,
153+
"instances", instanceList,
154+
resourceServiceLogOrigin,
155+
)
151156
}
152157
}
153158

@@ -167,8 +172,13 @@ func (r *ResourceService) DeleteInstances(ctx context.Context, instanceList []*m
167172
}
168173
}
169174
} else {
170-
slog.WarnContext(ctx, "Unable to clone resource while deleting instances", "resource",
171-
r.resource, "instances", instanceList, resourceServiceLogOrigin)
175+
slog.WarnContext(
176+
ctx,
177+
"Unable to clone resource while deleting instances",
178+
"resource", r.resource,
179+
"instances", instanceList,
180+
resourceServiceLogOrigin,
181+
)
172182
}
173183
}
174184
r.RemoveOperator(instanceList)
@@ -214,8 +224,11 @@ func (r *ResourceService) GetHTTPUpstreamServers(ctx context.Context, instance *
214224

215225
servers, getServersErr := plusClient.GetHTTPServers(ctx, upstream)
216226

217-
slog.Warn("Error returned from NGINX Plus client, GetHTTPUpstreamServers",
218-
"err", getServersErr, resourceServiceLogOrigin)
227+
slog.Warn(
228+
"Error returned from NGINX Plus client, GetHTTPUpstreamServers",
229+
"err", getServersErr,
230+
resourceServiceLogOrigin,
231+
)
219232

220233
return servers, createPlusAPIError(getServersErr)
221234
}
@@ -224,16 +237,23 @@ func (r *ResourceService) GetUpstreams(ctx context.Context, instance *mpi.Instan
224237
) (*client.Upstreams, error) {
225238
plusClient, err := r.createPlusClient(instance)
226239
if err != nil {
227-
slog.ErrorContext(ctx, "Failed to create plus client ",
228-
"error", err, resourceServiceLogOrigin)
240+
slog.ErrorContext(
241+
ctx,
242+
"Failed to create plus client ",
243+
"error", err,
244+
resourceServiceLogOrigin,
245+
)
229246

230247
return nil, err
231248
}
232249

233250
servers, getUpstreamsErr := plusClient.GetUpstreams(ctx)
234251

235-
slog.Warn("Error returned from NGINX Plus client, GetUpstreams",
236-
"err", getUpstreamsErr, resourceServiceLogOrigin)
252+
slog.Warn(
253+
"Error returned from NGINX Plus client, GetUpstreams",
254+
"err", getUpstreamsErr,
255+
resourceServiceLogOrigin,
256+
)
237257

238258
return servers, createPlusAPIError(getUpstreamsErr)
239259
}
@@ -242,15 +262,23 @@ func (r *ResourceService) GetStreamUpstreams(ctx context.Context, instance *mpi.
242262
) (*client.StreamUpstreams, error) {
243263
plusClient, err := r.createPlusClient(instance)
244264
if err != nil {
245-
slog.ErrorContext(ctx, "Failed to create plus client ", "error", err, resourceServiceLogOrigin)
265+
slog.ErrorContext(
266+
ctx,
267+
"Failed to create plus client ",
268+
"error", err,
269+
resourceServiceLogOrigin,
270+
)
246271

247272
return nil, err
248273
}
249274

250275
streamUpstreams, getServersErr := plusClient.GetStreamUpstreams(ctx)
251276

252-
slog.Warn("Error returned from NGINX Plus client, GetStreamUpstreams",
253-
"err", getServersErr, resourceServiceLogOrigin)
277+
slog.Warn(
278+
"Error returned from NGINX Plus client, GetStreamUpstreams",
279+
"err", getServersErr,
280+
resourceServiceLogOrigin,
281+
)
254282

255283
return streamUpstreams, createPlusAPIError(getServersErr)
256284
}
@@ -271,8 +299,11 @@ func (r *ResourceService) UpdateStreamServers(ctx context.Context, instance *mpi
271299

272300
added, updated, deleted, updateError := plusClient.UpdateStreamServers(ctx, upstream, servers)
273301

274-
slog.Warn("Error returned from NGINX Plus client, UpdateStreamServers",
275-
"err", updateError, resourceServiceLogOrigin)
302+
slog.Warn(
303+
"Error returned from NGINX Plus client, UpdateStreamServers",
304+
"err", updateError,
305+
resourceServiceLogOrigin,
306+
)
276307

277308
return added, updated, deleted, createPlusAPIError(updateError)
278309
}
@@ -293,8 +324,11 @@ func (r *ResourceService) UpdateHTTPUpstreamServers(ctx context.Context, instanc
293324
added, updated, deleted, updateError := plusClient.UpdateHTTPServers(ctx, upstream, servers)
294325

295326
if updateError != nil {
296-
slog.Warn("Error returned from NGINX Plus client, UpdateHTTPUpstreamServers",
297-
"err", updateError, resourceServiceLogOrigin)
327+
slog.Warn(
328+
"Error returned from NGINX Plus client, UpdateHTTPUpstreamServers",
329+
"err", updateError,
330+
resourceServiceLogOrigin,
331+
)
298332
}
299333

300334
return added, updated, deleted, createPlusAPIError(updateError)
@@ -304,13 +338,21 @@ func convertToUpstreamServer(upstreams []*structpb.Struct) []client.UpstreamServ
304338
var servers []client.UpstreamServer
305339
res, err := json.Marshal(upstreams)
306340
if err != nil {
307-
slog.Error("Failed to marshal upstreams",
308-
"error", err, "upstreams", upstreams, resourceServiceLogOrigin)
341+
slog.Error(
342+
"Failed to marshal upstreams",
343+
"error", err,
344+
"upstreams", upstreams,
345+
resourceServiceLogOrigin,
346+
)
309347
}
310348
err = json.Unmarshal(res, &servers)
311349
if err != nil {
312-
slog.Error("Failed to unmarshal upstreams",
313-
"error", err, "servers", servers, resourceServiceLogOrigin)
350+
slog.Error(
351+
"Failed to unmarshal upstreams",
352+
"error", err,
353+
"servers", servers,
354+
resourceServiceLogOrigin,
355+
)
314356
}
315357

316358
return servers
@@ -320,13 +362,21 @@ func convertToStreamUpstreamServer(streamUpstreams []*structpb.Struct) []client.
320362
var servers []client.StreamUpstreamServer
321363
res, err := json.Marshal(streamUpstreams)
322364
if err != nil {
323-
slog.Error("Failed to marshal stream upstream server",
324-
"error", err, "stream_upstreams", streamUpstreams, resourceServiceLogOrigin)
365+
slog.Error(
366+
"Failed to marshal stream upstream server",
367+
"error", err,
368+
"stream_upstreams", streamUpstreams,
369+
resourceServiceLogOrigin,
370+
)
325371
}
326372
err = json.Unmarshal(res, &servers)
327373
if err != nil {
328-
slog.Error("Failed to unmarshal stream upstream server",
329-
"error", err, "stream_upstreams", streamUpstreams, resourceServiceLogOrigin)
374+
slog.Error(
375+
"Failed to unmarshal stream upstream server",
376+
"error", err,
377+
"stream_upstreams", streamUpstreams,
378+
resourceServiceLogOrigin,
379+
)
330380
}
331381

332382
return servers

0 commit comments

Comments
 (0)