From f6666be7dc5876b050b6e70d3ede0af76e828e7b Mon Sep 17 00:00:00 2001 From: Jon Mosco Date: Thu, 1 Feb 2024 12:22:38 -0500 Subject: [PATCH 1/3] use os functions instead of running exec --- pkg/downloader.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkg/downloader.go b/pkg/downloader.go index eb0a01e..0628a88 100644 --- a/pkg/downloader.go +++ b/pkg/downloader.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "log" - "os/exec" + "os" "time" "github.com/app-sre/git-partition-sync-consumer/pkg/metrics" @@ -43,8 +43,7 @@ func NewDownloader( workdir string, runOnce bool) (*Downloader, error) { - cmd := exec.Command("mkdir", "-p", workdir) - err := cmd.Run() + err := os.Mkdir(workdir, 0755) if err != nil { return nil, err } @@ -148,15 +147,12 @@ func (d *Downloader) Run(ctx context.Context, dryRun, runOnce bool) error { // clean target working directory func (d *Downloader) clean(directory string) error { - cmd := exec.Command("rm", "-rf", directory) - cmd.Dir = d.workdir - err := cmd.Run() + err := os.RemoveAll(directory) if err != nil { return err } - cmd = exec.Command("mkdir", directory) - cmd.Dir = d.workdir - err = cmd.Run() + + err = os.Mkdir(directory, 0775) if err != nil { return err } @@ -165,9 +161,7 @@ func (d *Downloader) clean(directory string) error { // clear all items in working directory func (d *Downloader) clear() error { - cmd := exec.Command("rm", "-rf", UNTAR_DIRECTORY) - cmd.Dir = d.workdir - err := cmd.Run() + err := os.RemoveAll(UNTAR_DIRECTORY) if err != nil { return err } From 70f66b7529c61af5c1ec83c9663c0f129695abea Mon Sep 17 00:00:00 2001 From: Jon Mosco Date: Wed, 14 Feb 2024 08:33:22 -0500 Subject: [PATCH 2/3] use filepath.join for directory concatenation --- pkg/downloader.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/downloader.go b/pkg/downloader.go index 0628a88..abb5389 100644 --- a/pkg/downloader.go +++ b/pkg/downloader.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "os" + "path/filepath" "time" "github.com/app-sre/git-partition-sync-consumer/pkg/metrics" @@ -147,7 +148,7 @@ func (d *Downloader) Run(ctx context.Context, dryRun, runOnce bool) error { // clean target working directory func (d *Downloader) clean(directory string) error { - err := os.RemoveAll(directory) + err := os.RemoveAll(filepath.Join(d.workdir, directory)) if err != nil { return err } From 452b5d5b2c12278bf2de27631e2c33f7f9782a90 Mon Sep 17 00:00:00 2001 From: Jon Mosco Date: Thu, 15 Feb 2024 16:15:23 -0500 Subject: [PATCH 3/3] updates for Drews comments --- pkg/downloader.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/downloader.go b/pkg/downloader.go index abb5389..ff3b8c4 100644 --- a/pkg/downloader.go +++ b/pkg/downloader.go @@ -153,7 +153,7 @@ func (d *Downloader) clean(directory string) error { return err } - err = os.Mkdir(directory, 0775) + err = os.Mkdir(filepath.Join(d.workdir, directory), 0755) if err != nil { return err } @@ -162,7 +162,7 @@ func (d *Downloader) clean(directory string) error { // clear all items in working directory func (d *Downloader) clear() error { - err := os.RemoveAll(UNTAR_DIRECTORY) + err := os.RemoveAll(filepath.Join(d.workdir, UNTAR_DIRECTORY)) if err != nil { return err }