From 6c33874cf4060652ed007768cc923b0710e60c25 Mon Sep 17 00:00:00 2001 From: James Rawlings Date: Tue, 30 Jan 2024 16:06:18 +0000 Subject: [PATCH] check updates: fix mofidying the wrong yaml file during check + add flag (disabled bu default) to perform dep cleanup Signed-off-by: James Rawlings --- pkg/checks/update.go | 23 ++++++++++++++++------- pkg/cli/check_update.go | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkg/checks/update.go b/pkg/checks/update.go index 082642e3d..eaa48f82b 100644 --- a/pkg/checks/update.go +++ b/pkg/checks/update.go @@ -28,9 +28,10 @@ import ( ) type CheckUpdateOptions struct { - Dir string - OverrideVersion string - Logger *log.Logger + Dir string + OverrideVersion string + Logger *log.Logger + EnableDependencyCleanup bool } // SetupUpdate will create the options needed to call wolfictl update functions @@ -240,11 +241,19 @@ func (o CheckUpdateOptions) processUpdates(ctx context.Context, latestVersions m return err } - // Skip any processing for definitions with a single pipeline - if len(updated.Pipeline) > 1 { - if err := o.updateGoBumpDeps(updated, o.Dir, packageName, mutations); err != nil { - return fmt.Errorf("error cleaning up go/bump deps: %v", err) + if o.EnableDependencyCleanup { + msg := fmt.Sprintf("cleaning up go/bump dependencies for %s. To disable, run command with --enable-dependency-cleanup=false", packageName) + log.Print(color.YellowString(msg)) + + // Skip any processing for definitions with a single pipeline + if len(updated.Pipeline) > 1 { + if err := o.updateGoBumpDeps(updated, tempDir, packageName, mutations); err != nil { + return fmt.Errorf("error cleaning up go/bump deps: %v", err) + } } + } else { + msg := fmt.Sprintf("skip cleaning up go/bump dependencies for %s. To enable, run command with --enable-dependency-cleanup=true", packageName) + log.Print(color.YellowString(msg)) } // if manual update is expected then let's not try to validate pipelines diff --git a/pkg/cli/check_update.go b/pkg/cli/check_update.go index 1fcd51d95..1b2e3dc60 100644 --- a/pkg/cli/check_update.go +++ b/pkg/cli/check_update.go @@ -34,4 +34,5 @@ func checkUpdateFlags(cmd *cobra.Command, o *checks.CheckUpdateOptions) { cmd.Flags().StringVarP(&o.Dir, "directory", "d", cwd, "directory containing melange configs") cmd.Flags().StringVarP(&o.OverrideVersion, "override-version", "", "", "override the local melange config version to test an update works as expected") + cmd.Flags().BoolVarP(&o.EnableDependencyCleanup, "enable-dependency-cleanup", "", false, "cleanup of dependencies after testing an update") }