Fix linter

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-02-21 17:54:01 +01:00 committed by aiordache
parent f1976eca07
commit 5306f38f70
6 changed files with 56 additions and 53 deletions

View File

@ -1,17 +1,17 @@
package compose package compose
const ( const (
LABEL_DOCKER_COMPOSE_PREFIX = "com.docker.compose" LabelDockerComposePrefix = "com.docker.compose"
LABEL_SERVICE = LABEL_DOCKER_COMPOSE_PREFIX + ".service" LabelService = LabelDockerComposePrefix + ".service"
LABEL_VERSION = LABEL_DOCKER_COMPOSE_PREFIX + ".version" LabelVersion = LabelDockerComposePrefix + ".version"
LABEL_CONTAINER_NUMBER = LABEL_DOCKER_COMPOSE_PREFIX + ".container-number" LabelContainerNumber = LabelDockerComposePrefix + ".container-number"
LABEL_ONE_OFF = LABEL_DOCKER_COMPOSE_PREFIX + ".oneoff" LabelOneOff = LabelDockerComposePrefix + ".oneoff"
LABEL_NETWORK = LABEL_DOCKER_COMPOSE_PREFIX + ".network" LabelNetwork = LabelDockerComposePrefix + ".network"
LABEL_SLUG = LABEL_DOCKER_COMPOSE_PREFIX + ".slug" LabelSlug = LabelDockerComposePrefix + ".slug"
LABEL_VOLUME = LABEL_DOCKER_COMPOSE_PREFIX + ".volume" LabelVolume = LabelDockerComposePrefix + ".volume"
LABEL_CONFIG_HASH = LABEL_DOCKER_COMPOSE_PREFIX + ".config-hash" LabelConfigHash = LabelDockerComposePrefix + ".config-hash"
LABEL_PROJECT = LABEL_DOCKER_COMPOSE_PREFIX + ".project" LabelProject = LabelDockerComposePrefix + ".project"
LABEL_WORKING_DIR = LABEL_DOCKER_COMPOSE_PREFIX + ".working_dir" LabelWorkingDir = LabelDockerComposePrefix + ".working_dir"
LABEL_CONFIG_FILES = LABEL_DOCKER_COMPOSE_PREFIX + ".config_files" LabelConfigFiles = LabelDockerComposePrefix + ".config_files"
LABEL_ENVIRONMENT_FILE = LABEL_DOCKER_COMPOSE_PREFIX + ".environment_file" LabelEnvironmentFile = LabelDockerComposePrefix + ".environment_file"
) )

View File

@ -2,6 +2,9 @@ package convert
import ( import (
"fmt" "fmt"
"strings"
"time"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose" "github.com/docker/helm-prototype/pkg/compose"
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
@ -9,8 +12,6 @@ import (
meta "k8s.io/apimachinery/pkg/apis/meta/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"strings"
"time"
) )
func MapToKubernetesObjects(model *compose.Project) (map[string]runtime.Object, error) { func MapToKubernetesObjects(model *compose.Project) (map[string]runtime.Object, error) {
@ -126,7 +127,6 @@ func mapToDaemonset(service types.ServiceConfig, model *compose.Project) (*apps.
}, nil }, nil
} }
func toReplicas(deploy *types.DeployConfig) *int32 { func toReplicas(deploy *types.DeployConfig) *int32 {
v := int32(1) v := int32(1)
if deploy != nil { if deploy != nil {

View File

@ -2,14 +2,15 @@ package convert
import ( import (
"fmt" "fmt"
"github.com/compose-spec/compose-go/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/helm-prototype/pkg/compose"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/compose-spec/compose-go/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/helm-prototype/pkg/compose"
"github.com/pkg/errors" "github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@ -31,14 +32,14 @@ func toPodTemplate(serviceConfig types.ServiceConfig, labels map[string]string,
return apiv1.PodTemplateSpec{}, err return apiv1.PodTemplateSpec{}, err
} }
var limits apiv1.ResourceList = nil var limits apiv1.ResourceList
if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Limits != nil { if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Limits != nil {
limits, err = toResource(serviceConfig.Deploy.Resources.Limits) limits, err = toResource(serviceConfig.Deploy.Resources.Limits)
if err != nil { if err != nil {
return apiv1.PodTemplateSpec{}, err return apiv1.PodTemplateSpec{}, err
} }
} }
var requests apiv1.ResourceList = nil var requests apiv1.ResourceList
if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Reservations != nil { if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Reservations != nil {
requests, err = toResource(serviceConfig.Deploy.Resources.Reservations) requests, err = toResource(serviceConfig.Deploy.Resources.Reservations)
if err != nil { if err != nil {

View File

@ -2,15 +2,16 @@ package convert
import ( import (
"fmt" "fmt"
"os"
"runtime"
"testing"
"github.com/compose-spec/compose-go/loader" "github.com/compose-spec/compose-go/loader"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose" "github.com/docker/helm-prototype/pkg/compose"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"os"
"runtime"
"testing"
) )
func loadYAML(yaml string) (*compose.Project, error) { func loadYAML(yaml string) (*compose.Project, error) {

View File

@ -2,12 +2,13 @@ package convert
import ( import (
"fmt" "fmt"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
"github.com/pkg/errors" "github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
) )

View File

@ -3,12 +3,13 @@ package helm
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"gopkg.in/yaml.v3"
"html/template" "html/template"
"io/ioutil" "io/ioutil"
"k8s.io/apimachinery/pkg/runtime"
"os" "os"
"path/filepath" "path/filepath"
"gopkg.in/yaml.v3"
"k8s.io/apimachinery/pkg/runtime"
) )
func Write(project string, objects map[string]runtime.Object, target string) error { func Write(project string, objects map[string]runtime.Object, target string) error {
@ -38,7 +39,6 @@ home:
var chartData bytes.Buffer var chartData bytes.Buffer
_ = t.Execute(&chartData, ChartDetails{project}) _ = t.Execute(&chartData, ChartDetails{project})
if err := out.Write("Chart.yaml", chartData.Bytes()); err != nil { if err := out.Write("Chart.yaml", chartData.Bytes()); err != nil {
return err return err
} }