Move logging library to shared package

reconmap · Oct 11, 2022 · 1e81b52 · 1e81b52
1 parent 65f15ba
commit 1e81b52
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 tags
 bom-go-mod.spdx
+*.out
+.idea
diff --git a/agent/internal/auth.go b/agent/internal/auth.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/reconmap/shared-lib/pkg/logging"
 	"net/http"
 	"os"
 
@@ -13,13 +14,19 @@ import (
 
 var rsakeys map[string]*rsa.PublicKey
 
+var logger = logging.GetLoggerInstance()
+
 func GetPublicKeys() string {
 	rsakeys = make(map[string]*rsa.PublicKey)
 	var body map[string]string
 	keycloakHostname, _ := os.LookupEnv("RMAP_KEYCLOAK_HOSTNAME")
 	uri := keycloakHostname + "/realms/reconmap"
 	resp, _ := http.Get(uri)
-	json.NewDecoder(resp.Body).Decode(&body)
+	err := json.NewDecoder(resp.Body).Decode(&body)
+	if err != nil {
+		logger.Error(err)
+	}
+
 	return body["public_key"]
 }
 
@@ -33,7 +40,8 @@ func CheckRequestToken(r *http.Request) error {
 		pubkey := "-----BEGIN PUBLIC KEY-----\n" + GetPublicKeys() + "\n-----END PUBLIC KEY-----"
 		key, err := jwt.ParseRSAPublicKeyFromPEM([]byte(pubkey))
 		if err != nil {
-			fmt.Errorf("validate: parse key: %w", err)
+			err := fmt.Errorf("validate: parse key: %w", err)
+			return err
 		}
 
 		token, err := jwt.Parse(tokenParam, func(jwtToken *jwt.Token) (interface{}, error) {

diff --git a/cli/cmd/rmap/main.go b/cli/cmd/rmap/main.go
@@ -3,12 +3,12 @@ package main
 import (
 	"encoding/base64"
 	"fmt"
+	"github.com/reconmap/shared-lib/pkg/logging"
 	"os"
 
 	"github.com/fatih/color"
 	"github.com/reconmap/cli/internal/build"
 	"github.com/reconmap/cli/internal/commands"
-	"github.com/reconmap/cli/internal/logging"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/cli/internal/commands/auth.go b/cli/internal/commands/auth.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/reconmap/shared-lib/pkg/logging"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -24,14 +25,18 @@ type IDTokenClaim struct {
 }
 
 func Login() error {
+	logger := logging.GetLoggerInstance()
+
 	config, err := configuration.ReadConfig()
 	if err != nil {
+		logger.Error(err)
 		return err
 	}
 
 	provider, err := oidc.NewProvider(oauth2.NoContext, config.AuthUrl+"/realms/reconmap")
 	if err != nil {
-		panic(err)
+		logger.Error(err)
+		return err
 	}
 
 	oauthConfig := oauth2.Config{
@@ -42,7 +47,12 @@ func Login() error {
 	}
 
 	var stateSeed uint64
-	binary.Read(rand.Reader, binary.LittleEndian, &stateSeed)
+	err = binary.Read(rand.Reader, binary.LittleEndian, &stateSeed)
+	if err != nil {
+		logger.Error(err)
+		return err
+	}
+
 	state := fmt.Sprintf("%x", stateSeed)
 
 	authCodeURL := oauthConfig.AuthCodeURL(state)

diff --git a/cli/internal/commands/cmds.go b/cli/internal/commands/cmds.go
@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"github.com/reconmap/shared-lib/pkg/logging"
 	"log"
 	"os"
 	"os/exec"
@@ -14,6 +15,8 @@ import (
 )
 
 func RunCommand(command *api.Command, vars []string) error {
+	logger := logging.GetLoggerInstance()
+
 	var err error
 	if command.ExecutableType == "custom" {
 		argsRendered := terminal.ReplaceArgs(command, vars)
@@ -51,7 +54,10 @@ func RunCommand(command *api.Command, vars []string) error {
 		outputFilename := strconv.Itoa(command.ID) + ".out"
 		f, err := os.Create(outputFilename)
 		defer f.Close()
-		f.WriteString(outStr)
+		_, err = f.WriteString(outStr)
+		if err != nil {
+			logger.Error(err)
+		}
 		command.OutputFileName = outputFilename
 
 		if len(errStr) > 0 {

diff --git a/shared-lib/go.mod b/shared-lib/go.mod
@@ -1,3 +1,9 @@
 module github.com/reconmap/shared-lib
 
 go 1.18
+
+require (
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+)
diff --git a/shared-lib/go.sum b/shared-lib/go.sum
@@ -0,0 +1,11 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
diff --git a/cli/internal/logging/logger.go → shared-lib/pkg/logging/logger.go b/cli/internal/logging/logger.go → shared-lib/pkg/logging/logger.go