Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linter errors introduced by #47841 #47913

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Fix linter errors introduced by #47841 #47913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10afbff
Fix linter errors introduced by #47841
timothyb89 Oct 24, 2024
7ed471c
Merge branch 'master' into timothyb89/fix-tbot-init-lints
timothyb89 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/tbot/config/destination_directory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
}

Expand Down
Loading