fix(tests/push): avoid race conditions

Signed-off-by: Aldo Lacuku <[email protected]>

cmd/registry/push/push.go

@@ -180,7 +180,7 @@ func (o *pushOptions) runPush(ctx context.Context, args []string) error {
  config = cfg
  }
  }
- path, err := utils.CreateTarGzArchive(p)
+ path, err := utils.CreateTarGzArchive("", p)
  if err != nil {
  return err
  }

cmd/registry/push/push_plugins_test.go

@@ -20,17 +20,18 @@ package push_test
 
 import (
  "fmt"
+ "github.com/falcosecurity/falcoctl/internal/utils"
  "os"
  "path/filepath"
  "regexp"
+ "time"
 
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
  "github.com/onsi/gomega/gbytes"
  v1 "github.com/opencontainers/image-spec/specs-go/v1"
 
  "github.com/falcosecurity/falcoctl/cmd"
- "github.com/falcosecurity/falcoctl/internal/utils"
  "github.com/falcosecurity/falcoctl/pkg/oci"
  testutils "github.com/falcosecurity/falcoctl/pkg/test"
 )
@@ -120,15 +121,21 @@ var _ = Describe("pushing plugins", func() {
  Expect(pluginData.Tags).Should(ContainElements(pushedTags))
 
  By("checking that temporary dirs have been removed")
- entries, err := os.ReadDir("/tmp")
- Expect(err).ShouldNot(HaveOccurred())
- for _, e := range entries {
- if e.IsDir() {
- matched, err := filepath.Match(utils.TmpDirPrefix+"*", regexp.QuoteMeta(e.Name()))
- Expect(err).ShouldNot(HaveOccurred())
- Expect(matched).ShouldNot(BeTrue())
+
+ Eventually(func() bool {
+ entries, err := os.ReadDir("/tmp")
+ Expect(err).ShouldNot(HaveOccurred())
+ for _, e := range entries {
+ if e.IsDir() {
+ matched, err := filepath.Match(utils.TmpDirPrefix+"*", regexp.QuoteMeta(e.Name()))
+ Expect(err).ShouldNot(HaveOccurred())
+ if matched {
+ return true
+ }
+ }
  }
- }
+ return false
+ }).WithTimeout(5 * time.Second).Should(BeFalse())
  })
  }
 

cmd/registry/push/push_rulesfiles_test.go

@@ -19,24 +19,25 @@ package push_test
 
 import (
  "fmt"
+ "github.com/falcosecurity/falcoctl/internal/utils"
  "os"
  "path/filepath"
  "regexp"
+ "time"
 
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
  "github.com/onsi/gomega/gbytes"
  v1 "github.com/opencontainers/image-spec/specs-go/v1"
 
  "github.com/falcosecurity/falcoctl/cmd"
- "github.com/falcosecurity/falcoctl/internal/utils"
  "github.com/falcosecurity/falcoctl/pkg/oci"
  testutils "github.com/falcosecurity/falcoctl/pkg/test"
 )
 
 // revive:enable
 
-var _ = Describe("pushing rulesfiles", func() {
+var rulesfiles = Describe("pushing rulesfiles", func() {
  var (
  registryCmd = "registry"
  pushCmd = "push"
@@ -113,15 +114,21 @@ var _ = Describe("pushing rulesfiles", func() {
  Expect(rulesfileData.Tags).Should(ContainElements(pushedTags))
 
  By("checking that temporary dirs have been removed")
- entries, err := os.ReadDir("/tmp")
- Expect(err).ShouldNot(HaveOccurred())
- for _, e := range entries {
- if e.IsDir() {
- matched, err := filepath.Match(utils.TmpDirPrefix+"*", regexp.QuoteMeta(e.Name()))
- Expect(err).ShouldNot(HaveOccurred())
- Expect(matched).ShouldNot(BeTrue())
+ Eventually(func() bool {
+ entries, err := os.ReadDir("/tmp")
+ Expect(err).ShouldNot(HaveOccurred())
+ for _, e := range entries {
+ if e.IsDir() {
+ matched, err := filepath.Match(utils.TmpDirPrefix+"*", regexp.QuoteMeta(e.Name()))
+ Expect(err).ShouldNot(HaveOccurred())
+ if matched {
+ fmt.Println(e.Name())
+ return true
+ }
+ }
  }
- }
+ return false
+ }).WithTimeout(5 * time.Second).Should(BeFalse())
  })
  }
 

cmd/registry/push/push_suite_test.go

@@ -18,9 +18,11 @@ package push_test
 import (
  "context"
  "fmt"
+ "github.com/falcosecurity/falcoctl/internal/utils"
  "net/http"
  "os"
  "path/filepath"
+ "regexp"
  "testing"
  "time"
 
@@ -108,3 +110,23 @@ func executeRoot(args []string) error {
  rootCmd.SetOut(output)
  return cmd.Execute(rootCmd, opt)
 }
+
+var checkTmpDir = func() (bool, error) {
+ entries, err := os.ReadDir("/tmp")
+ if err != nil {
+ return false, err
+ }
+
+ for _, e := range entries {
+ if e.IsDir() {
+ matched, err := filepath.Match(utils.TmpDirPrefix+"*", regexp.QuoteMeta(e.Name()))
+ if err != nil {
+ return false, err
+ }
+ if matched {
+ return true, nil
+ }
+ }
+ }
+ return false, nil
+}

internal/utils/compress.go

@@ -31,10 +31,13 @@ import (
 const TmpDirPrefix = "falcoctl-registry-push-"
 
 // CreateTarGzArchive compresses and saves in a tar archive the passed file.
-func CreateTarGzArchive(path string) (file string, err error) {
+func CreateTarGzArchive(dir, path string) (file string, err error) {
  cleanedPath := filepath.Clean(path)
+ if dir == "" {
+ dir = TmpDirPrefix
+ }
  // Create output file.
- tmpDir, err := os.MkdirTemp("", TmpDirPrefix)
+ tmpDir, err := os.MkdirTemp("", dir)
  if err != nil {
  return "", err
  }

internal/utils/compress_test.go

@@ -29,6 +29,7 @@ import (
 const (
  filename1 = "file1"
  filename2 = "file2"
+ tmpPrefix = "testCreateTarGzArchiveFile"
 )
 
 func TestCreateTarGzArchiveFile(t *testing.T) {
@@ -39,11 +40,11 @@ func TestCreateTarGzArchiveFile(t *testing.T) {
  }
  defer f1.Close()
 
- tarball, err := CreateTarGzArchive(filepath.Join(dir, filename1))
+ tarball, err := CreateTarGzArchive(tmpPrefix, filepath.Join(dir, filename1))
  if err != nil {
  t.Fatalf(err.Error())
  }
- defer os.Remove(tarball)
+ defer os.RemoveAll(filepath.Dir(tarball))
 
  file, err := os.Open(tarball)
  if err != nil {
@@ -82,11 +83,11 @@ func TestCreateTarGzArchiveDir(t *testing.T) {
  }
  defer f2.Close()
 
- tarball, err := CreateTarGzArchive(dir)
+ tarball, err := CreateTarGzArchive(tmpPrefix, dir)
  if err != nil {
  t.Fatalf(err.Error())
  }
- defer os.Remove(tarball)
+ defer os.RemoveAll(filepath.Dir(tarball))
 
  file, err := os.Open(tarball)
  if err != nil {