Make templates parsing follow directory tree #233
Conversation
pkg/config/config.go
Outdated
| } else { | ||
| // Be compatible when given a single file | ||
| // -> mock an FS containing only that file | ||
| var err error | ||
| var content []byte | ||
| content, err = os.ReadFile(*tplDirName) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("reading template file %q: %w", *tplDirName, err) | ||
| } | ||
| tplDirFs = fstest.MapFS{fInfo.Name(): {Data: content}} | ||
| } |
There was a problem hiding this comment.
There may be a better way to do this.
From what I've read fstest.MapFS is actually intended for mocking files and dir trees for tests.
This is done to keep compatibility with providing a single file to --template
pkg/config/config.go
Outdated
| if len(dirEntries) == 1 && !dirEntries[0].IsDir() { | ||
| var content []byte | ||
| content, err = fs.ReadFile(tplDirFs, dirEntries[0].Name()) | ||
| if err != nil { | ||
| return fmt.Errorf("reading single template file %q: %w", dirEntries[0].Name(), err) | ||
| } | ||
| tplDirFs = fstest.MapFS{cfg.Filename: {Data: content}} | ||
| } |
There was a problem hiding this comment.
Similar to the one above, but this is to keep compatibility with the filename config key.
When there is more than one file being templated filename will be ignored. Instead the output files will keep the names of the template files.
|
@normanjaeckel We are currently testing around with setting up OpenSlides on k3s. As with k3s deployment definitions are much more verbose, having them all in just one file (as currently done with the |
pkg/config/config.go
Outdated
| content, err = fs.ReadFile(tplDirFs, dirEntries[0].Name()) | ||
| if err != nil { | ||
| return "", err | ||
| return fmt.Errorf("reading single template file %q: %w", dirEntries[0].Name(), err) |
There was a problem hiding this comment.
This is probably not good.
The filename config parameter should be obsoleted with these changes.
We may introduce a parameter like outputDirectory for resulting files after executing templates.
New funtions: - base64Encode - base64Decode - readFile Also added $.WorkingDirectory variable containing the directory passed by the user as positional argument.
... when creating template object
|
We discussed this feature: The flag |
|
@peb-adr Please review. |
peb-adr
left a comment
peb-adr
left a comment
There was a problem hiding this comment.
Found some remnants of "technology"
Also while testing I found a few more details in behavior that seem to cause incompatibilities. I'll have to digest that further and will then comment them seperately
|
@peb-adr All done. |
3 participants
No description provided.