support log-formatter (#143)

* support log-formatter

Author: oren-codefresh

README.md

@@ -11,14 +11,15 @@ Meanwhile 1.x.x is to release and makred as pre-release we will maintain 2 branc
 * `release-1.0` it the new release, which will be used when running Codefresh CLI to install the agent
 We highly suggest to use [Codefresh official CLI](https://codefresh-io.github.io/cli/) to install the agent:
 ```bash
-kubectl create namespace codefresh
-codefresh install agent --kube-namespace codefresh --install-runtime
+codefresh runner init
 ```
 
 The last command will:  
-1. Install the agent on the namespace `codefresh`
+1. Install the agent on the namespace `codefresh` (as you choose)
 2. Install the runtime on the same namespace
 3. Attach the runtime to the agent
+4. Register cluster on codefresh platform
+5. Create and run demo pipeline
 
 It is still possible, for advanced users to install all manually, for example:
 One process of Venona can manage multiple runtime environments
@@ -57,19 +58,9 @@ codefresh attach runtime --agent-name $AGENT_NAME --agent-kube-namespace codefre
 ```
 
 ## Migration
-Migrating from Venona `< 1.x.x` to `> 1.x.x` is not done automatically, please use the [migration script](https://github.com/codefresh-io/venona/blob/release-1.0/scripts/migration.sh) to do that, check out which environment variables are required to run it.
+Migrating from Venona `< 1.x.x` to `> 1.x.x` is not done automatically, please run the follwing
 ```bash
-# This script comes to migrate old versions of Venona installation ( version < 1.x.x ) to new version (version >= 1.0.0 )
-# Please read carefully what the script does.
-# There will be a "downtime" in terms of your builds targeted to this runtime environment
-# Once the script is finished, all the builds during the downtime will start
-# The script will:
-# 1. Create new agent entity in Codefresh using Codefresh CLI - give it a name $CODEFRESH_AGENT_NAME, default is "codefresh"
-# 2. Install the agent on you cluster pass variables:
-#   a. $VENONA_KUBE_NAMESPACE - required 
-#   b. $VENONA_KUBE_CONTEXT - default is current-context
-#   c. $VENONA_KUBECONFIG_PATH - default is $HOME/.kube/config
-# 3. Attach runtime to the new agent (downtime ends) - pass $CODEFRESH_RUNTIME_NAME - required
+codefresh runner upgrade
 ```
 
 

package.json

@@ -1,6 +1,7 @@
 {
   "name": "venona",
-  "version": "1.3.0",
+  "version": "1.3.1",
+
   "description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
   "main": "index.js",
   "scripts": {

venonactl/VERSION

@@ -1 +1,2 @@
-1.3.0
+1.3.1
+

venonactl/cmd/attach.go

@@ -46,7 +46,7 @@ var attachRuntimeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 
 		s := store.GetStore()
-		lgr := createLogger("Attach-runtime", verbose)
+		lgr := createLogger("Attach-runtime", verbose, logFormatter)
 		buildBasicStore(lgr)
 		extendStoreWithKubeClient(lgr)
 

venonactl/cmd/cmdutils.go

@@ -33,7 +33,8 @@ var (
 	commit  = "none"
 	date    = "unknown"
 
-	verbose bool
+	verbose      bool
+	logFormatter string
 
 	configPath string
 	cfAPIHost  string
@@ -153,13 +154,14 @@ func getKubeClientBuilder(context string, namespace string, path string, inClust
 	})
 }
 
-func createLogger(command string, verbose bool) logger.Logger {
+func createLogger(command string, verbose bool, logFormatter string) logger.Logger {
 	logFile := "venonalog.json"
 	os.Remove(logFile)
 	return logger.New(&logger.Options{
-		Command:   command,
-		Verbose:   verbose,
-		LogToFile: logFile,
+		Command:      command,
+		Verbose:      verbose,
+		LogToFile:    logFile,
+		LogFormatter: logFormatter,
 	})
 }
 

venonactl/cmd/install-agent.go

@@ -48,7 +48,7 @@ var installAgentCmd = &cobra.Command{
 	Short: "Install Codefresh's agent ",
 	Run: func(cmd *cobra.Command, args []string) {
 		s := store.GetStore()
-		lgr := createLogger("Install-agent", verbose)
+		lgr := createLogger("Install-agent", verbose, logFormatter)
 		buildBasicStore(lgr)
 		extendStoreWithAgentAPI(lgr, installAgentCmdOptions.agentToken, installAgentCmdOptions.agentID)
 		extendStoreWithKubeClient(lgr)

venonactl/cmd/install-monitor.go

@@ -44,7 +44,7 @@ var installMonitorAgentCmd = &cobra.Command{
 
 		s := store.GetStore()
 
-		lgr := createLogger("Install-monitor-agent", verbose)
+		lgr := createLogger("Install-monitor-agent", verbose, logFormatter)
 		buildBasicStore(lgr)
 		extendStoreWithKubeClient(lgr)
 		fillKubernetesAPI(lgr, installMonitorAgentCmdOptions.kube.context, installMonitorAgentCmdOptions.kube.namespace, false)

venonactl/cmd/install-runtime.go

@@ -48,7 +48,7 @@ var installRuntimeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 
 		s := store.GetStore()
-		lgr := createLogger("Install-runtime", verbose)
+		lgr := createLogger("Install-runtime", verbose, logFormatter)
 		buildBasicStore(lgr)
 		extendStoreWithAgentAPI(lgr, installRuntimeCmdOptions.codefreshToken, "")
 		extendStoreWithKubeClient(lgr)

venonactl/cmd/migrate.go

@@ -35,7 +35,7 @@ var migrateCmd = &cobra.Command{
 	Use:   "migrate",
 	Short: "Migrate existing runtime-environment from 0.X to 1.X version",
 	Run: func(cmd *cobra.Command, args []string) {
-		lgr := createLogger("Migrate", verbose)
+		lgr := createLogger("Migrate", verbose, logFormatter)
 		builder := plugins.NewBuilder(lgr)
 		builder.Add(plugins.VenonaPluginType)
 		s := store.GetStore()

venonactl/cmd/root.go

@@ -49,5 +49,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&kubeConfigPath, "kube-config-path", viper.GetString("kubeconfig"), "Path to kubeconfig file (default is $HOME/.kube/config) [$KUBECONFIG]")
 
 	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "Print logs")
+	rootCmd.PersistentFlags().StringVar(&logFormatter, "log-formtter", "Plain", "Print logs in custom format")
 
 }