[installer] Switch default log level to info

aledbf · roboquat · commit 92a9fd5fb04c · 2022-01-19T09:57:11.000+01:00
diff --git a/installer/cmd/mirror_list.go b/installer/cmd/mirror_list.go
@@ -5,7 +5,6 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"regexp"
@@ -123,7 +122,7 @@ image to the "target" repo`,
 			return scoreI < scoreJ
 		})
 
-		fc, err := json.MarshalIndent(images, "", "  ")
+		fc, err := common.ToJSONString(images)
 		if err != nil {
 			return err
 		}
diff --git a/installer/cmd/validate-cluster.go b/installer/cmd/validate-cluster.go
@@ -6,11 +6,11 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/cluster"
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/pkg/config"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/rest"
@@ -70,7 +70,7 @@ var validateClusterCmd = &cobra.Command{
 			result.Items = append(result.Items, res.Items...)
 		}
 
-		jsonOut, err := json.MarshalIndent(result, "", "  ")
+		jsonOut, err := common.ToJSONString(result)
 		if err != nil {
 			return err
 		}
diff --git a/installer/cmd/version.go b/installer/cmd/version.go
@@ -6,11 +6,11 @@ package cmd
 
 import (
 	"debug/elf"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
 
+	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	"github.com/gitpod-io/gitpod/installer/pkg/config/versions"
 	"sigs.k8s.io/yaml"
 
@@ -27,7 +27,7 @@ var versionCmd = &cobra.Command{
 			return err
 		}
 
-		versions, err := json.MarshalIndent(versionMF, "", "  ")
+		versions, err := common.ToJSONString(versionMF)
 		if err != nil {
 			return err
 		}
diff --git a/installer/pkg/common/common.go b/installer/pkg/common/common.go
@@ -6,6 +6,7 @@ package common
 
 import (
 	"crypto/sha256"
+	"encoding/json"
 	"fmt"
 	"io"
 	"math/rand"
@@ -42,7 +43,7 @@ func MergeEnv(envs ...[]corev1.EnvVar) (res []corev1.EnvVar) {
 }
 
 func DefaultEnv(cfg *config.Config) []corev1.EnvVar {
-	logLevel := "debug"
+	logLevel := "info"
 	if cfg.Observability.LogLevel != "" {
 		logLevel = string(cfg.Observability.LogLevel)
 	}
@@ -527,3 +528,8 @@ func ThirdPartyContainerRepo(configRegistry string, thirdPartyRegistry string) s
 
 	return configRegistry
 }
+
+// ToJSONString returns the serialized JSON string of an object
+func ToJSONString(input interface{}) ([]byte, error) {
+	return json.MarshalIndent(input, "", "  ")
+}
diff --git a/installer/pkg/components/agent-smith/configmap.go b/installer/pkg/components/agent-smith/configmap.go
@@ -6,7 +6,6 @@ package agentsmith
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -53,7 +52,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	}
 
-	fc, err := json.MarshalIndent(ascfg, "", " ")
+	fc, err := common.ToJSONString(ascfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal agent-smith config: %w", err)
 	}
diff --git a/installer/pkg/components/blobserve/configmap.go b/installer/pkg/components/blobserve/configmap.go
@@ -5,7 +5,6 @@
 package blobserve
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -84,7 +83,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		PrometheusAddr: "127.0.0.1:9500",
 	}
 
-	fc, err := json.MarshalIndent(bscfg, "", " ")
+	fc, err := common.ToJSONString(bscfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal blobserve config: %w", err)
 	}
diff --git a/installer/pkg/components/content-service/configmap.go b/installer/pkg/components/content-service/configmap.go
@@ -5,7 +5,6 @@
 package content_service
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/content-service/api/config"
@@ -30,7 +29,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		Storage: common.StorageConfig(ctx),
 	}
 
-	fc, err := json.MarshalIndent(cscfg, "", " ")
+	fc, err := common.ToJSONString(cscfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal content-service config: %w", err)
 	}
diff --git a/installer/pkg/components/database/incluster/secret.go b/installer/pkg/components/database/incluster/secret.go
@@ -5,8 +5,8 @@
 package incluster
 
 import (
-	"encoding/json"
 	"fmt"
+
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -26,12 +26,12 @@ func secrets(ctx *common.RenderContext) ([]runtime.Object, error) {
 	rootPassword := "PHejMfsLvfLcG1Drs40h"
 	password := "jBzVMe2w4Yi7GagadsyB"
 
-	encryptionKeys, err := json.MarshalIndent([]EncryptionKey{{
+	encryptionKeys, err := common.ToJSONString([]EncryptionKey{{
 		Name:     "general",
 		Version:  1,
 		Primary:  true,
 		Material: "4uGh1q8y2DYryJwrVMHs0kWXJlqvHWWt/KJuNi04edI=",
-	}}, "", "  ")
+	}})
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal mysql encryptionKeys: %w", err)
 	}
diff --git a/installer/pkg/components/gitpod/configmap.go b/installer/pkg/components/gitpod/configmap.go
@@ -5,7 +5,6 @@
 package gitpod
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -25,7 +24,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		VersionManifest: ctx.VersionManifest,
 	}
 
-	fc, err := json.MarshalIndent(gpcfg, "", " ")
+	fc, err := common.ToJSONString(gpcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal Gitpod config: %w", err)
 	}
diff --git a/installer/pkg/components/image-builder-mk3/configmap.go b/installer/pkg/components/image-builder-mk3/configmap.go
@@ -5,7 +5,6 @@
 package image_builder_mk3
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -73,7 +72,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		},
 	}
 
-	fc, err := json.MarshalIndent(imgcfg, "", " ")
+	fc, err := common.ToJSONString(imgcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal image-builder-mk3 config: %w", err)
 	}
diff --git a/installer/pkg/components/openvsx-proxy/configmap.go b/installer/pkg/components/openvsx-proxy/configmap.go
@@ -5,15 +5,15 @@
 package openvsx_proxy
 
 import (
-	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/gitpod-io/gitpod/common-go/util"
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
 	openvsx "github.com/gitpod-io/gitpod/openvsx-proxy/pkg"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"time"
 )
 
 func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
@@ -29,7 +29,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		PrometheusAddr:       fmt.Sprintf(":%d", PrometheusPort),
 	}
 
-	fc, err := json.MarshalIndent(imgcfg, "", " ")
+	fc, err := common.ToJSONString(imgcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal openvsx config: %w", err)
 	}
diff --git a/installer/pkg/components/registry-facade/configmap.go b/installer/pkg/components/registry-facade/configmap.go
@@ -5,7 +5,6 @@
 package registryfacade
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -60,7 +59,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		PrometheusAddr: "127.0.0.1:9500",
 	}
 
-	fc, err := json.MarshalIndent(rfcfg, "", " ")
+	fc, err := common.ToJSONString(rfcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal registry-facade config: %w", err)
 	}
diff --git a/installer/pkg/components/server/configmap.go b/installer/pkg/components/server/configmap.go
@@ -5,7 +5,6 @@
 package server
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -102,7 +101,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		ChargebeeProviderOptionsFile: "/chargebee/providerOptions",
 	}
 
-	fc, err := json.MarshalIndent(scfg, "", " ")
+	fc, err := common.ToJSONString(scfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal server config: %w", err)
 	}
diff --git a/installer/pkg/components/server/deployment.go b/installer/pkg/components/server/deployment.go
@@ -6,7 +6,6 @@ package server
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/cluster"
@@ -32,7 +31,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) {
 	}
 
 	// Convert to a JSON string
-	fc, err := json.MarshalIndent(wsmanagerbridge.WSManagerList(), "", " ")
+	fc, err := common.ToJSONString(wsmanagerbridge.WSManagerList())
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal server.WorkspaceManagerList config: %w", err)
 	}
diff --git a/installer/pkg/components/server/ide/configmap.go b/installer/pkg/components/server/ide/configmap.go
@@ -5,7 +5,6 @@
 package ide
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -107,7 +106,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		return nil, fmt.Errorf("default desktop IDE '%s' does not point to a desktop IDE option", idecfg.IDEOptions.DefaultIDE)
 	}
 
-	fc, err := json.MarshalIndent(idecfg, "", " ")
+	fc, err := common.ToJSONString(idecfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal server-ide-config config: %w", err)
 	}
diff --git a/installer/pkg/components/ws-daemon/configmap.go b/installer/pkg/components/ws-daemon/configmap.go
@@ -5,7 +5,6 @@
 package wsdaemon
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -137,7 +136,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 			Addr: "localhost:6060",
 		},
 	}
-	fc, err := json.MarshalIndent(wsdcfg, "", " ")
+	fc, err := common.ToJSONString(wsdcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal ws-daemon config: %w", err)
 	}
diff --git a/installer/pkg/components/ws-manager-bridge/configmap.go b/installer/pkg/components/ws-manager-bridge/configmap.go
@@ -5,7 +5,6 @@
 package wsmanagerbridge
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -34,7 +33,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		StaticBridges: WSManagerList(),
 	}
 
-	fc, err := json.MarshalIndent(wsmbcfg, "", " ")
+	fc, err := common.ToJSONString(wsmbcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal ws-manager-bridge config: %w", err)
 	}
diff --git a/installer/pkg/components/ws-manager/configmap.go b/installer/pkg/components/ws-manager/configmap.go
@@ -5,7 +5,6 @@
 package wsmanager
 
 import (
-	"encoding/json"
 	"fmt"
 	"path/filepath"
 	"time"
@@ -130,7 +129,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		}{Addr: "127.0.0.1:9500"},
 	}
 
-	fc, err := json.MarshalIndent(wsmcfg, "", " ")
+	fc, err := common.ToJSONString(wsmcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal ws-manager config: %w", err)
 	}
diff --git a/installer/pkg/components/ws-proxy/configmap.go b/installer/pkg/components/ws-proxy/configmap.go
@@ -5,7 +5,6 @@
 package wsproxy
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -68,7 +67,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		ReadinessProbeAddr: ":60088",
 	}
 
-	fc, err := json.MarshalIndent(wspcfg, "", " ")
+	fc, err := common.ToJSONString(wspcfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal ws-proxy config: %w", err)
 	}
diff --git a/installer/pkg/components/ws-scheduler/configmap.go b/installer/pkg/components/ws-scheduler/configmap.go
@@ -5,7 +5,6 @@
 package wsscheduler
 
 import (
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -124,7 +123,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		}{Addr: "127.0.0.1:9500"},
 	}
 
-	fc, err := json.MarshalIndent(wsscfg, "", " ")
+	fc, err := common.ToJSONString(wsscfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal ws-proxy config: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package agentsmith`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"encoding/base64"`
`9`		`- "encoding/json"`
`10`	`9`	`"fmt"`
`11`	`10`	`"time"`
`12`	`11`
`@@ -53,7 +52,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {`
`53`	`52`	`},`
`54`	`53`	`}`
`55`	`54`
`56`		`- fc, err := json.MarshalIndent(ascfg, "", " ")`
	`55`	`+ fc, err := common.ToJSONString(ascfg)`
`57`	`56`	`if err != nil {`
`58`	`57`	`return nil, fmt.Errorf("failed to marshal agent-smith config: %w", err)`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package blobserve`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "encoding/json"`
`9`	`8`	`"fmt"`
`10`	`9`	`"time"`
`11`	`10`
`@@ -84,7 +83,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {`
`84`	`83`	`PrometheusAddr: "127.0.0.1:9500",`
`85`	`84`	`}`
`86`	`85`
`87`		`- fc, err := json.MarshalIndent(bscfg, "", " ")`
	`86`	`+ fc, err := common.ToJSONString(bscfg)`
`88`	`87`	`if err != nil {`
`89`	`88`	`return nil, fmt.Errorf("failed to marshal blobserve config: %w", err)`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package content_service`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "encoding/json"`
`9`	`8`	`"fmt"`
`10`	`9`
`11`	`10`	`"github.com/gitpod-io/gitpod/content-service/api/config"`
`@@ -30,7 +29,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {`
`30`	`29`	`Storage: common.StorageConfig(ctx),`
`31`	`30`	`}`
`32`	`31`
`33`		`- fc, err := json.MarshalIndent(cscfg, "", " ")`
	`32`	`+ fc, err := common.ToJSONString(cscfg)`
`34`	`33`	`if err != nil {`
`35`	`34`	`return nil, fmt.Errorf("failed to marshal content-service config: %w", err)`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package gitpod`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "encoding/json"`
`9`	`8`	`"fmt"`
`10`	`9`
`11`	`10`	`"github.com/gitpod-io/gitpod/installer/pkg/common"`
`@@ -25,7 +24,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {`
`25`	`24`	`VersionManifest: ctx.VersionManifest,`
`26`	`25`	`}`
`27`	`26`
`28`		`- fc, err := json.MarshalIndent(gpcfg, "", " ")`
	`27`	`+ fc, err := common.ToJSONString(gpcfg)`
`29`	`28`	`if err != nil {`
`30`	`29`	`return nil, fmt.Errorf("failed to marshal Gitpod config: %w", err)`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`package image_builder_mk3`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "encoding/json"`
`9`	`8`	`"fmt"`
`10`	`9`	`"strings"`
`11`	`10`	`"time"`
`@@ -73,7 +72,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {`
`73`	`72`	`},`
`74`	`73`	`}`
`75`	`74`
`76`		`- fc, err := json.MarshalIndent(imgcfg, "", " ")`
	`75`	`+ fc, err := common.ToJSONString(imgcfg)`
`77`	`76`	`if err != nil {`
`78`	`77`	`return nil, fmt.Errorf("failed to marshal image-builder-mk3 config: %w", err)`
`79`	`78`	`}`