Skip to content

fix: include subdirectories in example templates #1715

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

Merged
merged 5 commits into from
May 25, 2022
Merged

fix: include subdirectories in example templates #1715

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc75d86
fix: Include subdirectories in embedded example templates
dwahler May 24, 2022
0a13253
move README.md and update documentation links
dwahler May 24, 2022
a9125fc
Merge remote-tracking branch 'origin/main' into david/1669-example-su…
dwahler May 24, 2022
e94a9c7
fix incorrect use of Reader.Read()
dwahler May 25, 2022
ee7a1fb
close example files after use
dwahler May 25, 2022
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
Prev Previous commit
close example files after use
  • Loading branch information
@dwahler
dwahler committed May 25, 2022
commit ee7a1fb53ff3de25572ab1661e46a903140022fb
1 change: 1 addition & 0 deletions examples/examples.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ func Archive(exampleID string) ([]byte, error) {
if err != nil {
return xerrors.Errorf("open file %s: %w", path, err)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be closed i.e. defer file.Close()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Technically I think we would be OK without it, because the readers returned by embed.FS are just pointers, but I added it anyway to make the code more obviously correct.

defer file.Close()

err = tarWriter.WriteHeader(header)
if err != nil {
Expand Down