Skip to content

Commit 2152b92

Browse files
committed
fix
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
1 parent 72b6488 commit 2152b92

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

internal/pkg/generator/write.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ func writeFile(opts Options, dest string, content []byte) error {
4242
}
4343

4444
func writePresets(opts Options, clusterName string) error {
45-
for path, content := range generated.PresetFiles {
45+
presetFiles, err := generated.PresetFiles()
46+
if err != nil {
47+
return fmt.Errorf("failed to get preset files: %w", err)
48+
}
49+
for path, content := range presetFiles {
4650

4751
parts := strings.SplitN(path, "/", 2)
4852
chartName := parts[0]

internal/pkg/ui/initwizard/generate.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,11 @@ func GenerateFromTUI(data *InitData) error {
109109
//
110110

111111
func isValidPreset(preset string) bool {
112-
for _, p := range generated.AvailablePresets {
112+
presets, err := generated.AvailablePresets()
113+
if err != nil {
114+
return false
115+
}
116+
for _, p := range presets {
113117
if p == preset {
114118
return true
115119
}
@@ -128,7 +132,11 @@ func writeSecretsBundleToFile(bundle *secrets.Bundle) error {
128132

129133
func writePresetCharts(data *InitData) error {
130134
log.Printf("DEBUG writePresetCharts: Starting for preset %s", data.Preset)
131-
for path, content := range generated.PresetFiles {
135+
presetFiles, err := generated.PresetFiles()
136+
if err != nil {
137+
return fmt.Errorf("failed to get preset files: %w", err)
138+
}
139+
for path, content := range presetFiles {
132140
parts := strings.SplitN(path, "/", 2)
133141
if len(parts) < 2 {
134142
continue
@@ -264,7 +272,11 @@ func formatFileContent(content, filePath string, data *InitData) string {
264272
}
265273

266274
func writeTalmLibraryChart() error {
267-
for path, content := range generated.PresetFiles {
275+
presetFiles, err := generated.PresetFiles()
276+
if err != nil {
277+
return fmt.Errorf("failed to get preset files: %w", err)
278+
}
279+
for path, content := range presetFiles {
268280
parts := strings.SplitN(path, "/", 2)
269281
if len(parts) < 2 {
270282
continue

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func init() {
8888

8989
// Load config after root detection (skip for init and completion commands)
9090
cmdName := cmd.Use
91-
if !strings.HasPrefix(cmdName, "init") && !strings.HasPrefix(cmdName, "completion") {
91+
if !strings.HasPrefix(cmdName, "init") && !strings.HasPrefix(cmdName, "completion") && !strings.HasPrefix(cmdName, "interactive") {
9292
configFile := filepath.Join(commands.Config.RootDir, "Chart.yaml")
9393
if err := loadConfig(configFile); err != nil {
9494
return fmt.Errorf("error loading configuration: %w", err)

0 commit comments

Comments
 (0)