-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Ensure we properly setup all data directories on app install and creation #5571
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.
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
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6cbe93c
refactor: move all golang code for managing data directories to commo…
josegonzalez 0aa194e
fix: add missing docs
josegonzalez fd765c6
feat: add missing modules
josegonzalez 199c9bf
chore: update go modules
josegonzalez 47fb8e2
fix: add missing triggers
josegonzalez ffa9f85
chore: run go mod tidy
josegonzalez 05c6cec
tests: use `run` to invoke functions in tests
josegonzalez 93279b8
tests: create the app before extracting tls data during tests
josegonzalez 0b45aea
fix: just create the data directory if the old data directory doesn't…
josegonzalez eeb2e69
fix: only create the test app if it doesn't exist for tls tests
josegonzalez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/otiai10/copy" | ||
| ) | ||
|
|
||
| // CreateAppDataDirectory creates a data directory for the given plugin/app combination with the correct permissions | ||
| func CreateAppDataDirectory(pluginName, appName string) error { | ||
| directory := GetAppDataDirectory(pluginName, appName) | ||
| if err := os.MkdirAll(directory, 0755); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := SetPermissions(directory, 0755); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // CreateDataDirectory creates a data directory for the given plugin/app combination with the correct permissions | ||
| func CreateDataDirectory(pluginName string) error { | ||
| directory := GetDataDirectory(pluginName) | ||
| if err := os.MkdirAll(directory, 0755); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := SetPermissions(directory, 0755); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // GetAppDataDirectory returns the path to the data directory for the given plugin/app combination | ||
| func GetAppDataDirectory(pluginName string, appName string) string { | ||
| return filepath.Join(GetDataDirectory(pluginName), appName) | ||
| } | ||
|
|
||
| // GetDataDirectory returns the path to the data directory for the specified plugin | ||
| func GetDataDirectory(pluginName string) string { | ||
| return filepath.Join(MustGetEnv("DOKKU_LIB_ROOT"), "data", pluginName) | ||
| } | ||
|
|
||
| // RemoveAppDataDirectory removes the path to the data directory for the given plugin/app combination | ||
| func RemoveAppDataDirectory(pluginName, appName string) error { | ||
| return os.RemoveAll(GetAppDataDirectory(pluginName, appName)) | ||
| } | ||
|
|
||
| // CloneAppData copies the data from one app to another | ||
| func CloneAppData(pluginName string, oldAppName string, newAppName string) error { | ||
| oldDataDir := GetAppDataDirectory(pluginName, oldAppName) | ||
| if !DirectoryExists(oldDataDir) { | ||
| return CreateAppDataDirectory(pluginName, newAppName) | ||
| } | ||
|
|
||
| newDataDir := GetAppDataDirectory(pluginName, newAppName) | ||
| if err := copy.Copy(oldDataDir, newDataDir); err != nil { | ||
| return fmt.Errorf("Unable to clone app data to new location: %v", err.Error()) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // SetupAppData ensures each app has a data directory | ||
| func SetupAppData(pluginName string) error { | ||
| if err := CreateDataDirectory(pluginName); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| apps, err := UnfilteredDokkuApps() | ||
| if err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| for _, appName := range apps { | ||
| if err := CreateAppDataDirectory(pluginName, appName); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.