-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: YAML support and more filenames (#158)
* Add YAML support * Fix nil pointer when `--name` is passed --------- Closes #154 Closes #157 Signed-off-by: AlexNg <[email protected]>
- Loading branch information
Showing
39 changed files
with
1,003 additions
and
791 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
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 |
|---|---|---|
| @@ -1,45 +1,48 @@ | ||
| package template | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "encoding/json" | ||
| "os" | ||
| "io" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/caffeine-addictt/waku/internal/log" | ||
| "github.com/caffeine-addictt/waku/pkg/config" | ||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| func ParseConfig(filePath string) (*config.TemplateJson, error) { | ||
| file, err := os.Open(filepath.Clean(filePath)) | ||
| func ParseConfig(filePath string) (string, *config.TemplateJson, error) { | ||
| path, file, err := GetWakuConfig(filePath) | ||
| if err != nil { | ||
| return nil, err | ||
| return "", nil, err | ||
| } | ||
| defer file.Close() | ||
|
|
||
| var template config.TemplateJson | ||
| var jsonData string | ||
|
|
||
| // Read the entire file content | ||
| scanner := bufio.NewScanner(file) | ||
| for scanner.Scan() { | ||
| jsonData += scanner.Text() | ||
| } | ||
|
|
||
| if err := scanner.Err(); err != nil { | ||
| return nil, err | ||
| log.Debugf("reading config file at %v\n", filePath) | ||
| data, err := io.ReadAll(file) | ||
| if err != nil { | ||
| return "", nil, err | ||
| } | ||
|
|
||
| // Unmarshal JSON data | ||
| log.Debugln("Unmarshalling JSON data from " + filePath) | ||
| if err := json.Unmarshal([]byte(jsonData), &template); err != nil { | ||
| return nil, err | ||
| var template config.TemplateJson | ||
| if strings.HasSuffix(path, "json") { | ||
| log.Debugln("unmarshalling JSON data from " + path) | ||
| if err := json.Unmarshal(data, &template); err != nil { | ||
| return "", nil, err | ||
| } | ||
| } else { | ||
| log.Debugln("unmarshalling YAML data from " + path) | ||
| if err := yaml.Unmarshal(data, &template); err != nil { | ||
| return "", nil, err | ||
| } | ||
| } | ||
|
|
||
| log.Debugf("Unmarshalled JSON data: %+v\n", template) | ||
| log.Infoln("Validating JSON data from " + filePath) | ||
| if err := template.Validate(filepath.Dir(filePath)); err != nil { | ||
| return nil, err | ||
| log.Debugf("unmarshalled data: %+v\n", template) | ||
| log.Infoln("validating data from " + path) | ||
| if err := template.Validate(filepath.Dir(path)); err != nil { | ||
| return "", nil, err | ||
| } | ||
|
|
||
| return &template, nil | ||
| return path, &template, nil | ||
| } |
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
Oops, something went wrong.