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.

Sign up for GitHub

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

[docker]:[feature] - Validate Docker version from the Docker API #965

Merged
merged 5 commits into from
Feb 1, 2022
Merged

[docker]:[feature] - Validate Docker version from the Docker API #965

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55d6684
docker:feature - Validate Docker version from the Docker API
luiguip Jan 31, 2022
f5194dc
docker:feature - call of getVersionAndSubVersion directly
luiguip Jan 31, 2022
448649b
docker:feature - refactor name of function from execDockerVersion to …
luiguip Jan 31, 2022
c55d9a5
docker:feature - used err instead of errors.New(err.Error())
luiguip Jan 31, 2022
06d8472
docker:feature - removed unecessary function validateIfDockerIsSupported
luiguip Jan 31, 2022
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
38 changes: 9 additions & 29 deletions internal/controllers/requirements/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
package docker

import (
"context"
"errors"
"fmt"
"os/exec"
"strconv"
"strings"

"github.com/ZupIT/horusec-devkit/pkg/utils/logger"

"github.com/ZupIT/horusec/internal/helpers/messages"
"github.com/ZupIT/horusec/internal/services/docker/client"
)

const (
Expand Down Expand Up @@ -53,11 +53,7 @@ func validateIfDockerIsInstalled() (string, error) {
logger.LogInfo(messages.MsgInfoHowToInstallDocker)
return "", err
}

if !checkIfContainsDockerVersion(response) {
return "", ErrDockerNotInstalled
}
return response, checkIfDockerIsRunning()
return response, nil
}

func validateIfDockerIsSupported(version string) error {
Expand All @@ -69,22 +65,15 @@ func validateIfDockerIsSupported(version string) error {
}

func execDockerVersion() (string, error) {
responseBytes, err := exec.Command("docker", "-v").CombinedOutput()
dockerClient := client.NewDockerClient()
version, err := dockerClient.ServerVersion(context.Background())
if err != nil {
logger.LogErrorWithLevel(
messages.MsgErrorWhenCheckRequirementsDocker, errors.New(string(responseBytes)))
messages.MsgErrorWhenCheckRequirementsDocker, errors.New(err.Error()),
)
return "", err
}
return strings.ToLower(string(responseBytes)), nil
}

func checkIfDockerIsRunning() error {
responseBytes, err := exec.Command("docker", "ps").CombinedOutput()
if err != nil {
logger.LogErrorWithLevel(
messages.MsgErrorWhenCheckDockerRunning, errors.New(string(responseBytes)))
}
return err
return version.Version, nil
}

func validateIfDockerIsRunningInMinVersion(response string) error {
Expand All @@ -93,7 +82,6 @@ func validateIfDockerIsRunningInMinVersion(response string) error {
logger.LogErrorWithLevel(messages.MsgErrorWhenDockerIsLowerVersion, ErrMinVersion)
return err
}

if version <= MinVersionDockerAccept && subversion < MinSubVersionDockerAccept {
fmt.Print("\n")
logger.LogInfo(messages.MsgInfoDockerLowerVersion)
Expand All @@ -104,15 +92,7 @@ func validateIfDockerIsRunningInMinVersion(response string) error {
}

func extractDockerVersionFromString(response string) (int, int, error) {
responseSpited := strings.Split(strings.ToLower(response), "docker version ")
if len(responseSpited) < 1 || len(responseSpited) > 1 && len(responseSpited[1]) < 8 {
return 0, 0, ErrDockerNotInstalled
}
return getVersionAndSubVersion(responseSpited[1])
}

func checkIfContainsDockerVersion(response string) bool {
return strings.Contains(strings.ToLower(response), "docker version ")
return getVersionAndSubVersion(response)
}

func getVersionAndSubVersion(fullVersion string) (int, int, error) {
Expand Down