From d2c616b309f4922a1cc59f6ead0070987af1a8b7 Mon Sep 17 00:00:00 2001 From: Suleiman Dibirov Date: Thu, 18 Jan 2024 20:23:55 +0200 Subject: [PATCH] reverted code style changes --- pkg/skaffold/runner/dev.go | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkg/skaffold/runner/dev.go b/pkg/skaffold/runner/dev.go index b41c40184d4..487fd3f8ff7 100644 --- a/pkg/skaffold/runner/dev.go +++ b/pkg/skaffold/runner/dev.go @@ -75,11 +75,9 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error { eventV2.TaskInProgress(constants.DevLoop, "") defer func() { r.devIteration++ }() eventV2.LogMetaEvent() - ctx, endTrace := instrumentation.StartTrace( - ctx, "doDev_DevLoopInProgress", map[string]string{ - "devIteration": strconv.Itoa(r.devIteration), - }, - ) + ctx, endTrace := instrumentation.StartTrace(ctx, "doDev_DevLoopInProgress", map[string]string{ + "devIteration": strconv.Itoa(r.devIteration), + }) meterUpdated := false if needsSync { @@ -241,11 +239,9 @@ func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*la eventV2.TaskInProgress(constants.DevLoop, "") defer func() { r.devIteration++ }() eventV2.LogMetaEvent() - ctx, endTrace := instrumentation.StartTrace( - ctx, "Dev", map[string]string{ - "devIteration": strconv.Itoa(r.devIteration), - }, - ) + ctx, endTrace := instrumentation.StartTrace(ctx, "Dev", map[string]string{ + "devIteration": strconv.Itoa(r.devIteration), + }) // First build var err error @@ -314,12 +310,7 @@ func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*la } // The previous Render Stage could succeed even for kubernetes resource with unknown fields, this will lead to failure in Deploy Stage // users need to fix the problems in their manifests, and skaffold needs to re-render them before re-running Deploy Stage in this case. - for manifests, err = r.Render(ctx, out, r.Builds, false); err != nil; manifests, err = r.Render( - ctx, - out, - r.Builds, - false, - ) { + for manifests, err = r.Render(ctx, out, r.Builds, false); err != nil; manifests, err = r.Render(ctx, out, r.Builds, false) { log.Entry(ctx).Warnf("Failed to Render, please fix the error and press any key to continue. %v", err) errT := term.WaitForKeyPress() if errT != nil { @@ -457,11 +448,9 @@ func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*la eventV2.TaskSucceeded(constants.DevLoop) endTrace() r.devIteration++ - return r.listener.WatchForChanges( - ctx, out, func() error { - return r.doDev(ctx, out) - }, - ) + return r.listener.WatchForChanges(ctx, out, func() error { + return r.doDev(ctx, out) + }) } // graph represents the artifact graph