fix: change uses of []slog.Field to []any

mafredri · mafredri · commit a533b1c1848a · 2023-06-13T18:09:21.000Z
diff --git a/coderd/csp.go b/coderd/csp.go
@@ -39,7 +39,7 @@ func (api *API) logReportCSPViolations(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	fields := make([]slog.Field, 0, len(v.Report))
+	fields := make([]any, 0, len(v.Report))
 	for k, v := range v.Report {
 		fields = append(fields, slog.F(k, v))
 	}
diff --git a/enterprise/audit/backends/slog.go b/enterprise/audit/backends/slog.go
@@ -28,7 +28,7 @@ func (b slogBackend) Export(ctx context.Context, alog database.AuditLog) error {
 	// pleasantly format the output. For example, the clean result of
 	// (*NullString).Value() may be printed instead of {String: "foo", Valid: true}.
 	sfs := structs.Fields(alog)
-	var fields []slog.Field
+	var fields []any
 	for _, sf := range sfs {
 		fields = append(fields, slog.F(sf.Name(), sf.Value()))
 	}
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -357,7 +357,7 @@ func (p *Server) acquireJob(ctx context.Context) {
 	))
 	defer span.End()
 
-	fields := []slog.Field{
+	fields := []any{
 		slog.F("initiator_username", job.UserName),
 		slog.F("provisioner", job.Provisioner),
 		slog.F("job_id", job.JobId),
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -1167,7 +1167,7 @@ func redactVariableValues(variableValues []*sdkproto.VariableValue) []*sdkproto.
 }
 
 // logProvisionerJobLog logs a message from the provisioner daemon at the appropriate level.
-func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...slog.Field) {
+func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...any) {
 	switch logLevel {
 	case sdkproto.LogLevel_TRACE:
 		r.logger.Debug(ctx, msg, fields...) // There's no trace, so we'll just use debug.

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (api API) logReportCSPViolations(rw http.ResponseWriter, r http.Request)`
`39`	`39`	`return`
`40`	`40`	`}`
`41`	`41`
`42`		`- fields := make([]slog.Field, 0, len(v.Report))`
	`42`	`+ fields := make([]any, 0, len(v.Report))`
`43`	`43`	`for k, v := range v.Report {`
`44`	`44`	`fields = append(fields, slog.F(k, v))`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func (b slogBackend) Export(ctx context.Context, alog database.AuditLog) error {`
`28`	`28`	`// pleasantly format the output. For example, the clean result of`
`29`	`29`	`// (*NullString).Value() may be printed instead of {String: "foo", Valid: true}.`
`30`	`30`	`sfs := structs.Fields(alog)`
`31`		`- var fields []slog.Field`
	`31`	`+ var fields []any`
`32`	`32`	`for _, sf := range sfs {`
`33`	`33`	`fields = append(fields, slog.F(sf.Name(), sf.Value()))`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ func redactVariableValues(variableValues []sdkproto.VariableValue) []sdkproto.`
`1167`	`1167`	`}`
`1168`	`1168`
`1169`	`1169`	`// logProvisionerJobLog logs a message from the provisioner daemon at the appropriate level.`
`1170`		`-func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...slog.Field) {`
	`1170`	`+func (r *Runner) logProvisionerJobLog(ctx context.Context, logLevel sdkproto.LogLevel, msg string, fields ...any) {`
`1171`	`1171`	`switch logLevel {`
`1172`	`1172`	`case sdkproto.LogLevel_TRACE:`
`1173`	`1173`	`r.logger.Debug(ctx, msg, fields...) // There's no trace, so we'll just use debug.`