Skip to content

chore: Update generator to create 'data/catalogs' by default #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddie-knight merged 5 commits into from
Oct 13, 2025
Merged

chore: Update generator to create 'data/catalogs' by default #136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0852d15
chore: Update generator to create 'data/catalogs' by default
eddie-knight Oct 12, 2025
d4129fd
ensure unique catalog name in shared dir
eddie-knight Oct 12, 2025
06aba59
typofix
eddie-knight Oct 12, 2025
b5aa1f2
spit out the requirement text in a comment to simplify dev work
eddie-knight Oct 12, 2025
ff0b17c
fixed non-template filepaths
eddie-knight Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ test_output
**/generated-plugin

!.github/ISSUE_TEMPLATE/config.yml

evaluation_results
9 changes: 2 additions & 7 deletions cmd/generate-plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,7 @@ func generateFileFromTemplate(data CatalogData, templatePath, OutputDir string)
}
return out
},
"snake_case": snakeCase,
"simplifiedName": simplifiedName,
"snake_case": snakeCase,
}).Parse(string(templateContent))
if err != nil {
return fmt.Errorf("error parsing template file %s: %w", templatePath, err)
Expand Down Expand Up @@ -240,7 +239,7 @@ func writeCatalogFile(catalog *layer2.Catalog) error {
return fmt.Errorf("error marshaling YAML: %w", err)
}

dirPath := filepath.Join(OutputDir, "data", simplifiedName(catalog.Metadata.Id, catalog.Metadata.Version))
dirPath := filepath.Join(OutputDir, "data", "catalogs")
filePath := filepath.Join(dirPath, "catalog.yaml")

err = os.MkdirAll(dirPath, os.ModePerm)
Expand All @@ -261,10 +260,6 @@ func snakeCase(in string) string {
strings.ReplaceAll(in, ".", "_"), "-", "_"))
}

func simplifiedName(catalogId string, catalogVersion string) string {
return fmt.Sprintf("%s_%s", snakeCase(catalogId), snakeCase(catalogVersion))
}

func copyNonTemplateFile(templatePath, relativePath string) error {
outputPath := filepath.Join(OutputDir, relativePath)
if err := os.MkdirAll(filepath.Dir(outputPath), os.ModePerm); err != nil {
Expand Down
Loading