From efb08e4fee84d110f750753588a20b625a01dffd Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Wed, 30 Sep 2020 17:13:41 -0700 Subject: [PATCH] all: use IsZero methods Signed-off-by: Josh Bleecher Snyder --- control/controlclient/direct.go | 4 ++-- logpolicy/logpolicy.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go index 40ae33399..373ec0440 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -249,7 +249,7 @@ func (c *Direct) TryLogout(ctx context.Context) error { // TODO(crawshaw): Tell the server. This node key should be // immediately invalidated. - //if c.persist.PrivateNodeKey != (wgcfg.PrivateKey{}) { + //if !c.persist.PrivateNodeKey.IsZero() { //} c.persist = Persist{ PrivateMachineKey: c.persist.PrivateMachineKey, @@ -335,7 +335,7 @@ func (c *Direct) doLogin(ctx context.Context, t *oauth2.Token, flags LoginFlags, // Try refreshing the current key first tryingNewKey = persist.PrivateNodeKey } - if persist.OldPrivateNodeKey != (wgcfg.PrivateKey{}) { + if !persist.OldPrivateNodeKey.IsZero() { oldNodeKey = persist.OldPrivateNodeKey.Public() } diff --git a/logpolicy/logpolicy.go b/logpolicy/logpolicy.go index 82269b199..af204330e 100644 --- a/logpolicy/logpolicy.go +++ b/logpolicy/logpolicy.go @@ -356,7 +356,7 @@ func New(collection string) *Policy { newc.PrivateID = logtail.PrivateID{} newc.Collection = collection } - if newc.PrivateID == (logtail.PrivateID{}) { + if newc.PrivateID.IsZero() { newc.PrivateID, err = logtail.NewPrivateID() if err != nil { log.Fatalf("logpolicy: NewPrivateID() should never fail")