Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump github.com/docker/compose/v2 from 2.23.3 to 2.24.0 in /modules/compose #2096

Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0a891a3
chore(deps): bump github.com/docker/compose/v2 in /modules/compose
dependabot[bot] Jan 12, 2024
62d7e65
chore: bump buildx to rc-2
mdelapenya Jan 12, 2024
7111e7f
chore: use compose-go v2
mdelapenya Jan 14, 2024
d605b39
fix: resolve breaking changes using the right type
mdelapenya Jan 14, 2024
fbadf8f
fix: use non-deprecated list options
mdelapenya Jan 14, 2024
a2c3f98
chore: proper deprecation commands for LocalDockerCompose
mdelapenya Jan 14, 2024
242ff5a
chore: use require for Up errors
mdelapenya Jan 15, 2024
196efc3
chore: fix validation for modern compose version
mdelapenya Jan 17, 2024
7bc7b95
Merge branch 'main' into dependabot/go_modules/modules/compose/github…
mdelapenya Jan 17, 2024
497ce80
chore: remove unused variable
mdelapenya Jan 17, 2024
9502533
chore: remove named return
mdelapenya Jan 17, 2024
cd578ed
chore: simplify
mdelapenya Jan 17, 2024
5ad25a0
chore: use non-deprecated options
mdelapenya Jan 17, 2024
49391ae
chore: resolve golangci lints
mdelapenya Jan 17, 2024
07844f2
fix: assert.Len
mdelapenya Jan 17, 2024
c70a6c9
fix: wrong replace
mdelapenya Jan 17, 2024
d9ec85e
Merge branch 'main' into dependabot/go_modules/modules/compose/github…
mdelapenya Jan 20, 2024
b7ec95d
chore: bump compose dependencies
mdelapenya Jan 20, 2024
f32b0fe
fix: honour compose unicity
mdelapenya Jan 20, 2024
6e3e152
fix: lint applied reversely
mdelapenya Jan 20, 2024
843e114
fix: length
mdelapenya Jan 20, 2024
3b5efbc
fix: wrong copy&paste
mdelapenya Jan 20, 2024
3ef8a49
Merge branch 'main' into dependabot/go_modules/modules/compose/github…
mdelapenya Jan 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: assert.Len
mdelapenya committed Jan 17, 2024
commit 07844f27750f02822f9a5cf9e7f8f523eb909285
28 changes: 14 additions & 14 deletions modules/compose/compose_api_test.go
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -86,7 +86,7 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 2)
assert.Len(t, serviceNames, 2)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
}
@@ -114,7 +114,7 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
_, err = compose.ServiceContainer(context.Background(), "mysql")
require.Error(t, err, "Make sure there is no mysql container")

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -136,7 +136,7 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 2)
assert.Len(t, serviceNames, 2)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")

@@ -178,7 +178,7 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -205,7 +205,7 @@ func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -232,7 +232,7 @@ func TestDockerComposeAPIWithContainerName(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -256,7 +256,7 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -281,7 +281,7 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 2)
assert.Len(t, serviceNames, 2)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
}
@@ -311,7 +311,7 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")
}

@@ -331,7 +331,7 @@ func TestDockerComposeAPIComplex(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 2)
assert.Len(t, serviceNames, 2)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
}
@@ -360,7 +360,7 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 1)
assert.Len(t, serviceNames, 1)
assert.Contains(t, serviceNames, "nginx")

present := map[string]string{
@@ -399,7 +399,7 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {

serviceNames := compose.Services()

assert.Len(t, len(serviceNames), 3)
assert.Len(t, serviceNames, 3)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
assert.Contains(t, serviceNames, "postgres")
@@ -496,7 +496,7 @@ func TestDockerComposeApiWithWaitForShortLifespanService(t *testing.T) {

services := compose.Services()

assert.Len(t, len(services), 2)
assert.Len(t, services, 2)
assert.Contains(t, services, "falafel")
assert.Contains(t, services, "tzatziki")
}
24 changes: 12 additions & 12 deletions modules/compose/compose_test.go
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ func TestDockerComposeStrategyForInvalidService(t *testing.T) {
Invoke()
require.NoError(t, err.Error, "Expected error to be thrown because service with wait strategy is not running")

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -162,7 +162,7 @@ func TestDockerComposeWithWaitLogStrategy(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 2)
assert.Len(t, , 2)
assert.Contains(t, compose.Services, "nginx")
assert.Contains(t, compose.Services, "mysql")
}
@@ -188,7 +188,7 @@ func TestDockerComposeWithWaitForService(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -212,7 +212,7 @@ func TestDockerComposeWithWaitForShortLifespanService(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 2)
assert.Len(t, , 2)
assert.Contains(t, compose.Services, "falafel")
assert.Contains(t, compose.Services, "tzatziki")
}
@@ -238,7 +238,7 @@ func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -263,7 +263,7 @@ func TestDockerComposeWithContainerName(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -285,7 +285,7 @@ func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -308,7 +308,7 @@ func TestDockerComposeWithMultipleWaitStrategies(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
assert.Contains(t, compose.Services, "mysql")
}
@@ -336,7 +336,7 @@ func TestDockerComposeWithFailedStrategy(t *testing.T) {
// A specific error message matcher is not asserted since the docker library can change the return message, breaking this test
require.NoError(t, err.Error, "Expected error to be thrown because of a wrong suplied wait strategy")

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")
}

@@ -357,7 +357,7 @@ func TestLocalDockerComposeComplex(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 2)
assert.Len(t, , 2)
assert.Contains(t, compose.Services, "nginx")
assert.Contains(t, compose.Services, "mysql")
}
@@ -382,7 +382,7 @@ func TestLocalDockerComposeWithEnvironment(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 1)
assert.Len(t, , 1)
assert.Contains(t, compose.Services, "nginx")

present := map[string]string{
@@ -417,7 +417,7 @@ func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
Invoke()
checkIfError(t, err)

assert.Len(t, len(compose.Services), 3)
assert.Len(t, , 3)
assert.Contains(t, compose.Services, "nginx")
assert.Contains(t, compose.Services, "mysql")
assert.Contains(t, compose.Services, "postgres")