Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Commit

Permalink
feat: Support for access tokens injected by the `Backup Maker Operato…
Browse files Browse the repository at this point in the history
…r` just before the build starts / riotkit-org/backup-repository#299
  • Loading branch information
B&R committed Nov 1, 2023
1 parent 7d35921 commit 723c232
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/generate/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ func (t *Templating) buildTemplatesDir() string {
paths := []string{
"~/.bm/chart/user",
"~/.bm/chart/.base",
"./generate/chart", // unit tests
"./chart", // unit tests
"./pkg/generate/chart", // unit tests
"./chart", // unit tests
}

for _, path := range paths {
Expand Down
8 changes: 4 additions & 4 deletions pkg/generate/templating.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ func (t *Templating) RenderTemplate(name string, operation string, cfg *Computed

func (t *Templating) findTemplateFile(filename string, operation string) string {
paths := []string{
"./generate/templates/" + operation + "/" + filename, // unit tests
"./templates/" + operation + "/" + filename, // unit tests
"./pkg/generate/templates/" + operation + "/" + filename, // unit tests
"./templates/" + operation + "/" + filename, // unit tests
GetFilesHomePath() + "/templates/user/" + operation + "/" + filename,
GetFilesHomePath() + "/templates/.base/" + operation + "/" + filename,
}
Expand All @@ -142,8 +142,8 @@ func (t *Templating) findTemplateFile(filename string, operation string) string
// findTemplateDefinition is loading template definition JSON file in order - first from local files, then from BM_HOME path
func (t *Templating) findTemplateDefinition(name string) (TemplateDefinition, error) {
paths := []string{
"./generate/templates/definition/" + name + ".json", // unit tests
"./templates/definition/" + name + ".json", // unit tests
"./pkg/generate/templates/definition/" + name + ".json", // unit tests
"./templates/definition/" + name + ".json", // unit tests
GetFilesHomePath() + "/templates/user/definition/" + name + ".json",
GetFilesHomePath() + "/templates/.base/definition/" + name + ".json",
}
Expand Down

0 comments on commit 723c232

Please sign in to comment.