.*: fix revive lints `redefines-builtin-id`

[janardhanvissa]

Addresses: #7444

RELEASE NOTES: None

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 71.42857% with 8 lines in your changes missing coverage. Please review.

Project coverage is 81.87%. Comparing base (70f19ee) to head (b4cf666). Report is 3 commits behind head on master.

Files with missing lines	Patch %	Lines
...ds/internal/xdsclient/xdsresource/unmarshal_cds.go	25.00%	1 Missing and 2 partials :warning:
xds/internal/httpfilter/rbac/rbac.go	50.00%	0 Missing and 2 partials :warning:
xds/internal/clusterspecifier/rls/rls.go	50.00%	0 Missing and 1 partial :warning:
xds/internal/httpfilter/fault/fault.go	50.00%	0 Missing and 1 partial :warning:
xds/internal/httpfilter/router/router.go	50.00%	0 Missing and 1 partial :warning:

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7552      +/-   ##
==========================================
+ Coverage   81.75%   81.87%   +0.12%     
==========================================
  Files         361      361              
  Lines       27813    27813              
==========================================
+ Hits        22739    22773      +34     
+ Misses       3870     3845      -25     
+ Partials     1204     1195       -9     

Files with missing lines	Coverage Δ
balancer_wrapper.go	87.26% <100.00%> (ø)
internal/status/status.go	89.87% <100.00%> (ø)
internal/xds/rbac/converter.go	86.66% <100.00%> (ø)
orca/producer.go	96.20% <100.00%> (ø)
xds/internal/resolver/xds_resolver.go	80.71% <100.00%> (ø)
xds/internal/xdsclient/xdsresource/filter_chain.go	93.38% <100.00%> (-0.56%)	:arrow_down:
xds/internal/clusterspecifier/rls/rls.go	67.56% <50.00%> (ø)
xds/internal/httpfilter/fault/fault.go	71.96% <50.00%> (ø)
xds/internal/httpfilter/router/router.go	38.23% <50.00%> (ø)
xds/internal/httpfilter/rbac/rbac.go	63.15% <50.00%> (ø)
... and 1 more

... and 22 files with indirect coverage changes

[purnesh42H]

@janardhanvissa make sure to keep the comments upto line col 80

[janardhanvissa]

@purnesh42H Updated the comments as suggested and pushed the changes. Please re-review it.

[purnesh42H]

@arvindbr8 one more revive PR to review. Thanks!

[janardhanvissa]

@purnesh42H Both the above-mentioned comments addressed and pushed the changes.

[purnesh42H]

Thanks @arvindbr8 for rechecking the empty blocks. I thought github UI will prompt if not fixed but looks like it doesn't always.

empty block for loops seems to be a recognized pattern in go. Adding inline comments doesn't seem to satisfy the linter. We can either do a noop operation inside like _ = struct{}{} // Satisfy linter, effectively a no-op or just disable the empty-block check.

@dfawley @arvindbr8 for thoughts

[janardhanvissa]

Above mentioned comments for redefined-builtin-id fixes are addressed and pushed the changes.

[purnesh42H]

Thanks @arvindbr8 for rechecking the empty blocks. I thought github UI will prompt if not fixed but looks like it doesn't always.

empty block for loops seems to be a recognized pattern in go. Adding inline comments doesn't seem to satisfy the linter. We can either do a noop operation inside like _ = struct{}{} // Satisfy linter, effectively a no-op or just disable the empty-block check.

@dfawley @arvindbr8 for thoughts

Decided to undo empty-block changes. We will ignore them in the revive check

[linux-foundation-easycla[bot]]

The committers listed above are authorized under a signed CLA.

