Merge branch 'main' into windows-tests

* main:
  Simplify dependabot updates sorting (testcontainers#1460)
  feat: use credential helper in docker config, even if auth is empty in .docker/config.json (testcontainers#1079)
  chore(deps): bump github.com/aws/aws-sdk-go-v2/service/s3 (testcontainers#1457)

.github/dependabot.yml

@@ -8,14 +8,14 @@ updates:
  day: sunday
  open-pull-requests-limit: 3
  rebase-strategy: disabled
- - package-ecosystem: pip
+ - package-ecosystem: gomod
  directory: /
  schedule:
  interval: monthly
  day: sunday
  open-pull-requests-limit: 3
  rebase-strategy: disabled
- - package-ecosystem: gomod
+ - package-ecosystem: pip
  directory: /
  schedule:
  interval: monthly

docker_auth.go

@@ -81,6 +81,17 @@ func getDockerAuthConfigs() (map[string]registry.AuthConfig, error) {
  cfgs[k] = ac
  }
 
+ // in the case where the auth field in the .docker/conf.json is empty, and the user has credential helpers registered
+ // the auth comes from there
+ for k := range cfg.CredentialHelpers {
+ ac := registry.AuthConfig{}
+ u, p, _ := dockercfg.GetRegistryCredentials(k)
+ ac.Username = u
+ ac.Password = p
+
+ cfgs[k] = ac
+ }
+
  return cfgs, nil
 }
 
@@ -96,7 +107,6 @@ func getDockerConfig() (dockercfg.Config, error) {
  if err == nil {
  return cfg, nil
  }
-
  }
 
  cfg, err := dockercfg.LoadDefaultConfig()

modulegen/dependabot.go

@@ -63,7 +63,10 @@ func (u Updates) Len() int {
 // is not a transitive ordering when not-a-number (NaN) values are involved.
 // See Float64Slice.Less for a correct implementation for floating-point values.
 func (u Updates) Less(i, j int) bool {
- return u[i].Directory < u[j].Directory
+ if u[i].Directory != u[j].Directory {
+ return u[i].Directory < u[j].Directory
+ }
+ return u[i].PackageEcosystem < u[j].PackageEcosystem
 }
 
 // Swap swaps the elements with indexes i and j.

modulegen/main.go

@@ -279,30 +279,8 @@ func generateDependabotUpdates(rootDir string, example Example) error {
  if err != nil {
  return err
  }
-
- dependabotExampleUpdates := dependabotConfig.Updates
-
- // make sure GH actions, Pip and the core module are the three first elements in the list of examples
- exampleUpdates := make(Updates, len(dependabotExampleUpdates)-3)
- j := 0
-
- for _, exampleUpdate := range dependabotExampleUpdates {
- // filter out the root module
- if exampleUpdate.PackageEcosystem == "gomod" && exampleUpdate.Directory != "/" {
- exampleUpdates[j] = exampleUpdate
- j++
- }
- }
-
- exampleUpdates = append(exampleUpdates, NewUpdate(example))
- sort.Sort(exampleUpdates)
-
- // prepend the github actions, pip and main modules
- firstUpdates := dependabotExampleUpdates[0:3]
- exampleUpdates = append(firstUpdates, exampleUpdates...)
-
- dependabotConfig.Updates = exampleUpdates
-
+ dependabotConfig.Updates = append(dependabotConfig.Updates, NewUpdate(example))
+ sort.Sort(dependabotConfig.Updates)
  return writeDependabotConfig(rootDir, dependabotConfig)
 }
 

modulegen/main_test.go

@@ -403,11 +403,11 @@ func assertDependabotExamplesUpdates(t *testing.T, example Example, originalConf
 
  // second item is the core module
  assert.Equal(t, "/", examples[1].Directory, examples)
- assert.Equal(t, "pip", examples[1].PackageEcosystem, "PackageEcosystem should be pip")
+ assert.Equal(t, "gomod", examples[1].PackageEcosystem, "PackageEcosystem should be gomod")
 
- // third item is the core module
+ // third item is the pip module
  assert.Equal(t, "/", examples[2].Directory, examples)
- assert.Equal(t, "gomod", examples[2].PackageEcosystem, "PackageEcosystem should be gomod")
+ assert.Equal(t, "pip", examples[2].PackageEcosystem, "PackageEcosystem should be pip")
 }
 
 // assert content example file in the docs

modules/localstack/go.mod

@@ -4,10 +4,10 @@ go 1.19
 
 require (
  github.com/aws/aws-sdk-go v1.44.317
- github.com/aws/aws-sdk-go-v2 v1.20.0
+ github.com/aws/aws-sdk-go-v2 v1.20.1
  github.com/aws/aws-sdk-go-v2/config v1.18.32
  github.com/aws/aws-sdk-go-v2/credentials v1.13.31
- github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1
+ github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2
  github.com/docker/go-connections v0.4.0
  github.com/stretchr/testify v1.8.4
  github.com/testcontainers/testcontainers-go v0.22.0
@@ -18,20 +18,20 @@ require (
  dario.cat/mergo v1.0.0 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/Microsoft/go-winio v0.6.1 // indirect
- github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect
  github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 // indirect
- github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1 // indirect
  github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 // indirect
  github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 // indirect
  github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 // indirect
- github.com/aws/smithy-go v1.14.0 // indirect
+ github.com/aws/smithy-go v1.14.1 // indirect
  github.com/cenkalti/backoff/v4 v4.2.0 // indirect
  github.com/containerd/containerd v1.7.3 // indirect
  github.com/cpuguy83/dockercfg v0.3.1 // indirect
@@ -57,7 +57,7 @@ require (
  github.com/sirupsen/logrus v1.9.0 // indirect
  golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
  golang.org/x/net v0.9.0 // indirect
- golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/sys v0.11.0 // indirect
  golang.org/x/tools v0.7.0 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
  google.golang.org/grpc v1.57.0 // indirect

modules/localstack/go.sum

@@ -9,47 +9,47 @@ github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5
 github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek=
 github.com/aws/aws-sdk-go v1.44.317 h1:+8XWrLmGMwPPXSRSLPzhgcGnzJ2mYkgkrcB9C/GnSOU=
 github.com/aws/aws-sdk-go v1.44.317/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
-github.com/aws/aws-sdk-go-v2 v1.20.0 h1:INUDpYLt4oiPOJl0XwZDK2OVAVf0Rzo+MGVTv9f+gy8=
 github.com/aws/aws-sdk-go-v2 v1.20.0/go.mod h1:uWOr0m0jDsiWw8nnXiqZ+YG6LdvAlGYDLLf2NmHZoy4=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno=
+github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg=
+github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12/go.mod h1:TDCkEAkMTXxTs0oLBGBKpBZbk3NLh8EvAfF0Q3x8/0c=
 github.com/aws/aws-sdk-go-v2/config v1.18.32 h1:tqEOvkbTxwEV7hToRcJ1xZRjcATqwDVsWbAscgRKyNI=
 github.com/aws/aws-sdk-go-v2/config v1.18.32/go.mod h1:U3ZF0fQRRA4gnbn9GGvOWLoT2EzzZfAWeKwnVrm1rDc=
 github.com/aws/aws-sdk-go-v2/credentials v1.13.31 h1:vJyON3lG7R8VOErpJJBclBADiWTwzcwdkQpTKx8D2sk=
 github.com/aws/aws-sdk-go-v2/credentials v1.13.31/go.mod h1:T4sESjBtY2lNxLgkIASmeP57b5j7hTQqCbqG0tWnxC4=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 h1:X3H6+SU21x+76LRglk21dFRgMTJMa5QcpW+SqUf5BBg=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7/go.mod h1:3we0V09SwcJBzNlnyovrR2wWJhWmVdqAsmVs4uronv8=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 h1:zr/gxAZkMcvP71ZhQOcvdm8ReLjFgIXnIn0fw5AM7mo=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37/go.mod h1:Pdn4j43v49Kk6+82spO3Tu5gSeQXRsxo56ePPQAvFiA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 h1:0HCMIkAkVY9KMgueD8tf4bRTUanzEYvhw7KkPXIMpO0=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31/go.mod h1:fTJDMe8LOFYtqiFFFeHA+SVMAwqLhoq0kcInYoLa9Js=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 h1:+i1DOFrW3YZ3apE45tCal9+aDKK6kNEbW6Ib7e1nFxE=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38/go.mod h1:1/jLp0OgOaWIetycOmycW+vYTYgTZFPttJQRgsI1PoU=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 h1:AzwRi5OKKwo4QNqPf7TjeO+tK8AyOK3GVSwmRPo7/Cs=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25/go.mod h1:SUbB4wcbSEyCvqBxv/O/IBf93RbEze7U7OnoTlpPB+g=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 h1:vGWm5vTpMr39tEZfQeDiDAMgk+5qsnvRny3FjLpnH5w=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28/go.mod h1:spfrICMD6wCAhjhzHuy6DOZZ+LAIY10UxhUmLzpJTTs=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 h1:auGDJ0aLZahF5SPvkJ6WcUuX7iQ7kyl2MamV7Tm8QBk=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1 h1:vUh7dBFNS3oFCtVv6CiYKh5hP9ls8+kIpKLeFruIBLk=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1/go.mod h1:sFMeinkhj/SZKQM8BxtvNtSPjJEo0Xrz+w3g2e4FSKI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13 h1:iV/W5OMBys+66OeXJi/7xIRrKZNsu0ylsLGu+6nbmQE=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13/go.mod h1:ReJb6xYmtGyu9KoFtRreWegbN9dZqvZIIv4vWnhcsyI=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33 h1:QviNkc+vGSuEHx8P+pVNKOdWLXBPIwMFv7p0fphgE4U=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33/go.mod h1:fABTUmOrAgAalG2i9WJpjBvlnk7UK8YmnYaxN+Q2CwE=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31/go.mod h1:3+lloe3sZuBQw1aBc5MyndvodzQlyqCZ7x1QPDHaWP4=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 h1:NbWkRxEEIRSCqxhsHQuMiTH7yo+JZW1gp8v3elSVMTQ=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2/go.mod h1:4tfW5l4IAB32VWCDEBxCRtR9T4BWy4I4kr1spr8NgZM=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 h1:O+9nAy9Bb6bJFTpeNFtd9UfHbgxO1o4ZDAM9rQp5NsY=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1/go.mod h1:J9kLNzEiHSeGMyN7238EjJmBpCniVzFda75Gxl/NqB8=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32/go.mod h1:4jwAWKEkCR0anWk5+1RbfSg1R5Gzld7NLiuaq5bTR/Y=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1 h1:PT6PBCycRwhpEW5hJnRiceCeoWJ+r3bdgXtV+VKG7Pk=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1/go.mod h1:TqoxCLwT2nrxrBGA+z7t6OWM7LBkgRckK3gOjYE+7JA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2 h1:v346f1h8sUBKXnEbrv43L37MTBlFHyKXQPIZHNAaghA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2/go.mod h1:cwCATiyNrXK9P2FsWdZ89g9mpsYv2rhk0UA/KByl5fY=
 github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 h1:DSNpSbfEgFXRV+IfEcKE5kTbqxm+MeF5WgyeRlsLnHY=
 github.com/aws/aws-sdk-go-v2/service/sso v1.13.1/go.mod h1:TC9BubuFMVScIU+TLKamO6VZiYTkYoEHqlSQwAe2omw=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 h1:hd0SKLMdOL/Sl6Z0np1PX9LeH2gqNtBe0MhTedA8MGI=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1/go.mod h1:XO/VcyoQ8nKyKfFW/3DMsRQXsfh/052tHTWmg3xBXRg=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 h1:pAOJj+80tC8sPVgSDHzMYD6KLWsaLQ1kZw31PTeORbs=
 github.com/aws/aws-sdk-go-v2/service/sts v1.21.1/go.mod h1:G8SbvL0rFk4WOJroU8tKBczhsbhj2p/YY7qeJezJ3CI=
-github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/aws/smithy-go v1.14.0 h1:+X90sB94fizKjDmwb4vyl2cTTPXTE5E2G/1mjByb0io=
 github.com/aws/smithy-go v1.14.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
+github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs=
+github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
@@ -189,8 +189,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=