From 10afbff5cf69143a49b585a89b57554ffb571b40 Mon Sep 17 00:00:00 2001 From: Tim Buckley Date: Thu, 24 Oct 2024 12:50:09 -0600 Subject: [PATCH] Fix linter errors introduced by #47841 This fixes a few non-Linux lints introduced in #47841, where staticcheck complains about noop implementations for non-Linux OSes. It also removes an outdated TODO comment. --- lib/tbot/config/destination_directory.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tbot/config/destination_directory.go b/lib/tbot/config/destination_directory.go index cf303a1b71a08..85c8e1733b9d8 100644 --- a/lib/tbot/config/destination_directory.go +++ b/lib/tbot/config/destination_directory.go @@ -360,6 +360,8 @@ func (dd *DestinationDirectory) Verify(keys []string) error { // verifyAndCorrectACL performs validation and attempts correction on new-style // ACLs when configured. +// +//nolint:staticcheck // staticcheck doesn't like nop implementations in fs_other.go func (dd *DestinationDirectory) verifyAndCorrectACL(ctx context.Context, subpath string) error { p := filepath.Join(dd.Path, subpath) @@ -380,8 +382,6 @@ func (dd *DestinationDirectory) verifyAndCorrectACL(ctx context.Context, subpath // as hard failures. if len(issues) > 0 { if err := botfs.ConfigureACL(p, dd.Readers); err != nil { - // TODO: should this always be a hard fail? Would we want to just - // warn on `acls: try`? return trace.Wrap(err, "unable to fix misconfigured ACL at path %s with issues %v", p, issues) }