• :white_check_mark: login: janardhanvissa (41eb4bcf9dae5a9e87ed35b8f39e53b7cafcffdb, 72a5222fe3f98bed01094d754c2bb3a61b27a5cd, 38f56db730a8509c18d2e0ae2a189c5354e00355, 62a2fb510b62ae4d4c7f394fea4875e52d279df1, e999d13914c9ac7ca088968b330498a7919fa8f2, ba88c1c828d8596504b069aa0c21c5d346a7f433, 37f7a6bfca8fd7387fd295ef9d8e53b986387ebe, fa91ae06047ea0df8320f69dbbe89e36db2dfc31, 36b3d83cbae9dc566a043887f7c40e1fe54d9c49, e15b23d5db31a8af0dc14c5a90abbda746a55986, c3dfaafccd286ca997aa94aa994d7ff8896db35d, 091bf41cb0c527005d2a3720ac32677379f58893, 1fe9b8b0212c9d476a27e6dd8549f291073b72c2, ed434dc9f561741f355f745e753ec4fc2087339f, 1a64983de1bb8ec54138118b7b18fa9cf93cad8d, e9f8978cb038ce1466d17237e77a7d271e0a884a, 3bc53c56fa3077a2af3a1de0f057fdd40bfe0c7b, dfeb468956c56e79d99a6e33580371e6d85d555f, 7beda74afba679752a2c3373c663b1220594f7e6, bd4478732c62c50e6e1a1a231d66f4270b236be7, e68df9af9b16d09a51f242902bb78c628d1908bd, 3ea5488a3e021fb9bfdd24a4fa821543f61ae11a, b324b082ba4dd56c419308f0d935369e8291b29d, 932ed9ffd3d5c6589f4c151718e57ea73b995d7b, 1ad9b771e455a036c65d80de934be83c4fca835a, 023be1f8541979654f35f8cb5c571109fc6b85c5, f4a765e3dc84e775f26fbb55b6d9226910d151f4, 1a99e434cae50269d448cdeb15600b691e51f403, aa07ed6ed23e8143dd92eb15fe5baf598ca2826f, 614d7ff6d6e645d23d71ddb52aa7d4117f1c18e3, aa96fd058b1e449b1ee65baee92e61317d2b67de, facc6b266529ca62e834a69cd01725750c9ca230, aab2317ccb9d468e77eda2456f433b3be73d512e)
• :white_check_mark: login: janardhankrishna-sai (654124ef4b1346fb506890a5f895a61547f6a2e5, ca55dad88ce0913e01c9f53e074399d584846dad, dd467ebb51c7a85205fb97f5f663916f4c5289ef, 74cc4d0f2d610761298d208b151e4c3568cbb048, 32321cb11bcffd5f4be01f4e0871245ffc423b46, 97b9e2afb94709ffa02e01327c013253f49ede4e, 08994962bd8b90a430b3073c91167477e2114d09, b4cf666eb5c58d3d8e657d4a8b8c90dbab7a9706, a8ad536885f91f5acab930cf655dd7bedfd22079, 9e18de2d7f3cfbf7dbdae75d707aea659a278500, 9d02e35557fc530f3aefa8feab850bb7374bc1e8, c6e094d842e088c6e50bbaa7fe504dd1db9efd67, 6f8c09ea583eacec9a5f61250844ef7db86e6582, 20955501533206d9b6fb25739f5c7c93187e5cdd, fd53abccea23c8120c8ed39f156e466cb34c4264, 7465b904506f4925aa6f14020cb675cec2d3621b, c965a4f0566f911076d84a3257a2b0285ec4b805, 161a4130cb3b56450b9ef29629787561df363407)
• :white_check_mark: login: purnesh42H / name: Purnesh Dixit (116e2810359745abb52742fd91260e62c0732ebc, e5b7b8c32735bba6dcef309012b62296e1240ae7, cfa0bf6e3ff5fc793d21eb3095d6692c06c48810, 1a5f7a86b4e93a230c618020d29da849aa21eb3a, 5d4880c92e4f95af4cbefd6547cfaf13a4e8ccb8)

[janardhanvissa]

@purnesh42H Updated close to closeFn as mentioned above. Please re-review the changes.

[arvindbr8]

We should have probably rebased and removed this TODO.

[purnesh42H]

We should have probably rebased and removed this TODO.

https://github.com/grpc/grpc-go/pull/7575

[purnesh42H]

We should have probably rebased and removed this TODO.

Ah yeah i will remove both after #7575