Merge pull request #17875 from ivanvc/fix-deprecation-comments-added-…

…with-var-naming-lint-rule Fix deprecation comments from addressing var-naming work
etcd-io · Apr 30, 2024 · 09f7d7a · 09f7d7a
2 parents 0e37ffc + 242f5d6
commit 09f7d7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/server/etcdserver/api/etcdhttp/health.go b/server/etcdserver/api/etcdhttp/health.go
@@ -264,11 +264,11 @@ func (reg *CheckRegistry) RootPath() string {
 }
 
 // InstallHttpEndpoints installs the http handlers for the health checks.
+//
 // Deprecated: Please use (*CheckRegistry) InstallHTTPEndpoints instead.
 //
-//revive:disable:var-naming
+//revive:disable-next-line:var-naming
 func (reg *CheckRegistry) InstallHttpEndpoints(lg *zap.Logger, mux *http.ServeMux) {
-	//revive:enable:var-naming
 	reg.InstallHTTPEndpoints(lg, mux)
 }
 

diff --git a/server/storage/datadir/datadir.go b/server/storage/datadir/datadir.go
@@ -32,6 +32,7 @@ func ToSnapDir(dataDir string) string {
 }
 
 // ToWalDir returns the directory path for the member's WAL.
+//
 // Deprecated: use ToWALDir instead.
 //
 //revive:disable-next-line:var-naming

diff --git a/server/storage/util.go b/server/storage/util.go
@@ -111,6 +111,7 @@ func CreateConfigChangeEnts(lg *zap.Logger, ids []uint64, self uint64, term, ind
 
 // GetEffectiveNodeIdsFromWalEntries returns an ordered set of IDs included in the given snapshot and
 // the entries.
+//
 // Deprecated: use GetEffectiveNodeIDsFromWALEntries instead.
 //
 //revive:disable-next-line:var-naming