From a3abf8016b6ff1afabf2fd5b35994cb81a9de9a7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Jul 2017 15:32:14 -0600 Subject: [PATCH] fix: correct lint errors --- plugins/common/common.go | 12 ++++++------ .../network-get-ipaddr/network-get-ipaddr.go | 4 ++-- .../triggers/network-get-port/network-get-port.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/common/common.go b/plugins/common/common.go index 97a7b2e1e..eae0e0df0 100644 --- a/plugins/common/common.go +++ b/plugins/common/common.go @@ -157,8 +157,8 @@ func VerifyImage(image string) bool { } // ContainerIsRunning checks to see if a container is running -func ContainerIsRunning(containerId string) bool { - b, err := DockerInspect(containerId, "'{{.State.Running}}'") +func ContainerIsRunning(containerID string) bool { + b, err := DockerInspect(containerID, "'{{.State.Running}}'") if err != nil { return false } @@ -176,13 +176,13 @@ func DirectoryExists(filePath string) bool { } // DockerInspect runs an inspect command with a given format against a container id -func DockerInspect(containerId, format string) (string, error) { - b, err := sh.Command("docker", "inspect", "--format", format, containerId).Output() +func DockerInspect(containerID, format string) (string, error) { + b, err := sh.Command("docker", "inspect", "--format", format, containerID).Output() if err != nil { return "", err } output := strings.TrimSpace(string(b[:])) - if strings.HasPrefix(output, "'") && strings.HasSuffix(output, "'") { + if strings.HasPrefix(output, "'") && strings.HasSuffix(output, "'") { output = strings.TrimSuffix(strings.TrimPrefix(output, "'"), "'") } return output, err @@ -270,7 +270,7 @@ func GetAppImageName(appName, imageTag, imageRepo string) (imageName string) { return } -// return true if given app has a running container +// IsDeployed returns true if given app has a running container func IsDeployed(appName string) bool { dokkuRoot := MustGetEnv("DOKKU_ROOT") appRoot := strings.Join([]string{dokkuRoot, appName}, "/") diff --git a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go index 270a208a1..46010bbb0 100644 --- a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go +++ b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go @@ -15,8 +15,8 @@ func main() { appName := flag.Arg(0) procType := flag.Arg(1) isHerokuishContainer := common.ToBool(flag.Arg(2)) - containerId := flag.Arg(3) + containerID := flag.Arg(3) - ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerId) + ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID) fmt.Fprintln(os.Stdout, ipAddress) } diff --git a/plugins/network/src/triggers/network-get-port/network-get-port.go b/plugins/network/src/triggers/network-get-port/network-get-port.go index bf695d34f..9ac850788 100644 --- a/plugins/network/src/triggers/network-get-port/network-get-port.go +++ b/plugins/network/src/triggers/network-get-port/network-get-port.go @@ -15,8 +15,8 @@ func main() { appName := flag.Arg(0) procType := flag.Arg(1) isHerokuishContainer := common.ToBool(flag.Arg(2)) - containerId := flag.Arg(3) + containerID := flag.Arg(3) - port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerId) + port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerID) fmt.Fprintln(os.Stdout, port) }