Skip to content

Commit

Permalink
fix: Support default CR starting with dashes (#149)
Browse files Browse the repository at this point in the history
* Support default CR starting with dashes

* Fix linting

* Fix tests

* Bump template operator test coverage

* Revert "Bump template operator test coverage"

This reverts commit 49c087e.

* Trigger_pipelines

* Chris' comment
  • Loading branch information
nesmabadr authored Jan 31, 2025
1 parent 03aff4a commit 1f95f05
Show file tree
Hide file tree
Showing 2 changed files with 287 additions and 289 deletions.
20 changes: 19 additions & 1 deletion internal/service/templategenerator/templategenerator.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ func (s *Service) GenerateModuleTemplate(
}

if len(data) > 0 {
mtData.Data = string(data)
crData, err := parseDefaultCRYaml(data)
if err != nil {
return fmt.Errorf("failed to parse cr data: %w", err)
}
mtData.Data = string(crData)
}

for name, link := range moduleConfig.Resources {
Expand All @@ -204,6 +208,20 @@ func (s *Service) GenerateModuleTemplate(
return nil
}

func parseDefaultCRYaml(data []byte) ([]byte, error) {
var crData map[string]interface{}
if err := yaml.Unmarshal(data, &crData); err != nil {
return nil, fmt.Errorf("failed to unmarshal cr data: %w", err)
}

cr, err := yaml.Marshal(crData)
if err != nil {
return nil, fmt.Errorf("failed to marshal cr data yaml: %w", err)
}

return cr, nil
}

func generateLabels(config *contentprovider.ModuleConfig) map[string]string {
labels := config.Labels

Expand Down
Loading

0 comments on commit 1f95f05

Please sign in to comment.