Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Better file closing

Browse Source
This commit is contained in:
Patrice Ferlet
2022-05-05 10:44:43 +02:00
parent 5f2f27f72b
commit 0a20be9660
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
generator/writer.go
View File

@@ -45,6 +45,8 @@ func Generate(p *compose.Parser, katernayVersion, appName, appVersion, composeFi
// Manage services, avoid linked pods and store all services port in servicesMap // Manage services, avoid linked pods and store all services port in servicesMap
avoids := make(map[string]bool) avoids := make(map[string]bool)
// Manage services to not export
skips := make(map[string]bool) skips := make(map[string]bool)
for _, s := range p.Data.Services { for _, s := range p.Data.Services {
@@ -190,17 +192,24 @@ func Generate(p *compose.Parser, katernayVersion, appName, appVersion, composeFi
} }
} }
// Create the values.yaml file // Create the values.yaml file
fp, _ := os.Create(filepath.Join(dirName, "values.yaml")) valueFile, err := os.Create(filepath.Join(dirName, "values.yaml"))
enc := yaml.NewEncoder(fp) if err != nil {
enc.SetIndent(2) log.Fatal(err)
}
defer valueFile.Close()
enc := yaml.NewEncoder(valueFile)
enc.SetIndent(writers.IndentSize)
enc.Encode(Values) enc.Encode(Values)
fp.Close()
// Create tht Chart.yaml file // Create tht Chart.yaml file
fp, _ = os.Create(filepath.Join(dirName, "Chart.yaml")) chartFile, err := os.Create(filepath.Join(dirName, "Chart.yaml"))
fp.WriteString(`# Create on ` + time.Now().Format(time.RFC3339) + "\n") if err != nil {
fp.WriteString(`# Katenary command line: ` + strings.Join(os.Args, " ") + "\n") log.Fatal(err)
enc = yaml.NewEncoder(fp) }
defer chartFile.Close()
chartFile.WriteString(`# Create on ` + time.Now().Format(time.RFC3339) + "\n")
chartFile.WriteString(`# Katenary command line: ` + strings.Join(os.Args, " ") + "\n")
enc = yaml.NewEncoder(chartFile)
enc.SetIndent(writers.IndentSize) enc.SetIndent(writers.IndentSize)
enc.Encode(map[string]interface{}{ enc.Encode(map[string]interface{}{
"apiVersion": "v2", "apiVersion": "v2",
@@ -210,10 +219,12 @@ func Generate(p *compose.Parser, katernayVersion, appName, appVersion, composeFi
"version": "0.1.0", "version": "0.1.0",
"appVersion": appVersion, "appVersion": appVersion,
}) })
fp.Close()
// And finally, create a NOTE.txt file // And finally, create a NOTE.txt file
fp, _ = os.Create(filepath.Join(templatesDir, "NOTES.txt")) noteFile, err := os.Create(filepath.Join(templatesDir, "NOTES.txt"))
fp.WriteString(helm.GenerateNotesFile(ingresses)) if err != nil {
fp.Close() log.Fatal(err)
}
defer noteFile.Close()
noteFile.WriteString(helm.GenerateNotesFile(ingresses))
} }