Skip to content

Commit dd3e301

Browse files
committed
PR feedback
1 parent 1d4a50b commit dd3e301

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

internal/resource/resource_plugin.go

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,20 @@ func (r *Resource) handleNginxPlusActionRequest(ctx context.Context, action *mpi
188188

189189
switch action.GetAction().(type) {
190190
case *mpi.NGINXPlusAction_UpdateHttpUpstreamServers:
191+
slog.DebugContext(ctx, "Updating http upstream servers", "request", action.GetUpdateHttpUpstreamServers())
191192
r.handleUpdateHTTPUpstreamServers(ctx, action, instance)
192193
case *mpi.NGINXPlusAction_GetHttpUpstreamServers:
194+
slog.DebugContext(ctx, "Getting http upstream servers", "request", action.GetGetHttpUpstreamServers())
193195
r.handleGetHTTPUpstreamServers(ctx, action, instance)
194196
case *mpi.NGINXPlusAction_UpdateStreamServers:
197+
slog.DebugContext(ctx, "Updating stream servers", "request", action.GetUpdateStreamServers())
195198
r.handleUpdateStreamServers(ctx, action, instance)
196199
case *mpi.NGINXPlusAction_GetStreamUpstreams:
197-
r.handleGetStreamUpstreams(ctx, action, instance)
200+
slog.DebugContext(ctx, "Getting stream upstreams", "request", action.GetGetStreamUpstreams())
201+
r.handleGetStreamUpstreams(ctx, instance)
198202
case *mpi.NGINXPlusAction_GetUpstreams:
199-
r.handleGetUpstreams(ctx, action, instance)
203+
slog.DebugContext(ctx, "Getting upstreams", "request", action.GetGetUpstreams())
204+
r.handleGetUpstreams(ctx, instance)
200205
default:
201206
slog.DebugContext(ctx, "NGINX Plus action not implemented yet")
202207
}
@@ -207,8 +212,6 @@ func (r *Resource) handleUpdateStreamServers(ctx context.Context, action *mpi.NG
207212
correlationID := logger.GetCorrelationID(ctx)
208213
instanceID := instance.GetInstanceMeta().GetInstanceId()
209214

210-
slog.DebugContext(ctx, "Updating stream servers", "request", action.GetUpdateStreamServers())
211-
212215
add, update, del, err := r.resourceService.UpdateStreamServers(ctx, instance,
213216
action.GetUpdateStreamServers().GetUpstreamStreamName(), action.GetUpdateStreamServers().GetServers())
214217
if err != nil {
@@ -232,12 +235,10 @@ func (r *Resource) handleUpdateStreamServers(ctx context.Context, action *mpi.NG
232235
}
233236

234237
// nolint: dupl
235-
func (r *Resource) handleGetStreamUpstreams(ctx context.Context, action *mpi.NGINXPlusAction, instance *mpi.Instance) {
238+
func (r *Resource) handleGetStreamUpstreams(ctx context.Context, instance *mpi.Instance) {
236239
correlationID := logger.GetCorrelationID(ctx)
237240
instanceID := instance.GetInstanceMeta().GetInstanceId()
238241

239-
slog.DebugContext(ctx, "Getting stream upstreams", "request", action.GetGetStreamUpstreams())
240-
241242
streamUpstreams, err := r.resourceService.GetStreamUpstreams(ctx, instance)
242243
if err != nil {
243244
slog.ErrorContext(ctx, "Unable to get stream upstreams", "error", err)
@@ -260,12 +261,10 @@ func (r *Resource) handleGetStreamUpstreams(ctx context.Context, action *mpi.NGI
260261
}
261262

262263
// nolint: dupl
263-
func (r *Resource) handleGetUpstreams(ctx context.Context, action *mpi.NGINXPlusAction, instance *mpi.Instance) {
264+
func (r *Resource) handleGetUpstreams(ctx context.Context, instance *mpi.Instance) {
264265
correlationID := logger.GetCorrelationID(ctx)
265266
instanceID := instance.GetInstanceMeta().GetInstanceId()
266267

267-
slog.DebugContext(ctx, "Getting upstreams", "request", action.GetGetUpstreams())
268-
269268
upstreams, err := r.resourceService.GetUpstreams(ctx, instance)
270269
if err != nil {
271270
slog.InfoContext(ctx, "Unable to get upstreams", "error", err)
@@ -294,8 +293,6 @@ func (r *Resource) handleUpdateHTTPUpstreamServers(ctx context.Context, action *
294293
correlationID := logger.GetCorrelationID(ctx)
295294
instanceID := instance.GetInstanceMeta().GetInstanceId()
296295

297-
slog.DebugContext(ctx, "Updating http upstream servers", "request", action.GetUpdateHttpUpstreamServers())
298-
299296
add, update, del, err := r.resourceService.UpdateHTTPUpstreamServers(ctx, instance,
300297
action.GetUpdateHttpUpstreamServers().GetHttpUpstreamName(),
301298
action.GetUpdateHttpUpstreamServers().GetServers())
@@ -325,8 +322,6 @@ func (r *Resource) handleGetHTTPUpstreamServers(ctx context.Context, action *mpi
325322
correlationID := logger.GetCorrelationID(ctx)
326323
instanceID := instance.GetInstanceMeta().GetInstanceId()
327324

328-
slog.DebugContext(ctx, "Getting http upstream servers", "request", action.GetGetHttpUpstreamServers())
329-
330325
upstreams, err := r.resourceService.GetHTTPUpstreamServers(ctx, instance,
331326
action.GetGetHttpUpstreamServers().GetHttpUpstreamName())
332327
if err != nil {

0 commit comments

Comments
 (0)