LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up logrus

Browse Source 
Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
This commit is contained in:
Charlie Drage
2017-02-27 10:53:24 -05:00
parent 135165b39c
commit c0043ebd11
9 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/transformer/kubernetes/k8sutils.go
+10 -10
View File
@@ -28,7 +28,7 @@ import (
"strings"
"text/template"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml"
"github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer"
@@ -92,7 +92,7 @@ home:
t, err := template.New("ChartTmpl").Parse(chart)
if err != nil {
logrus.Fatalf("Failed to generate Chart.yaml template: %s\n", err)
log.Fatalf("Failed to generate Chart.yaml template: %s\n", err)
}
var chartData bytes.Buffer
_ = t.Execute(&chartData, details)
@@ -106,20 +106,20 @@ home:
/* Copy all related json/yaml files into the newly created manifests directory */
for _, filename := range outFiles {
if err = cpFileToChart(manifestDir, filename); err != nil {
logrus.Warningln(err)
log.Warningln(err)
}
if err = os.Remove(filename); err != nil {
logrus.Warningln(err)
log.Warningln(err)
}
}
logrus.Infof("chart created in %q\n", "."+string(os.PathSeparator)+dirName+string(os.PathSeparator))
log.Infof("chart created in %q\n", "."+string(os.PathSeparator)+dirName+string(os.PathSeparator))
return nil
}
func cpFileToChart(manifestDir, filename string) error {
infile, err := ioutil.ReadFile(filename)
if err != nil {
logrus.Warningf("Error reading %s: %s\n", filename, err)
log.Warningf("Error reading %s: %s\n", filename, err)
return err
}
@@ -139,7 +139,7 @@ func isDir(name string) bool {
// Get file attributes and information
fileStat, err := f.Stat()
if err != nil {
logrus.Fatalf("error retrieving file information: %v", err)
log.Fatalf("error retrieving file information: %v", err)
}
// Check if given path is a directory
@@ -259,7 +259,7 @@ func convertToVersion(obj runtime.Object, groupVersion unversioned.GroupVersion)
// PortsExist checks if service has ports defined
func (k *Kubernetes) PortsExist(name string, service kobject.ServiceConfig) bool {
if len(service.Port) == 0 {
logrus.Debugf("[%s] No ports defined. Headless service will be created.", name)
log.Debugf("[%s] No ports defined. Headless service will be created.", name)
return false
}
return true
@@ -360,7 +360,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
if service.User != "" {
uid, err := strconv.ParseInt(service.User, 10, 64)
if err != nil {
logrus.Warn("Ignoring user directive. User to be specified as a UID (numeric).")
log.Warn("Ignoring user directive. User to be specified as a UID (numeric).")
} else {
securityContext.RunAsUser = &uid
}
@@ -384,7 +384,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
case "on-failure":
template.Spec.RestartPolicy = api.RestartPolicyOnFailure
default:
logrus.Fatalf("Unknown restart policy %s for service %s", service.Restart, name)
log.Fatalf("Unknown restart policy %s for service %s", service.Restart, name)
}
}
pkg/transformer/kubernetes/kubernetes.go
+17 -17
View File
@@ -23,7 +23,7 @@ import (
"strconv"
"time"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/fatih/structs"
"github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer"
@@ -240,7 +240,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
func (k *Kubernetes) CreatePVC(name string, mode string) *api.PersistentVolumeClaim {
size, err := resource.ParseQuantity("100Mi")
if err != nil {
logrus.Fatalf("Error parsing size")
log.Fatalf("Error parsing size")
}
pvc := &api.PersistentVolumeClaim{
@@ -338,11 +338,11 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
volumeName, host, container, mode, err := transformer.ParseVolume(volume)
if err != nil {
logrus.Warningf("Failed to configure container volume: %v", err)
log.Warningf("Failed to configure container volume: %v", err)
continue
}
logrus.Debug("Volume name %s", volumeName)
log.Debug("Volume name %s", volumeName)
// check if ro/rw mode is defined, default rw
readonly := len(mode) > 0 && mode == "ro"
@@ -382,7 +382,7 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
volumes = append(volumes, vol)
if len(host) > 0 {
logrus.Warningf("Volume mount on the host %q isn't supported - ignoring path on the host", host)
log.Warningf("Volume mount on the host %q isn't supported - ignoring path on the host", host)
}
}
return volumeMounts, volumes, PVCs
@@ -456,7 +456,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
noSupKeys := k.CheckUnsupportedKey(&komposeObject, unsupportedKey)
for _, keyName := range noSupKeys {
logrus.Warningf("Kubernetes provider doesn't support %s key - ignoring", keyName)
log.Warningf("Kubernetes provider doesn't support %s key - ignoring", keyName)
}
// this will hold all the converted data
@@ -477,7 +477,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentFlag || opt.IsDaemonSetFlag || opt.IsReplicationControllerFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
log.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
}
pod := k.InitPod(name, service)
objects = append(objects, pod)
@@ -581,31 +581,31 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con
if err != nil {
return err
}
logrus.Infof("Successfully created Deployment: %s", t.Name)
log.Infof("Successfully created Deployment: %s", t.Name)
case *api.Service:
_, err := client.Services(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Service: %s", t.Name)
log.Infof("Successfully created Service: %s", t.Name)
case *api.PersistentVolumeClaim:
_, err := client.PersistentVolumeClaims(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
case *extensions.Ingress:
_, err := client.Ingress(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Ingress: %s", t.Name)
log.Infof("Successfully created Ingress: %s", t.Name)
case *api.Pod:
_, err := client.Pods(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Pod: %s", t.Name)
log.Infof("Successfully created Pod: %s", t.Name)
}
}
@@ -642,7 +642,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil {
return err
}
logrus.Infof("Successfully deleted Deployment: %s", t.Name)
log.Infof("Successfully deleted Deployment: %s", t.Name)
case *api.Service:
//delete svc
@@ -655,7 +655,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil {
return err
}
logrus.Infof("Successfully deleted Service: %s", t.Name)
log.Infof("Successfully deleted Service: %s", t.Name)
case *api.PersistentVolumeClaim:
// delete pvc
@@ -663,7 +663,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil {
return err
}
logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
case *extensions.Ingress:
// delete ingress
@@ -677,7 +677,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil {
return err
}
logrus.Infof("Successfully deleted Ingress: %s", t.Name)
log.Infof("Successfully deleted Ingress: %s", t.Name)
case *api.Pod:
rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), client)
@@ -689,7 +689,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil {
return err
}
logrus.Infof("Successfully deleted Pod: %s", t.Name)
log.Infof("Successfully deleted Pod: %s", t.Name)
}
}
return nil
pkg/transformer/openshift/openshift.go
+24 -24
View File
@@ -26,7 +26,7 @@ import (
"github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"k8s.io/kubernetes/pkg/api"
kapi "k8s.io/kubernetes/pkg/api"
@@ -173,7 +173,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig)
func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir string, repo string, branch string) *buildapi.BuildConfig {
contextDir, err := getAbsBuildContext(service.Build, composeFileDir)
if err != nil {
logrus.Fatalf("[%s] Buildconfig cannot be created due to error in creating build context.", name)
log.Fatalf("[%s] Buildconfig cannot be created due to error in creating build context.", name)
}
bc := &buildapi.BuildConfig{
@@ -298,7 +298,7 @@ func (o *OpenShift) initRoute(name string, service kobject.ServiceConfig, port i
func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object {
noSupKeys := o.Kubernetes.CheckUnsupportedKey(&komposeObject, unsupportedKey)
for _, keyName := range noSupKeys {
logrus.Warningf("OpenShift provider doesn't support %s key - ignoring", keyName)
log.Warningf("OpenShift provider doesn't support %s key - ignoring", keyName)
}
// this will hold all the converted data
var allobjects []runtime.Object
@@ -315,7 +315,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentConfigFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
log.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
}
pod := o.InitPod(name, service)
objects = append(objects, pod)
@@ -333,25 +333,25 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
if !hasBuild {
composeFileDir, err = getComposeFileDir(opt.InputFiles)
if err != nil {
logrus.Warningf("Error in detecting compose file's directory.")
log.Warningf("Error in detecting compose file's directory.")
continue
}
if !hasGitBinary() && (buildRepo == "" || buildBranch == "") {
logrus.Fatalf("Git is not installed! Please install Git to create buildconfig, else supply source repository and branch to use for build using '--build-repo', '--build-branch' options respectively")
log.Fatalf("Git is not installed! Please install Git to create buildconfig, else supply source repository and branch to use for build using '--build-repo', '--build-branch' options respectively")
}
if buildBranch == "" {
buildBranch, err = getGitCurrentBranch(composeFileDir)
if err != nil {
logrus.Fatalf("Buildconfig cannot be created because current git branch couldn't be detected.")
log.Fatalf("Buildconfig cannot be created because current git branch couldn't be detected.")
}
}
if opt.BuildRepo == "" {
if err != nil {
logrus.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.")
log.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.")
}
buildRepo, err = getGitCurrentRemoteURL(composeFileDir)
if err != nil {
logrus.Fatalf("Buildconfig cannot be created because git remote origin repo couldn't be detected.")
log.Fatalf("Buildconfig cannot be created because git remote origin repo couldn't be detected.")
}
}
hasBuild = true
@@ -378,7 +378,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
}
if hasBuild {
logrus.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch)
log.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch)
}
// If docker-compose has a volumes_from directive it will be handled here
o.VolumesFrom(&allobjects, komposeObject)
@@ -427,43 +427,43 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
if err != nil {
return err
}
logrus.Infof("Successfully created ImageStream: %s", t.Name)
log.Infof("Successfully created ImageStream: %s", t.Name)
case *buildapi.BuildConfig:
_, err := oclient.BuildConfigs(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created BuildConfig: %s", t.Name)
log.Infof("Successfully created BuildConfig: %s", t.Name)
case *deployapi.DeploymentConfig:
_, err := oclient.DeploymentConfigs(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created DeploymentConfig: %s", t.Name)
log.Infof("Successfully created DeploymentConfig: %s", t.Name)
case *api.Service:
_, err := kclient.Services(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Service: %s", t.Name)
log.Infof("Successfully created Service: %s", t.Name)
case *api.PersistentVolumeClaim:
_, err := kclient.PersistentVolumeClaims(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
case *routeapi.Route:
_, err := oclient.Routes(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Route: %s", t.Name)
log.Infof("Successfully created Route: %s", t.Name)
case *api.Pod:
_, err := kclient.Pods(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Pod: %s", t.Name)
log.Infof("Successfully created Pod: %s", t.Name)
}
}
@@ -499,14 +499,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted ImageStream: %s", t.Name)
log.Infof("Successfully deleted ImageStream: %s", t.Name)
case *buildapi.BuildConfig:
err := oclient.BuildConfigs(namespace).Delete(t.Name)
if err != nil {
return err
}
logrus.Infof("Successfully deleted BuildConfig: %s", t.Name)
log.Infof("Successfully deleted BuildConfig: %s", t.Name)
case *deployapi.DeploymentConfig:
// delete deploymentConfig
@@ -515,7 +515,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted DeploymentConfig: %s", t.Name)
log.Infof("Successfully deleted DeploymentConfig: %s", t.Name)
case *api.Service:
//delete svc
@@ -528,7 +528,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted Service: %s", t.Name)
log.Infof("Successfully deleted Service: %s", t.Name)
case *api.PersistentVolumeClaim:
// delete pvc
@@ -536,7 +536,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
case *routeapi.Route:
// delete route
@@ -544,7 +544,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted Route: %s", t.Name)
log.Infof("Successfully deleted Route: %s", t.Name)
case *api.Pod:
rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), kclient)
@@ -556,7 +556,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil {
return err
}
logrus.Infof("Successfully deleted Pod: %s", t.Name)
log.Infof("Successfully deleted Pod: %s", t.Name)
}
}
return nil
pkg/transformer/utils.go
+7 -7
View File
@@ -24,7 +24,7 @@ import (
"os"
"strings"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml"
"github.com/kubernetes-incubator/kompose/pkg/kobject"
@@ -53,7 +53,7 @@ func CreateOutFile(out string) *os.File {
if len(out) != 0 {
f, err = os.Create(out)
if err != nil {
logrus.Fatalf("error creating file: %v", err)
log.Fatalf("error creating file: %v", err)
}
}
return f
@@ -88,7 +88,7 @@ func ParseVolume(volume string) (name, host, container, mode string, err error)
// See https://github.com/kubernetes-incubator/kompose/issues/176
// Otherwise, check to see if "rw" or "ro" has been passed
if possibleAccessMode == "z" || possibleAccessMode == "Z" {
logrus.Warnf("Volume mount \"%s\" will be mounted without labeling support. :z or :Z not supported", volume)
log.Warnf("Volume mount \"%s\" will be mounted without labeling support. :z or :Z not supported", volume)
mode = ""
volumeStrings = volumeStrings[:len(volumeStrings)-1]
} else if possibleAccessMode == "rw" || possibleAccessMode == "ro" {
@@ -146,7 +146,7 @@ func TransformData(obj runtime.Object, GenerateJSON bool) ([]byte, error) {
if err != nil {
return nil, err
}
logrus.Debugf("%s\n", data)
log.Debugf("%s\n", data)
return data, nil
}
@@ -164,16 +164,16 @@ func Print(name, path string, trailing string, data []byte, toStdout, generateJS
} else if f != nil {
// Write all content to a single file f
if _, err := f.WriteString(fmt.Sprintf("%s\n", string(data))); err != nil {
logrus.Fatalf("Failed to write %s to file: %v", trailing, err)
log.Fatalf("Failed to write %s to file: %v", trailing, err)
}
f.Sync()
} else {
// Write content separately to each file
file = filepath.Join(path, file)
if err := ioutil.WriteFile(file, []byte(data), 0644); err != nil {
logrus.Fatalf("Failed to write %s: %v", trailing, err)
log.Fatalf("Failed to write %s: %v", trailing, err)
}
logrus.Printf("file %q created", file)
log.Printf("file %q created", file)
}
return file
}