-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make passing of files and directories as arguments cohesive across os…
…lo commands (#221) Co-authored-by: Filip Piwowarczyk <[email protected]>
- Loading branch information
1 parent
4aec85d
commit 31ba9f5
Showing
15 changed files
with
262 additions
and
66 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package discoverfiles | ||
|
|
||
| import ( | ||
| "io/fs" | ||
| "os" | ||
| "path" | ||
| "path/filepath" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // RegisterFileRelatedFlags registers flags --file | -f and --recursive | -R for command | ||
| // passed as the argument and make them required. | ||
| func RegisterFileRelatedFlags(cmd *cobra.Command, filePaths *[]string, recursive *bool) { | ||
| const fileFlag = "file" | ||
| cmd.Flags().StringArrayVarP( | ||
| filePaths, fileFlag, "f", []string{}, | ||
| "The file(s) that contain the configurations.", | ||
| ) | ||
| if err := cmd.MarkFlagRequired(fileFlag); err != nil { | ||
| panic(err) | ||
| } | ||
| cmd.Flags().BoolVarP( | ||
| recursive, "recursive", "R", false, | ||
| "Process the directory used in -f, --filename recursively. Useful when you want to manage related manifests organized within the same directory.", //nolint:lll | ||
| ) | ||
| } | ||
|
|
||
| // DiscoverFilePaths returns all file paths that come from file paths provided as the argument. | ||
| // Return directly if they are standard files. For directories list all files available in its | ||
| // root or recursively traverse all subdirectories and find files in them when the argument recursive | ||
| // is true. For path "-" that indicates standard input return it directly in the same way as other paths. | ||
| func DiscoverFilePaths(filePaths []string, recursive bool) ([]string, error) { //nolint:cyclop | ||
| var discoveredPaths []string | ||
| for _, p := range filePaths { | ||
| // Indicates that a file should be read from standard input. | ||
| // Code that consumes file paths needs to handle "-" | ||
| // by reading from os.Stdin in such case. | ||
| if p == "-" { | ||
| discoveredPaths = append(discoveredPaths, p) | ||
| continue | ||
| } | ||
|
|
||
| // When path is valid and it's not a directory, use it directly. | ||
| fInfo, err := os.Stat(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if !fInfo.IsDir() { | ||
| discoveredPaths = append(discoveredPaths, p) | ||
| continue | ||
| } | ||
|
|
||
| // When recursive is true and the path is a directory, | ||
| // discover all files in it and its subdirectories. | ||
| if recursive { | ||
| if walkErr := filepath.Walk(p, func(path string, info fs.FileInfo, err error) error { | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if !info.IsDir() { | ||
| discoveredPaths = append(discoveredPaths, path) | ||
| } | ||
| return nil | ||
| }); walkErr != nil { | ||
| return nil, walkErr | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| // When recursive is false and the path is a directory, | ||
| // get only paths for files in the root of it. | ||
| entries, err := os.ReadDir(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| for _, e := range entries { | ||
| if !e.IsDir() { | ||
| discoveredPaths = append(discoveredPaths, path.Join(p, e.Name())) | ||
| } | ||
| } | ||
| } | ||
| return discoveredPaths, nil | ||
| } |
Oops, something went wrong.