pack: added .packignore #985
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Japsty
force-pushed
the
gh-812-tt-pack-allow-to-ignore-paths
branch
3 times, most recently
from
ff296ba
to
3fdb91c
Compare
Japsty
force-pushed
the
gh-812-tt-pack-allow-to-ignore-paths
branch
4 times, most recently
from
4fa8e8b
to
6c87f23
Compare
psergee
reviewed
Oct 23, 2024
psergee
reviewed
Oct 23, 2024
Japsty
force-pushed
the
gh-812-tt-pack-allow-to-ignore-paths
branch
7 times, most recently
from
b93703e
to
22c8d2b
Compare
psergee
reviewed
Nov 11, 2024
cli/pack/common.go
Outdated
| } | ||
|
|
||
| if err = removeIgnoredFiles(appPath, ignorePatterns); err != nil { | ||
| return fmt.Errorf("failed to remove ignored files: %v", err) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("failed to remove ignored files: %v", err) | |
| return fmt.Errorf("failed to remove ignored files: %s", err) |
cli/pack/common.go
Outdated
| if !inst.IsFileApp { | ||
| ignorePatterns, err := readPackIgnore(appPath) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read .packignore: %v", err) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("failed to read .packignore: %v", err) | |
| return fmt.Errorf("failed to read .packignore: %s", err) |
cli/pack/common.go
Outdated
| if !inst.IsFileApp { | ||
| ignorePatterns, err := readPackIgnore(appPath) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read .packignore: %v", err) |
There was a problem hiding this comment.
It would be nice to have this file name as a const.
cli/pack/common.go
Outdated
| @@ -383,6 +394,16 @@ func prepareBundle(cmdCtx *cmdcontext.CmdCtx, packCtx *PackCtx, | |||
| } | |||
| } | |||
|
|
|||
| projectPath := filepath.Dir(packCtx.configFilePath) | |||
There was a problem hiding this comment.
Let's get if from common context. As I remember, this is ConfigDir member.
cli/pack/common.go
Outdated
| projectPath := filepath.Dir(packCtx.configFilePath) | ||
| ignorePatterns, err := readPackIgnore(projectPath) | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to read .packignore: %v", err) |
There was a problem hiding this comment.
Suggested change
| return "", fmt.Errorf("failed to read .packignore: %v", err) | |
| return "", fmt.Errorf("failed to read .packignore: %s", err) |
cli/pack/ignore.go
Outdated
| } else { | ||
| err = os.Remove(path) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to remove file %q: %v", path, err) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("failed to remove file %q: %v", path, err) | |
| return fmt.Errorf("failed to remove file %q: %s", path, err) |
cli/pack/ignore.go
Outdated
| filePath := filepath.ToSlash(path) | ||
|
|
||
| if strings.HasSuffix(pattern, "/") { | ||
| if strings.HasPrefix(filePath, pattern) { |
There was a problem hiding this comment.
How is it possible for filePath, which is a relative path, to have a prefix with first '/'?
It would be nice to have unit-tests for this function.
| @@ -0,0 +1,4 @@ | |||
| var/lib/inst1 | |||
| var/log | |||
| var/run/inst2/app2.pid | |||
There was a problem hiding this comment.
run_dir should not be copied, even without the .packignore file.
| return fmt.Errorf("failed to read .packignore: %v", err) | ||
| } | ||
|
|
||
| if err = removeIgnoredFiles(appPath, ignorePatterns); err != nil { |
There was a problem hiding this comment.
Looks like we remove files before copying the application. This approach will surprise the user.
We should skip copying such files, not removing them from the source directory.
| @@ -1068,6 +1068,26 @@ func Test_prepareBundle(t *testing.T) { | |||
| {assert.FileExists, "app/tt.yaml"}, | |||
| }, | |||
| }, | |||
| { | |||
| name: "Packing env with packignore", | |||
There was a problem hiding this comment.
There are no tests for ignoring app files/dirs.
Japsty
force-pushed
the
gh-812-tt-pack-allow-to-ignore-paths
branch
7 times, most recently
from
5e2ca12
to
32981d4
Compare
In some cases, there are files that may be useful, but should not be part of artifact. The ability to add files and directories to the .packignore file has been added, which allows you to ignore these files and directories when packing. Closes: [812](tarantool#812)
Japsty
force-pushed
the
gh-812-tt-pack-allow-to-ignore-paths
branch
from
32981d4
to
0d23fde
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In some cases, there are files that may be useful, but should not
be part of artifact. The ability to add files and directories to
the .packignore file has been added, which allows you to ignore
these files and directories when packing.
Closes: 812