Simplify ParseOrUse.

mondoohq · Feb 22, 2024 · 6f28c2b · 6f28c2b
1 parent 4a73cd9
commit 6f28c2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/apps/cnspec/cmd/scan.go b/apps/cnspec/cmd/scan.go
@@ -228,7 +228,7 @@ func getCobraScanConfig(cmd *cobra.Command, runtime *providers.Runtime, cliRes *
  cliRes.Asset.Name = assetName
  }
 
- inv, err := inventoryloader.ParseOrUse(func() *inventory.Asset { return cliRes.Asset }, viper.GetBool("insecure"), optAnnotations)
+ inv, err := inventoryloader.ParseOrUse(cliRes.Asset, viper.GetBool("insecure"), optAnnotations)
  if err != nil {
  log.Fatal().Err(err).Msg("failed to parse inventory")
  }

diff --git a/apps/cnspec/cmd/serve.go b/apps/cnspec/cmd/serve.go
@@ -180,17 +180,14 @@ func getServeConfig() (*scanConfig, *cnspec_config.CliConfig, error) {
  }
  var err error
 
- assetFn := func() *inventory.Asset {
- log.Info().Msg("configure inventory to scan local operating system")
- return &inventory.Asset{
- Connections: []*inventory.Config{{
- Type: "local",
- }},
- Annotations: optAnnotations,
- }
+ asset := &inventory.Asset{
+ Connections: []*inventory.Config{{
+ Type: "local",
+ }},
+ Annotations: optAnnotations,
  }
 
- conf.Inventory, err = inventoryloader.ParseOrUse(assetFn, viper.GetBool("insecure"), optAnnotations)
+ conf.Inventory, err = inventoryloader.ParseOrUse(asset, viper.GetBool("insecure"), optAnnotations)
  if err != nil {
  return nil, nil, errors.Wrap(err, "could not load configuration")
  }