diff --git a/.golangci.yml b/.golangci.yml index cdd2defc..1ebcfa46 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,27 +2,22 @@ version: "2" linters: default: standard enable: + - bodyclose + - prealloc - unparam + exclusions: + paths: + - generated.*\.go + - client + - vendor formatters: enable: - - gofmt + - gofumpt - goimports - settings: - gofmt: - rewrite-rules: - - pattern: 'interface{}' - replacement: 'any' issues: max-same-issues: 100 - exclude-files: - - generated.*\\.go - - exclude-dirs: - - client - - vendor - run: timeout: 10m diff --git a/lib/nats.go b/lib/nats.go index e3a78168..55963044 100644 --- a/lib/nats.go +++ b/lib/nats.go @@ -259,14 +259,16 @@ func isNoConnectivityErr(_ error) bool { func NewConnection(licenseID string, natscred NatsCredential) (nc *nats.Conn, err error) { servers := natscred.Server - opts := []nats.Option{ + opts := make([]nats.Option, 0, 6) + opts = append( + opts, nats.Name(fmt.Sprintf("%s.%s", licenseID, info.ProductName)), nats.MaxReconnects(-1), nats.ErrorHandler(errorHandler), nats.ReconnectHandler(reconnectHandler), nats.DisconnectErrHandler(disconnectHandler), // nats.UseOldRequestStyle(), - } + ) credFile := "/tmp/nats.creds" if err = os.WriteFile(credFile, natscred.Credential, 0o600); err != nil { diff --git a/lib/node.go b/lib/node.go index eb7fe436..f9375f28 100644 --- a/lib/node.go +++ b/lib/node.go @@ -72,7 +72,8 @@ func (p *SiteInfoPublisher) OnUpdate(oldObj, newObj any) { if alreadySentHourly && uOld.GetUID() == uNew.GetUID() && uOld.GetGeneration() == uNew.GetGeneration() { if klog.V(8).Enabled() { - klog.V(8).InfoS("skipping update event", + klog.V(8).InfoS( + "skipping update event", "gvk", uNew.GetObjectKind().GroupVersionKind(), "namespace", uNew.GetNamespace(), "name", uNew.GetName(), diff --git a/lib/resource.go b/lib/resource.go index 81e9eb28..c9365395 100644 --- a/lib/resource.go +++ b/lib/resource.go @@ -86,7 +86,8 @@ func (p *ResourceEventPublisher) OnUpdate(oldObj, newObj any) { if alreadySentHourly && uOld.GetUID() == uNew.GetUID() && uOld.GetGeneration() == uNew.GetGeneration() { if klog.V(8).Enabled() { - klog.V(8).InfoS("skipping update event", + klog.V(8).InfoS( + "skipping update event", "gvk", uNew.GetObjectKind().GroupVersionKind(), "namespace", uNew.GetNamespace(), "name", uNew.GetName(),