Skip to content

Commit e4070ec

Browse files
author
Per Goncalves da Silva
committed
Factor FS to RegistryV1 code out of helm conversion
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent d72e551 commit e4070ec

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

internal/rukpak/convert/registryv1.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,24 @@ type Plain struct {
4242
}
4343

4444
func RegistryV1ToHelmChart(ctx context.Context, rv1 fs.FS, installNamespace string, watchNamespaces []string) (*chart.Chart, error) {
45+
reg, err := ParseFS(ctx, rv1)
46+
if err != nil {
47+
return nil, err
48+
}
49+
return toChart(reg, installNamespace, watchNamespaces)
50+
}
51+
52+
func ParseFS(ctx context.Context, rv1 fs.FS) (RegistryV1, error) {
4553
l := log.FromContext(ctx)
4654

4755
reg := RegistryV1{}
4856
annotationsFileData, err := fs.ReadFile(rv1, filepath.Join("metadata", "annotations.yaml"))
4957
if err != nil {
50-
return nil, err
58+
return reg, err
5159
}
5260
annotationsFile := registry.AnnotationsFile{}
5361
if err := yaml.Unmarshal(annotationsFileData, &annotationsFile); err != nil {
54-
return nil, err
62+
return reg, err
5563
}
5664
reg.PackageName = annotationsFile.Annotations.PackageName
5765

@@ -100,14 +108,14 @@ func RegistryV1ToHelmChart(ctx context.Context, rv1 fs.FS, installNamespace stri
100108
}
101109
return nil
102110
}); err != nil {
103-
return nil, err
111+
return reg, err
104112
}
105113

106114
if err := copyMetadataPropertiesToCSV(&reg.CSV, rv1); err != nil {
107-
return nil, err
115+
return reg, err
108116
}
109117

110-
return toChart(reg, installNamespace, watchNamespaces)
118+
return reg, nil
111119
}
112120

113121
// copyMetadataPropertiesToCSV copies properties from `metadata/propeties.yaml` (in the filesystem fsys) into

0 commit comments

Comments
 (0)