Skip to content
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

🐛 Fix providers-sdk configure to support providers with dashes in their name. #2085

Merged
merged 1 commit into from
Oct 5, 2023
Merged

🐛 Fix providers-sdk configure to support providers with dashes in their name. #2085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions providers-sdk/v1/util/configure/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ func genBuiltinGo(conf ProvidersConf) ([]byte, error) {
var configs string

for _, provider := range conf.Builtin {
imports += fmt.Sprintf("\t%sconf \"go.mondoo.com/cnquery/providers/%s/config\"\n", provider, provider)
imports += fmt.Sprintf("\t%s \"go.mondoo.com/cnquery/providers/%s/provider\"\n", provider, provider)
// imports cannot contain dashes
trimProvider := strings.Replace(provider, "-", "", -1)
imports += fmt.Sprintf("\t%sconf \"go.mondoo.com/cnquery/providers/%s/config\"\n", trimProvider, provider)
imports += fmt.Sprintf("\t%s \"go.mondoo.com/cnquery/providers/%s/provider\"\n", trimProvider, provider)
infos += fmt.Sprintf(
"//go:embed %s.resources.json\n"+
"var %sInfo []byte\n",
provider, provider)
provider, trimProvider)
configs += fmt.Sprintf(`
builtinProviders[%sconf.Config.ID] = &builtinProvider{
Runtime: &RunningProvider{
Expand All @@ -89,7 +91,7 @@ func genBuiltinGo(conf ProvidersConf) ([]byte, error) {
},
Config: &%sconf.Config,
}
`, provider, provider, provider, provider, provider, provider, provider)
`, trimProvider, trimProvider, trimProvider, trimProvider, provider, trimProvider, trimProvider)
}

res := fmt.Sprintf(template, imports, infos, configs)
Expand Down