Skip to content

Commit

Permalink
chore: resolve golangci lints
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdelapenya
mdelapenya committed Jan 17, 2024
1 parent 5ad25a0 commit 49391ae
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: golangci-lint
# TODO: Remove each example/module once it passes the golangci-lint
if: ${{ inputs.platform == 'ubuntu-latest' && inputs.go-version == '1.20.x' && !contains(fromJSON('["examples/cockroachdb", "examples/toxiproxy", "modules/compose", "modules/redis"]'), inputs.project-directory) }}
if: ${{ inputs.platform == 'ubuntu-latest' && inputs.go-version == '1.20.x' && !contains(fromJSON('["examples/cockroachdb", "examples/toxiproxy", "modules/redis"]'), inputs.project-directory) }}
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
Expand Down
108 changes: 54 additions & 54 deletions modules/compose/compose_api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const (
func TestDockerComposeAPI(t *testing.T) {
path := filepath.Join(testdataPackage, simpleCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -46,7 +46,7 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -58,21 +58,21 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
Up(ctx, Wait(true))

require.Error(t, err, "Expected error to be thrown because service with wait strategy is not running")
assert.Equal(t, err.Error(), "no container found for service name mysql-1")
require.Equal(t, "no container found for service name mysql-1", err.Error())

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -86,18 +86,18 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithRunServices(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -112,9 +112,9 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
serviceNames := compose.Services()

_, err = compose.ServiceContainer(context.Background(), "mysql")
assert.Error(t, err, "Make sure there is no mysql container")
require.Error(t, err, "Make sure there is no mysql container")

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

Expand All @@ -123,10 +123,10 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {
compose, err := NewDockerComposeWith(
WithStackFiles(path),
WithLogger(testcontainers.TestLogger(t)))
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -136,7 +136,7 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {

serviceNames := compose.Services()

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

Expand All @@ -150,18 +150,18 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {

// check container status
state, err := mysqlContainer.State(ctx)
assert.NoError(t, err)
require.NoError(t, err)
assert.False(t, state.Running)
assert.Equal(t, "exited", state.Status)
}

func TestDockerComposeAPIWithWaitForService(t *testing.T) {
path := filepath.Join(testdataPackage, simpleCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -178,17 +178,17 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
path := filepath.Join(testdataPackage, simpleCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -205,17 +205,17 @@ func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithContainerName(t *testing.T) {
path := filepath.Join(testdataPackage, "docker-compose-container-name.yml")
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -232,17 +232,17 @@ func TestDockerComposeAPIWithContainerName(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
path := filepath.Join(testdataPackage, "docker-compose-no-exposed-ports.yml")
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -256,17 +256,17 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -281,18 +281,18 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
path := filepath.Join(testdataPackage, simpleCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -311,17 +311,17 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {

serviceNames := compose.Services()

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

func TestDockerComposeAPIComplex(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -331,7 +331,7 @@ func TestDockerComposeAPIComplex(t *testing.T) {

serviceNames := compose.Services()

assert.Equal(t, 2, len(serviceNames))
assert.Len(t, len(serviceNames), 2)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
}
Expand All @@ -342,10 +342,10 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {
path := filepath.Join(testdataPackage, simpleCompose)

compose, err := NewDockerComposeWith(WithStackFiles(path), identifier)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -360,7 +360,7 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {

serviceNames := compose.Services()

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

present := map[string]string{
Expand All @@ -380,10 +380,10 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
identifier := testNameHash(t.Name())

compose, err := NewDockerComposeWith(composeFiles, identifier)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -399,7 +399,7 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {

serviceNames := compose.Services()

assert.Equal(t, 3, len(serviceNames))
assert.Len(t, len(serviceNames), 3)
assert.Contains(t, serviceNames, "nginx")
assert.Contains(t, serviceNames, "mysql")
assert.Contains(t, serviceNames, "postgres")
Expand All @@ -415,10 +415,10 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
func TestDockerComposeAPIWithVolume(t *testing.T) {
path := filepath.Join(testdataPackage, composeWithVolume)
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -433,7 +433,7 @@ func TestDockerComposeAPIVolumesDeletedOnDown(t *testing.T) {
identifier := uuid.New().String()
stackFiles := WithStackFiles(path)
compose, err := NewDockerComposeWith(stackFiles, StackIdentifier(identifier))
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)
Expand All @@ -442,26 +442,26 @@ func TestDockerComposeAPIVolumesDeletedOnDown(t *testing.T) {
require.NoError(t, err, "compose.Up()")

err = compose.Down(context.Background(), RemoveOrphans(true), RemoveVolumes(true), RemoveImagesLocal)
assert.NoError(t, err, "compose.Down()")
require.NoError(t, err, "compose.Down()")

volumeListFilters := filters.NewArgs()
// the "mydata" identifier comes from the "testdata/docker-compose-volume.yml" file
volumeListFilters.Add("name", fmt.Sprintf("%s_mydata", identifier))
volumeList, err := compose.dockerClient.VolumeList(ctx, volume.ListOptions{Filters: volumeListFilters})
assert.NoError(t, err, "compose.dockerClient.VolumeList()")
require.NoError(t, err, "compose.dockerClient.VolumeList()")

assert.Equal(t, 0, len(volumeList.Volumes), "Volumes are not cleaned up")
assert.Empty(t, volumeList.Volumes, "Volumes are not cleaned up")
}

func TestDockerComposeAPIWithBuild(t *testing.T) {
t.Skip("Skipping test because of the opentelemetry dependencies issue. See https://github.com/open-telemetry/opentelemetry-go/issues/4476#issuecomment-1840547010")

path := filepath.Join(testdataPackage, "docker-compose-build.yml")
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -477,10 +477,10 @@ func TestDockerComposeAPIWithBuild(t *testing.T) {
func TestDockerComposeApiWithWaitForShortLifespanService(t *testing.T) {
path := filepath.Join(testdataPackage, "docker-compose-short-lifespan.yml")
compose, err := NewDockerCompose(path)
assert.NoError(t, err, "NewDockerCompose()")
require.NoError(t, err, "NewDockerCompose()")

t.Cleanup(func() {
assert.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
})

ctx, cancel := context.WithCancel(context.Background())
Expand All @@ -496,7 +496,7 @@ func TestDockerComposeApiWithWaitForShortLifespanService(t *testing.T) {

services := compose.Services()

assert.Equal(t, 2, len(services))
assert.Len(t, len(services), 2)
assert.Contains(t, services, "falafel")
assert.Contains(t, services, "tzatziki")
}
Expand Down
Loading

0 comments on commit 49391ae

Please sign in to comment.