Change glog dependency to klog

glog is unmaintained, but the klog fork is. Fixes google#23 Signed-off-by: Dionna Glaze <[email protected]>
deeglaze · Oct 28, 2022 · fc13e5f · fc13e5f
1 parent 2cea1b1
commit fc13e5f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/abi/abi.go b/abi/abi.go
@@ -22,11 +22,11 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/golang/glog"
 	pb "github.com/google/go-sev-guest/proto/sevsnp"
 	"github.com/pborman/uuid"
 	"golang.org/x/crypto/cryptobyte"
 	"golang.org/x/crypto/cryptobyte/asn1"
+	"k8s.io/klog"
 )
 
 const (
@@ -676,15 +676,15 @@ func (c *CertTable) Proto() *pb.CertificateChain {
 	var err error
 	vcek, err = c.GetByGUIDString(VcekGUID)
 	if err != nil {
-		glog.Warningf("VCEK certificate not found in data pages: %v", err)
+		klog.Warningf("VCEK certificate not found in data pages: %v", err)
 	}
 	ask, err = c.GetByGUIDString(AskGUID)
 	if err != nil {
-		glog.Warningf("ASK certificate not found in data pages: %v", err)
+		klog.Warningf("ASK certificate not found in data pages: %v", err)
 	}
 	ark, err = c.GetByGUIDString(ArkGUID)
 	if err != nil {
-		glog.Warningf("ARK certificate not found in data pages: %v", err)
+		klog.Warningf("ARK certificate not found in data pages: %v", err)
 	}
 	return &pb.CertificateChain{
 		VcekCert: vcek,

diff --git a/go.mod b/go.mod
@@ -3,14 +3,14 @@ module github.com/google/go-sev-guest
 go 1.19
 
 require (
-	github.com/golang/glog v1.0.0
 	github.com/google/go-cmp v0.5.7
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
 	go.uber.org/multierr v1.8.0
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 	golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68
 	google.golang.org/protobuf v1.28.0
+	k8s.io/klog v1.0.0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1,8 +1,7 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
@@ -36,3 +35,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
diff --git a/verify/verify.go b/verify/verify.go
@@ -28,13 +28,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/google/go-sev-guest/abi"
 	"github.com/google/go-sev-guest/kds"
 	spb "github.com/google/go-sev-guest/proto/sevsnp"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 	"go.uber.org/multierr"
+	"k8s.io/klog"
 )
 
 var (
@@ -112,7 +112,7 @@ func (r *AMDRootCerts) FromDER(ask []byte, ark []byte) error {
 
 	arkCert, err := x509.ParseCertificate(ark)
 	if err != nil {
-		glog.Errorf("could not parse ARK certificate: %v", err)
+		klog.Errorf("could not parse ARK certificate: %v", err)
 	}
 	r.ArkX509 = arkCert
 	return nil