change logger and add back pod manifest generation

blablacar · Oct 23, 2015 · afe545a · afe545a
1 parent 1bcbbe0
commit afe545a
Show file tree

Hide file tree

Showing 29 changed files with 306 additions and 364 deletions.
diff --git a/builder/aci-build.go b/builder/aci-build.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/dist"
-	"github.com/blablacar/cnt/log"
 	"github.com/blablacar/cnt/utils"
 	"io/ioutil"
 	"os"

diff --git a/builder/aci-clean.go b/builder/aci-clean.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"os"
 )
 

diff --git a/builder/aci-graph.go b/builder/aci-graph.go
@@ -2,7 +2,7 @@ package builder
 
 import (
 	"bytes"
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
 	"os"
 )

diff --git a/builder/aci-init.go b/builder/aci-init.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/utils"
 	"io/ioutil"
 	"os"

diff --git a/builder/aci-test.go b/builder/aci-test.go
@@ -1,9 +1,9 @@
 package builder
 
 import (
+	log "github.com/Sirupsen/logrus"
 	"github.com/appc/spec/schema/types"
 	"github.com/blablacar/cnt/dist"
-	"github.com/blablacar/cnt/log"
 	"github.com/blablacar/cnt/spec"
 	"github.com/blablacar/cnt/utils"
 	"io/ioutil"

diff --git a/builder/aci-update.go b/builder/aci-update.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"os"
 )
 

diff --git a/builder/aci.go b/builder/aci.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
+	log "github.com/Sirupsen/logrus"
 	"github.com/appc/spec/schema/types"
-	"github.com/blablacar/cnt/log"
 	"github.com/blablacar/cnt/spec"
 	"github.com/blablacar/cnt/utils"
 	"github.com/ghodss/yaml"

diff --git a/builder/pod-build.go b/builder/pod-build.go
@@ -2,16 +2,18 @@ package builder
 
 import (
 	"errors"
+	log "github.com/Sirupsen/logrus"
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
-	"github.com/blablacar/cnt/log"
 	"github.com/blablacar/cnt/spec"
 	"github.com/blablacar/cnt/utils"
 	"os"
 	"strconv"
 	"text/template"
 )
 
