Merge branch 'main' into ms/issue-946-v2

* main:
  fix: data race in docker client `Info()` (testcontainers#1779)
  Use correct formatting directive for errors in lifecycle logs (testcontainers#1780)
  chore(deps): bump golang.org/x/mod from 0.12.0 to 0.13.0 in /modules/{elasticsearch,kafka} and /modulegen (testcontainers#1778)
  chore(deps): bump github.com/rabbitmq/amqp091-go in /modules/rabbitmq (testcontainers#1728)
  chore(deps): bump github.com/ClickHouse/clickhouse-go/v2 (testcontainers#1732)
  ignore patterns defined in dockerignore (testcontainers#1725)

commons-test.mk

@@ -18,7 +18,7 @@ test-%:
  --packages="./..." \
  --junitfile TEST-unit.xml \
  -- \
- -coverprofile=coverage.out \
+ -coverprofile=coverage.out \
  -timeout=30m
 
 .PHONY: tools

container.go

@@ -5,6 +5,7 @@ import (
  "errors"
  "fmt"
  "io"
+ "os"
  "path/filepath"
  "strings"
  "time"
@@ -16,6 +17,7 @@ import (
  "github.com/docker/docker/pkg/archive"
  "github.com/docker/go-connections/nat"
  "github.com/google/uuid"
+ "github.com/moby/patternmatcher/ignorefile"
 
  tcexec "github.com/testcontainers/testcontainers-go/exec"
  "github.com/testcontainers/testcontainers-go/internal/testcontainersdocker"
@@ -188,14 +190,32 @@ func (c *ContainerRequest) GetContext() (io.Reader, error) {
  }
  c.Context = abs
 
- buildContext, err := archive.TarWithOptions(c.Context, &archive.TarOptions{})
+ excluded, err := parseDockerIgnore(abs)
+ if err != nil {
+ return nil, err
+ }
+ buildContext, err := archive.TarWithOptions(c.Context, &archive.TarOptions{ExcludePatterns: excluded})
  if err != nil {
  return nil, err
  }
 
  return buildContext, nil
 }
 
+func parseDockerIgnore(targetDir string) ([]string, error) {
+ // based on https://github.com/docker/cli/blob/master/cli/command/image/build/dockerignore.go#L14
+ fileLocation := filepath.Join(targetDir, ".dockerignore")
+ var excluded []string
+ if f, openErr := os.Open(fileLocation); openErr == nil {
+ var err error
+ excluded, err = ignorefile.ReadAll(f)
+ if err != nil {
+ return excluded, fmt.Errorf("error reading .dockerignore: %w", err)
+ }
+ }
+ return excluded, nil
+}
+
 // GetBuildArgs returns the env args to be used when creating from Dockerfile
 func (c *ContainerRequest) GetBuildArgs() map[string]*string {
  return c.FromDockerfile.BuildArgs

container_test.go

@@ -412,3 +412,28 @@ func TestOverrideContainerRequest(t *testing.T) {
  assert.Equal(t, []string{"bar"}, req.NetworkAliases["foo1"])
  assert.Equal(t, wait.ForLog("foo"), req.WaitingFor)
 }
+
+func TestParseDockerIgnore(t *testing.T) {
+ testCases := []struct {
+ filePath string
+ expectedErr error
+ expectedExcluded []string
+ }{
+ {
+ filePath: "./testdata/dockerignore",
+ expectedErr: nil,
+ expectedExcluded: []string{"vendor", "foo", "bar"},
+ },
+ {
+ filePath: "./testdata",
+ expectedErr: nil,
+ expectedExcluded: []string(nil),
+ },
+ }
+
+ for _, testCase := range testCases {
+ excluded, err := parseDockerIgnore(testCase.filePath)
+ assert.Equal(t, testCase.expectedErr, err)
+ assert.Equal(t, testCase.expectedExcluded, excluded)
+ }
+}

docker_client.go

@@ -2,6 +2,7 @@ package testcontainers
 
 import (
  "context"
+ "fmt"
  "sync"
 
  "github.com/docker/docker/api/types"
@@ -20,8 +21,10 @@ type DockerClient struct {
 }
 
 var (
- dockerInfo types.Info // dockerInfo stores the docker info to be reused in the Info method
- dockerInfoOnce sync.Once
+ // dockerInfo stores the docker info to be reused in the Info method
+ dockerInfo types.Info
+ dockerInfoSet bool
+ dockerInfoLock sync.Mutex
 )
 
 // implements SystemAPIClient interface
@@ -36,14 +39,20 @@ func (c *DockerClient) Events(ctx context.Context, options types.EventsOptions)
 // and reused every time Info is called.
 // It will also print out the docker server info, and the resolved Docker paths, to the default logger.
 func (c *DockerClient) Info(ctx context.Context) (types.Info, error) {
- var err error
- dockerInfoOnce.Do(func() {
- dockerInfo, err = c.Client.Info(ctx)
- if err != nil {
- return
- }
+ dockerInfoLock.Lock()
+ defer dockerInfoLock.Unlock()
+ if dockerInfoSet {
+ return dockerInfo, nil
+ }
 
- infoMessage := `%v - Connected to docker: 
+ info, err := c.Client.Info(ctx)
+ if err != nil {
+ return info, fmt.Errorf("failed to retrieve docker info: %w", err)
+ }
+ dockerInfo = info
+ dockerInfoSet = true
+
+ infoMessage := `%v - Connected to docker: 
  Server Version: %v
  API Version: %v
  Operating System: %v
@@ -54,22 +63,16 @@ func (c *DockerClient) Info(ctx context.Context) (types.Info, error) {
  Test ProcessID: %s
 `
 
- Logger.Printf(infoMessage, packagePath,
- dockerInfo.ServerVersion, c.Client.ClientVersion(),
- dockerInfo.OperatingSystem, dockerInfo.MemTotal/1024/1024,
- testcontainersdocker.ExtractDockerHost(ctx),
- testcontainersdocker.ExtractDockerSocket(ctx),
- testcontainerssession.SessionID(),
- testcontainerssession.ProcessID(),
- )
- })
-
- if err != nil {
- // reset the state of the sync.Once so that the next call to Info will try again
- dockerInfoOnce = sync.Once{}
- }
+ Logger.Printf(infoMessage, packagePath,
+ dockerInfo.ServerVersion, c.Client.ClientVersion(),
+ dockerInfo.OperatingSystem, dockerInfo.MemTotal/1024/1024,
+ testcontainersdocker.ExtractDockerHost(ctx),
+ testcontainersdocker.ExtractDockerSocket(ctx),
+ testcontainerssession.SessionID(),
+ testcontainerssession.ProcessID(),
+ )
 
- return dockerInfo, err
+ return dockerInfo, nil
 }
 
 // RegistryLogin logs into a Docker registry.

docker_client_test.go

@@ -0,0 +1,41 @@
+package testcontainers
+
+import (
+ "context"
+ "sync"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestGetDockerInfo(t *testing.T) {
+ t.Run("works", func(t *testing.T) {
+ ctx := context.Background()
+ c, err := NewDockerClientWithOpts(ctx)
+ require.NoError(t, err)
+
+ info, err := c.Info(ctx)
+ require.NoError(t, err)
+ require.NotNil(t, info)
+ })
+
+ t.Run("is goroutine safe", func(t *testing.T) {
+ ctx := context.Background()
+ c, err := NewDockerClientWithOpts(ctx)
+ require.NoError(t, err)
+
+ count := 1024
+ wg := sync.WaitGroup{}
+ wg.Add(count)
+
+ for i := 0; i < count; i++ {
+ go func() {
+ defer wg.Done()
+ info, err := c.Info(ctx)
+ require.NoError(t, err)
+ require.NotNil(t, info)
+ }()
+ }
+ wg.Wait()
+ })
+}

examples/cockroachdb/go.mod

@@ -38,7 +38,7 @@ require (
  github.com/kr/text v0.2.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

examples/cockroachdb/go.sum

@@ -140,8 +140,8 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

examples/consul/go.mod

@@ -38,7 +38,7 @@ require (
  github.com/mattn/go-isatty v0.0.17 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

examples/consul/go.sum

@@ -166,8 +166,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

examples/nginx/go.mod

@@ -25,7 +25,7 @@ require (
  github.com/klauspost/compress v1.16.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

examples/nginx/go.sum

@@ -61,8 +61,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

examples/toxiproxy/go.mod

@@ -29,7 +29,7 @@ require (
  github.com/klauspost/compress v1.16.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

examples/toxiproxy/go.sum

@@ -70,8 +70,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

go.mod

@@ -12,6 +12,7 @@ require (
  github.com/docker/go-units v0.5.0
  github.com/google/uuid v1.3.1
  github.com/magiconair/properties v1.8.7
+ github.com/moby/patternmatcher v0.6.0
  github.com/moby/term v0.5.0
  github.com/opencontainers/image-spec v1.1.0-rc4
  github.com/shirou/gopsutil/v3 v3.23.9
@@ -32,7 +33,6 @@ require (
  github.com/klauspost/compress v1.16.0 // indirect
  github.com/kr/pretty v0.3.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect

go.sum

@@ -67,8 +67,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

lifecycle.go

@@ -157,13 +157,13 @@ func (c *DockerContainer) startedHook(ctx context.Context) error {
 func (c *DockerContainer) printLogs(ctx context.Context, cause error) {
  reader, err := c.Logs(ctx)
  if err != nil {
- c.logger.Printf("failed accessing container logs: %w\n", err)
+ c.logger.Printf("failed accessing container logs: %v\n", err)
  return
  }
 
  b, err := io.ReadAll(reader)
  if err != nil {
- c.logger.Printf("failed reading container logs: %w\n", err)
+ c.logger.Printf("failed reading container logs: %v\n", err)
  return
  }
 

modulegen/go.mod

@@ -6,7 +6,7 @@ require (
  github.com/spf13/cobra v1.7.0
  github.com/stretchr/testify v1.8.4
  golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
- golang.org/x/mod v0.12.0
+ golang.org/x/mod v0.13.0
  golang.org/x/text v0.13.0
  gopkg.in/yaml.v3 v3.0.1
 )

modulegen/go.sum

@@ -14,8 +14,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

modules/artemis/go.mod

@@ -28,7 +28,7 @@ require (
  github.com/klauspost/compress v1.16.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

modules/artemis/go.sum

@@ -67,8 +67,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=

modules/cassandra/go.mod

@@ -30,7 +30,7 @@ require (
  github.com/klauspost/compress v1.16.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/morikuni/aec v1.0.0 // indirect

modules/cassandra/go.sum

@@ -74,8 +74,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
 github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=