Migration of stdout logger to a separate package

Author: erm-g

authz/audit/audit_logger.go

@@ -79,7 +79,7 @@ type Event struct {
 // logger configuration. Concrete types representing configuration of specific
 // audit loggers must embed this interface to implement it.
 type LoggerConfig interface {
-	loggerConfig()
+	LoggerConfig()
 }
 
 // Logger is the interface to be implemented by audit loggers.

authz/audit/stdout_logger.go authz/audit/stdout/stdout_logger.goauthz/audit/stdout_logger.go renamed to authz/audit/stdout/stdout_logger.go

@@ -16,13 +16,14 @@
  *
  */
 
-package audit
+package stdout
 
 import (
 	"encoding/json"
 	"log"
 	"time"
 
+	"google.golang.org/grpc/authz/audit"
 	"google.golang.org/grpc/grpclog"
 )
 
@@ -38,15 +39,15 @@ type StdoutEvent struct {
 	Timestamp string `json:"timestamp"`
 }
 
-type StdOutLogger struct {
+type StdoutLogger struct {
 }
 
-func (logger *StdOutLogger) Log(event *Event) {
+func (logger *StdoutLogger) Log(event *audit.Event) {
 	jsonBytes, err := json.Marshal(convertEvent(event))
 	if err != nil {
 		grpcLogger.Errorf("failed to marshal AuditEvent data to JSON: %v", err)
 	}
-	log.Println(string(jsonBytes)) // built in log.go
+	log.Println(string(jsonBytes))
 }
 
 const (
@@ -55,25 +56,25 @@ const (
 
 type StdoutLoggerConfig struct{}
 
-func (StdoutLoggerConfig) loggerConfig() {}
+func (StdoutLoggerConfig) LoggerConfig() {}
 
-type StdOutLoggerBuilder struct{}
+type StdoutLoggerBuilder struct{}
 
-func (StdOutLoggerBuilder) Name() string {
+func (StdoutLoggerBuilder) Name() string {
 	return stdName
 }
 
-func (StdOutLoggerBuilder) Build(LoggerConfig) Logger {
-	return &StdOutLogger{}
+func (StdoutLoggerBuilder) Build(audit.LoggerConfig) audit.Logger {
+	return &StdoutLogger{}
 }
 
-func (StdOutLoggerBuilder) ParseLoggerConfig(config json.RawMessage) (LoggerConfig, error) {
+func (StdoutLoggerBuilder) ParseLoggerConfig(config json.RawMessage) (audit.LoggerConfig, error) {
 	grpcLogger.Warningf("Config value %v ignored, "+
-		"StdOutLogger doesn't support custom configs", string(config))
+		"StdoutLogger doesn't support custom configs", string(config))
 	return &StdoutLoggerConfig{}, nil
 }
 
-func convertEvent(event *Event) StdoutEvent {
+func convertEvent(event *audit.Event) StdoutEvent {
 	return StdoutEvent{
 		FullMethodName: event.FullMethodName,
 		Principal:      event.Principal,

authz/audit/stdout_logger_test.go authz/audit/stdout/stdout_logger_test.goauthz/audit/stdout_logger_test.go renamed to authz/audit/stdout/stdout_logger_test.go

@@ -16,29 +16,31 @@
  *
  */
 
-package audit
+package stdout
 
 import (
 	"bytes"
 	"encoding/json"
 	"log"
 	"testing"
 	"time"
+
+	"google.golang.org/grpc/authz/audit"
 )
 
 var (
 	content     = json.RawMessage(`{"name": "conf", "val": "to be ignored"}`)
-	builder     = &StdOutLoggerBuilder{}
+	builder     = &StdoutLoggerBuilder{}
 	config, _   = builder.ParseLoggerConfig(content)
 	auditLogger = builder.Build(config)
 )
 
-func TestStdOutLogger_Log(t *testing.T) {
+func TestStdoutLogger_Log(t *testing.T) {
 	var buf bytes.Buffer
 	log.SetOutput(&buf)
 	log.SetFlags(0)
 
-	event := &Event{PolicyName: "test policy", Principal: "test principal"}
+	event := &audit.Event{PolicyName: "test policy", Principal: "test principal"}
 	auditLogger.Log(event)
 
 	expected := `{"fullMethodName":"","principal":"test principal","policyName":"test policy","matchedRule":"","authorized":false`
@@ -47,12 +49,12 @@ func TestStdOutLogger_Log(t *testing.T) {
 	}
 }
 
-func TestStdOutLogger_LogAllEventFields(t *testing.T) {
+func TestStdoutLogger_LogAllEventFields(t *testing.T) {
 	var buf bytes.Buffer
 	log.SetOutput(&buf)
 	log.SetFlags(0)
 
-	event := &Event{
+	event := &audit.Event{
 		FullMethodName: "/helloworld.Greeter/SayHello",
 		Principal:      "spiffe://example.org/ns/default/sa/default/backend",
 		PolicyName:     "example-policy",