fix tests & lint

Author: michaeldwan

pkg/docker/docker_client_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/docker/go-connections/nat"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/bcrypt"
 
 	"github.com/testcontainers/testcontainers-go"
 	testregistry "github.com/testcontainers/testcontainers-go/modules/registry"
@@ -41,16 +40,6 @@ type DockerClientSuite struct {
 	dockerClient command.Command
 }
 
-func (s *DockerClientSuite) assertContainerIsStopped(t *testing.T, containerID string) {
-	inspect := s.dockerHelper.InspectContainer(t, containerID)
-	assert.False(t, inspect.State.Running, "Container should be stopped")
-}
-
-func (s *DockerClientSuite) assertContainerExists(t *testing.T, containerID string) {
-	_, err := s.dockerHelper.Client.ContainerInspect(t.Context(), containerID)
-	require.NoErrorf(t, err, "Container %q should exist", containerID)
-}
-
 func (s *DockerClientSuite) assertImageExists(t *testing.T, imageRef string) {
 	inspect, err := s.dockerClient.Inspect(t.Context(), imageRef)
 	assert.NoError(t, err, "Failed to inspect image %q", imageRef)
@@ -63,34 +52,24 @@ func (s *DockerClientSuite) assertNoImageExists(t *testing.T, imageRef string) {
 	assert.Nil(t, inspect, "Image should not exist")
 }
 
-// pickFreePort returns a TCP port in [min,max] that’s free *right now*.
-// There’s still a small race between closing the listener and Docker grabbing
-// the port, but it’s good enough for test code.
-func pickFreePort(min, max int) (int, error) {
-	if min < 1024 { //|| max > 9999 || min > max {
+// pickFreePort returns a TCP port in [min,max] that's free *right now*.
+// There's still a small race between closing the listener and Docker grabbing
+// the port, but it's good enough for test code.
+func pickFreePort(minPort, maxPort int) (int, error) {
+	if minPort < 1024 || maxPort > 99999 || minPort > maxPort {
 		return 0, fmt.Errorf("invalid port range")
 	}
 
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	for tries := 0; tries < 20; tries++ { // avoid infinite loops
-		p := rng.Intn(max-min+1) + min
+	rng := rand.New(rand.NewSource(time.Now().UnixNano())) // #nosec G404 - using math/rand is fine for test port selection
+	for tries := 0; tries < 20; tries++ {                  // avoid infinite loops
+		p := rng.Intn(maxPort-minPort+1) + minPort
 		l, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", p))
 		if err == nil {
 			l.Close()
 			return p, nil // looks free
 		}
 	}
-	return 0, fmt.Errorf("could not find free port in range %d-%d", min, max)
-}
-
-func makeHtpasswd(user, pass string) (string, error) {
-	hash, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
-	if err != nil {
-		return "", err
-	}
-
-	line := user + ":" + string(hash) + "\n"
-	return line, nil
+	return 0, fmt.Errorf("could not find free port in range %d-%d", minPort, maxPort)
 }
 
 func (s *DockerClientSuite) runImageInspectTests(t *testing.T) {
@@ -119,15 +98,13 @@ func (s *DockerClientSuite) runImageInspectTests(t *testing.T) {
 
 func (s *DockerClientSuite) runPullTests(t *testing.T) {
 	fmt.Println("runPullTests")
-	// htpasswd, err := makeHtpasswd("user", "pass")
-	// require.NoError(t, err, "Failed to make htpasswd")
-	// port, err := pickFreePort(10000, 60000)
-	// require.NoError(t, err, "Failed to pick free port")
 	registryContainer, err := testregistry.Run(
 		t.Context(),
 		"registry:2",
-		// testregistry.WithHtpasswd(htpasswd),
 		testcontainers.WithHostConfigModifier(func(hostConfig *container.HostConfig) {
+			// docker only considers localhost:1 through localhost:9999 as insecure. testcontainers
+			// picks higher ports by default, so we need to pick one ourselves to allow insecure access
+			// without modifying the daemon config.
 			port, err := pickFreePort(1024, 9999)
 			require.NoError(t, err, "Failed to pick free port")
 			hostConfig.PortBindings = map[nat.Port][]nat.PortBinding{
@@ -138,10 +115,6 @@ func (s *DockerClientSuite) runPullTests(t *testing.T) {
 	defer testcontainers.CleanupContainer(t, registryContainer)
 	require.NoError(t, err, "Failed to start registry container")
 
-	// restore, err := testregistry.SetDockerAuthConfig(registryContainer.RegistryName, "user", "pass")
-	// require.NoError(t, err, "Failed to set docker auth config")
-	// defer restore()
-
 	t.Run("RemoteImageExists", func(t *testing.T) {
 		imageRef := dockertest.ImageRefWithRegistry(t, registryContainer.RegistryName, "")
 
@@ -168,7 +141,6 @@ func (s *DockerClientSuite) runPullTests(t *testing.T) {
 		// so we handle other failure cases, like failed auth, unknown tag, and unknown repo
 		require.Error(t, err, "Failed to pull image %q", imageRef)
 		assert.ErrorIs(t, err, &command.NotFoundError{Object: "manifest", Ref: imageRef})
-		// assert.ErrorContains(t, err, "failed to resolve reference")
 	})
 
 	t.Run("InvalidAuth", func(t *testing.T) {
@@ -200,8 +172,6 @@ func (s *DockerClientSuite) runContainerStopTests(t *testing.T) {
 		err = s.dockerClient.ContainerStop(t.Context(), container.ID)
 		require.NoError(t, err, "Failed to stop container %q", container.ID)
 
-		container.IsRunning()
-
 		state, err := container.State(t.Context())
 		require.NoError(t, err, "Failed to get container state")
 		assert.Equal(t, state.Running, false)