+const PATH_POD_MANIFEST = "/pod-manifest.json"
+
 func (p *Pod) Build() {
 	log.Info("Building POD : ", p.manifest.Name)
 
@@ -21,6 +23,7 @@ func (p *Pod) Build() {
 	apps := p.processAci()
 
 	p.writeSystemdUnit(apps)
+	p.writePodManifest(apps)
 }
 
 func (p *Pod) processAci() []schema.RuntimeApp {
@@ -84,19 +87,19 @@ func (p *Pod) buildAciIfNeeded(e spec.RuntimeApp) *spec.ACFullname {
 	return nil
 }
 
-//func (p *Pod) writePodManifest(apps []schema.RuntimeApp) {
-//	m := p.manifest.Pod
-//	ver, _ := types.NewSemVer("0.6.1")
-//	manifest := schema.PodManifest{
-//		ACKind:      "PodManifest",
-//		ACVersion:   *ver,
-//		Apps:        apps,
-//		Volumes:     m.Volumes,
-//		Isolators:   m.Isolators,
-//		Annotations: m.Annotations,
-//		Ports:       m.Ports}
-//	utils.WritePodManifest(&manifest, p.target+POD_TARGET_MANIFEST)
-//}
+func (p *Pod) writePodManifest(apps []schema.RuntimeApp) {
+	m := p.manifest.Pod
+	ver, _ := types.NewSemVer("0.6.1")
+	manifest := schema.PodManifest{
+		ACKind:      "PodManifest",
+		ACVersion:   *ver,
+		Apps:        apps,
+		Volumes:     m.Volumes,
+		Isolators:   m.Isolators,
+		Annotations: m.Annotations,
+		Ports:       m.Ports}
+	utils.WritePodManifest(&manifest, p.target+PATH_POD_MANIFEST)
+}
 
 const SYSTEMD_TEMPLATE = `[Unit]
 Description={{ .Shortname }} %i

diff --git a/builder/pod-clean.go b/builder/pod-clean.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"os"
 )
 

diff --git a/builder/pod-graph.go b/builder/pod-graph.go
@@ -2,7 +2,7 @@ package builder
 
 import (
 	"bytes"
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
 	"os"
 )

diff --git a/builder/pod-install.go b/builder/pod-install.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 )
 
 func (p *Pod) Install() {

diff --git a/builder/pod-push.go b/builder/pod-push.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/config"
-	"github.com/blablacar/cnt/log"
 	"github.com/blablacar/cnt/utils"
 )
 
@@ -26,6 +26,20 @@ func (p *Pod) Push() {
 		<-checkVersion
 	}
 
+	if err := utils.ExecCmd("curl", "-i",
+		"-F", "r=releases",
+		"-F", "hasPom=false",
+		"-F", "e=pod",
+		"-F", "g=com.blablacar.aci.linux.amd64",
+		"-F", "p=pod",
+		"-F", "v="+p.manifest.Name.Version(),
+		"-F", "a="+p.manifest.Name.ShortName(),
+		"-F", "file=@"+p.target+"/pod-manifest.json",
+		"-u", config.GetConfig().Push.Username+":"+config.GetConfig().Push.Password,
+		config.GetConfig().Push.Url+"/service/local/artifact/maven/content"); err != nil {
+		panic("Cannot push pod" + err.Error())
+	}
+
 	if err := utils.ExecCmd("curl", "-i",
 		"-F", "r=releases",
 		"-F", "hasPom=false",

diff --git a/builder/pod-test.go b/builder/pod-test.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 )
 
 func (p *Pod) Test() {

diff --git a/builder/pod.go b/builder/pod.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/spec"
 	"github.com/ghodss/yaml"
 	"io/ioutil"
@@ -50,7 +50,7 @@ func (p *Pod) readManifest(manifestPath string) {
 
 	//TODO check that there is no app name conflict
 
-	log.Trace("Pod manifest : ", p.manifest.Name, p.manifest)
+	log.Debug("Pod manifest : ", p.manifest.Name, p.manifest)
 }
 
 func (p *Pod) toAciManifest(e spec.RuntimeApp) spec.AciManifest {

diff --git a/commands/cnt.go b/commands/cnt.go
@@ -2,13 +2,14 @@ package commands
 
 import (
 	"bufio"
+	"fmt"
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/builder"
 	"github.com/blablacar/cnt/config"
-	"github.com/blablacar/cnt/log"
-	"github.com/blablacar/cnt/logger"
 	"github.com/blablacar/cnt/utils"
 	"github.com/coreos/go-semver/semver"
 	"github.com/spf13/cobra"
+	"os"
 	"strings"
 )
 
@@ -17,12 +18,23 @@ var buildArgs = builder.BuildArgs{}
 const RKT_SUPPORTED_VERSION = "0.8.1"
 
 func Execute() {
-	log.Logger = logger.NewLogger()
 	checkRktVersion()
 
-	var rootCmd = &cobra.Command{Use: "cnt"}
+	var logLevel string
+	var rootCmd = &cobra.Command{
+		Use: "cnt",
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			level, err := log.ParseLevel(logLevel)
+			if err != nil {
+				fmt.Printf("Unknown log level : %s", logLevel)
+				os.Exit(1)
+			}
+			log.SetLevel(level)
+		},
+	}
 	rootCmd.PersistentFlags().BoolVarP(&buildArgs.Clean, "clean", "c", false, "Clean before doing anything")
 	rootCmd.PersistentFlags().StringVarP(&buildArgs.TargetPath, "target-path", "p", "", "Set target path")
+	rootCmd.PersistentFlags().StringVarP(&logLevel, "loglevel", "L", "debug", "Set log level")
 
 	rootCmd.AddCommand(buildCmd, cleanCmd, pushCmd, installCmd, testCmd, versionCmd, initCmd, updateCmd, graphCmd)
 

diff --git a/config/config.go b/config/config.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/blablacar/cnt/log"
+	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/utils"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"

diff --git a/log/dummy-logger.go b/log/dummy-logger.go