Merge pull request openshift#741 from tbrisker/simplelogger

Simplify logger package
rendhalver · Jun 16, 2022 · 35af8a3 · 35af8a3
2 parents be42f6a + dfb62f1
commit 35af8a3
Show file tree

Hide file tree

Showing 73 changed files with 78 additions and 120 deletions.
diff --git a/cmd/create/accountroles/cmd.go b/cmd/create/accountroles/cmd.go
@@ -80,7 +80,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	mode, err := aws.GetMode()
 	if err != nil {

diff --git a/cmd/create/admin/cmd.go b/cmd/create/admin/cmd.go
@@ -62,7 +62,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/create/cluster/cmd.go b/cmd/create/cluster/cmd.go
@@ -489,7 +489,7 @@ func networkTypeCompletion(cmd *cobra.Command, args []string, toComplete string)
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 	var err error
 
 	// Create the client for the OCM API:

diff --git a/cmd/create/idp/cmd.go b/cmd/create/idp/cmd.go
@@ -293,7 +293,7 @@ func init() {
 
 	interactive.AddFlag(flags)
 	reporter = rprtr.CreateReporterOrExit()
-	logger = logging.CreateLoggerOrExit(reporter)
+	logger = logging.NewLogger()
 }
 
 func run(cmd *cobra.Command, _ []string) {

diff --git a/cmd/create/ingress/cmd.go b/cmd/create/ingress/cmd.go
@@ -77,7 +77,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/create/machinepool/cmd.go b/cmd/create/machinepool/cmd.go
@@ -172,7 +172,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/create/ocmrole/cmd.go b/cmd/create/ocmrole/cmd.go
@@ -85,7 +85,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	mode, err := aws.GetMode()
 	if err != nil {

diff --git a/cmd/create/oidcprovider/cmd.go b/cmd/create/oidcprovider/cmd.go
@@ -61,7 +61,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Allow the command to be called programmatically
 	skipInteractive := false

diff --git a/cmd/create/operatorroles/cmd.go b/cmd/create/operatorroles/cmd.go
@@ -81,7 +81,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Allow the command to be called programmatically
 	skipInteractive := false

diff --git a/cmd/create/service/cmd.go b/cmd/create/service/cmd.go
@@ -138,7 +138,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if args.ServiceType == "" {
 		reporter.Errorf("Service type not specified.")

diff --git a/cmd/create/userrole/cmd.go b/cmd/create/userrole/cmd.go
@@ -77,7 +77,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	mode, err := aws.GetMode()
 	if err != nil {

diff --git a/cmd/describe/addon/cmd.go b/cmd/describe/addon/cmd.go
@@ -49,7 +49,7 @@ var Cmd = &cobra.Command{
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Create the client for the OCM API:
 	ocmClient, err := ocm.NewClient().

diff --git a/cmd/describe/admin/cmd.go b/cmd/describe/admin/cmd.go
@@ -44,7 +44,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/describe/cluster/cmd.go b/cmd/describe/cluster/cmd.go
@@ -55,7 +55,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	var clusterKey string
 	var err error

diff --git a/cmd/describe/installation/cmd.go b/cmd/describe/installation/cmd.go
@@ -65,7 +65,7 @@ func init() {
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if args.clusterKey == "" {
 		reporter.Errorf(

diff --git a/cmd/describe/service/cmd.go b/cmd/describe/service/cmd.go
@@ -53,7 +53,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if args.ID == "" {
 		reporter.Errorf("id not specified.")

diff --git a/cmd/dlt/accountroles/cmd.go b/cmd/dlt/accountroles/cmd.go
@@ -63,7 +63,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Determine if interactive mode is needed (if a prefix is not provided, fallback to interactive mode)
 	if !interactive.Enabled() && !cmd.Flags().Changed("mode") || args.prefix == "" {

diff --git a/cmd/dlt/admin/cmd.go b/cmd/dlt/admin/cmd.go
@@ -45,7 +45,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/dlt/cluster/cmd.go b/cmd/dlt/cluster/cmd.go
@@ -63,7 +63,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/dlt/idp/cmd.go b/cmd/dlt/idp/cmd.go
@@ -55,7 +55,7 @@ func init() {
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	idpName := argv[0]
 

diff --git a/cmd/dlt/ingress/cmd.go b/cmd/dlt/ingress/cmd.go
@@ -62,7 +62,7 @@ func init() {
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	ingressID := argv[0]
 	if !ingressKeyRE.MatchString(ingressID) {

diff --git a/cmd/dlt/machinepool/cmd.go b/cmd/dlt/machinepool/cmd.go
@@ -59,7 +59,7 @@ func init() {
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	machinePoolID := argv[0]
 	if machinePoolID != "Default" && !machinePoolKeyRE.MatchString(machinePoolID) {

diff --git a/cmd/dlt/ocmrole/cmd.go b/cmd/dlt/ocmrole/cmd.go
@@ -66,7 +66,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) error {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 	awsClient := aws.CreateNewClientOrExit(logger, reporter)
 	ocmClient := ocm.CreateNewClientOrExit(logger, reporter)
 	defer func() {

diff --git a/cmd/dlt/oidcprovider/cmd.go b/cmd/dlt/oidcprovider/cmd.go
@@ -19,6 +19,8 @@ package oidcprovider
 import (
 	"fmt"
 
+	"os"
+
 	"github.com/openshift/rosa/pkg/aws"
 	"github.com/openshift/rosa/pkg/interactive"
 	"github.com/openshift/rosa/pkg/interactive/confirm"
@@ -27,7 +29,6 @@ import (
 	rprtr "github.com/openshift/rosa/pkg/reporter"
 	"github.com/spf13/cobra"
 	errors "github.com/zgalor/weberr"
-	"os"
 )
 
 var Cmd = &cobra.Command{
@@ -50,7 +51,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 	if len(argv) == 1 && !cmd.Flag("cluster").Changed {
 		ocm.SetClusterKey(argv[0])
 	}

diff --git a/cmd/dlt/operatorrole/cmd.go b/cmd/dlt/operatorrole/cmd.go
@@ -65,7 +65,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if len(argv) == 1 && !cmd.Flag("cluster").Changed {
 		args.clusterKey = argv[0]

diff --git a/cmd/dlt/service/cmd.go b/cmd/dlt/service/cmd.go
@@ -57,7 +57,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if args.ID == "" {
 		reporter.Errorf("id not specified.")

diff --git a/cmd/dlt/upgrade/cmd.go b/cmd/dlt/upgrade/cmd.go
@@ -43,7 +43,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/dlt/userrole/cmd.go b/cmd/dlt/userrole/cmd.go
@@ -65,7 +65,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 	awsClient := aws.CreateNewClientOrExit(logger, reporter)
 	ocmClient := ocm.CreateNewClientOrExit(logger, reporter)
 	defer func() {

diff --git a/cmd/edit/addon/cmd.go b/cmd/edit/addon/cmd.go
@@ -63,7 +63,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Parse out CLI flags, then override positional arguments
 	_ = cmd.Flags().Parse(argv)

diff --git a/cmd/edit/cluster/cmd.go b/cmd/edit/cluster/cmd.go
@@ -152,7 +152,7 @@ func run(cmd *cobra.Command, _ []string) {
 		}
 	}
 
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Create the client for the OCM API:
 	ocmClient, err := ocm.NewClient().

diff --git a/cmd/edit/ingress/cmd.go b/cmd/edit/ingress/cmd.go
@@ -88,7 +88,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	ingressID := argv[0]
 	if !ingressKeyRE.MatchString(ingressID) {

diff --git a/cmd/edit/machinepool/cmd.go b/cmd/edit/machinepool/cmd.go
@@ -117,7 +117,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	machinePoolID := argv[0]
 	if machinePoolID != "Default" && !machinePoolKeyRE.MatchString(machinePoolID) {

diff --git a/cmd/edit/service/cmd.go b/cmd/edit/service/cmd.go
@@ -66,7 +66,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if args.ID == "" {
 		reporter.Errorf("Service id not specified.")

diff --git a/cmd/grant/user/cmd.go b/cmd/grant/user/cmd.go
@@ -75,7 +75,7 @@ func init() {
 
 func run(_ *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/hibernate/cluster/cmd.go b/cmd/hibernate/cluster/cmd.go
@@ -44,7 +44,7 @@ func init() {
 
 func run(cmd *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	clusterKey, err := ocm.GetClusterKey()
 	if err != nil {

diff --git a/cmd/initialize/cmd.go b/cmd/initialize/cmd.go
@@ -94,7 +94,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// If necessary, call `login` as part of `init`. We do this before
 	// other validations to get the prompt out of the way before performing

diff --git a/cmd/install/addon/cmd.go b/cmd/install/addon/cmd.go
@@ -67,7 +67,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Parse out CLI flags, then override positional arguments
 	_ = cmd.Flags().Parse(argv)

diff --git a/cmd/link/ocmrole/cmd.go b/cmd/link/ocmrole/cmd.go
@@ -66,7 +66,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) (err error) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if len(argv) > 0 {
 		args.roleArn = argv[0]

diff --git a/cmd/link/userrole/cmd.go b/cmd/link/userrole/cmd.go
@@ -43,7 +43,7 @@ var Cmd = &cobra.Command{
 	Aliases: []string{"userrole"},
 	Short:   "link user role to specific OCM account.",
 	Long:    "link user role to specific OCM account before create your cluster.",
-	Example: ` # Link user roles 
+	Example: ` # Link user roles
   rosa link user-role --role-arn arn:aws:iam::{accountid}:role/{prefix}-User-{username}-Role`,
 	RunE: run,
 }
@@ -70,7 +70,7 @@ func init() {
 
 func run(cmd *cobra.Command, argv []string) (err error) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	if len(argv) > 0 {
 		args.roleArn = argv[0]

diff --git a/cmd/list/accountroles/cmd.go b/cmd/list/accountroles/cmd.go
@@ -60,7 +60,7 @@ func init() {
 
 func run(_ *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Create the AWS client:
 	awsClient, err := aws.NewClient().

diff --git a/cmd/list/addon/cmd.go b/cmd/list/addon/cmd.go
@@ -58,7 +58,7 @@ func init() {
 
 func run(_ *cobra.Command, _ []string) {
 	reporter := rprtr.CreateReporterOrExit()
-	logger := logging.CreateLoggerOrExit(reporter)
+	logger := logging.NewLogger()
 
 	// Check that the cluster key (name, identifier or external identifier) given by the user
 	// is reasonably safe so that there is no risk of SQL injection: