d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

log: validate log.Logger impl at compile time

Browse Source 
Signed-off-by: Pires <pjpires@gmail.com>
This commit is contained in:
Pires
2021-01-11 18:17:01 +00:00
parent eda7adbdb4
commit be76c022ae
4 changed files with 6 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
log/klogv2/klogv2.go
View File

@@ -26,6 +26,9 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
// Ensure log.Logger is fully implemented during compile time.
var _ log.Logger = (*adapter)(nil)
// adapter implements the `log.Logger` interface for klogv2 // adapter implements the `log.Logger` interface for klogv2
type adapter struct { type adapter struct {
fields map[string]interface{} fields map[string]interface{}

28
log/klogv2/klogv2_test.go
View File

@@ -1,28 +0,0 @@
// Copyright © 2021 The virtual-kubelet authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package klogv2
import (
"testing"
"github.com/virtual-kubelet/virtual-kubelet/log"
)
func TestImplementsLoggerInterface(t *testing.T) {
l := FromKlogv2(nil)
if _, ok := l.(log.Logger); !ok {
t.Fatal("does not implement log.Logger interface")
}
}

3
log/logrus/logrus.go
View File

@@ -22,6 +22,9 @@ import (
"github.com/virtual-kubelet/virtual-kubelet/log" "github.com/virtual-kubelet/virtual-kubelet/log"
) )
// Ensure log.Logger is fully implemented during compile time.
var _ log.Logger = (*adapter)(nil)
// adapter implements the `log.Logger` interface for logrus // adapter implements the `log.Logger` interface for logrus
type adapter struct { type adapter struct {
*logrus.Entry *logrus.Entry

30
log/logrus/logrus_test.go
View File

@@ -1,30 +0,0 @@
// Copyright © 2017 The virtual-kubelet authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package logrus
import (
"testing"
"github.com/sirupsen/logrus"
"github.com/virtual-kubelet/virtual-kubelet/log"
)
func TestImplementsLoggerInterface(t *testing.T) {
l := FromLogrus(&logrus.Entry{})
if _, ok := l.(log.Logger); !ok {
t.Fatal("does not implement log.Logger interface")
}
}