@@ -28,6 +28,7 @@ const (
2828 AssetTypeKibanaVisualization AssetType = "visualization"
2929 AssetTypeKibanaDashboard AssetType = "dashboard"
3030 AssetTypeKibanaMap AssetType = "map"
31+ AssetTypeKibanaLens AssetType = "lens"
3132)
3233
3334// Asset represents a package asset to be loaded into Kibana or Elasticsearch.
@@ -56,31 +57,27 @@ func LoadPackageAssets(pkgRootPath string) ([]Asset, error) {
5657func loadKibanaAssets (pkgRootPath string ) ([]Asset , error ) {
5758 kibanaAssetsFolderPath := filepath .Join (pkgRootPath , "kibana" )
5859
59- var errs multierror.Error
60+ var (
61+ errs multierror.Error
6062
61- assets , err := loadFileBasedAssets (kibanaAssetsFolderPath , AssetTypeKibanaDashboard )
62- if err != nil {
63- errs = append (errs , errors .Wrap (err , "could not load kibana dashboard assets" ))
64- }
63+ assetTypes = []AssetType {
64+ AssetTypeKibanaDashboard ,
65+ AssetTypeKibanaVisualization ,
66+ AssetTypeKibanaSavedSearch ,
67+ AssetTypeKibanaMap ,
68+ AssetTypeKibanaLens ,
69+ }
6570
66- a , err := loadFileBasedAssets (kibanaAssetsFolderPath , AssetTypeKibanaVisualization )
67- if err != nil {
68- errs = append (errs , errors .Wrap (err , "could not load kibana visualization assets" ))
69- } else {
70- assets = append (assets , a ... )
71- }
71+ assets []Asset
72+ )
7273
73- a , err = loadFileBasedAssets ( kibanaAssetsFolderPath , AssetTypeKibanaSavedSearch )
74- if err != nil {
75- errs = append ( errs , errors . Wrap ( err , "could not load kibana saved search assets" ))
76- } else {
77- assets = append ( assets , a ... )
78- }
74+ for _ , assetType := range assetTypes {
75+ a , err := loadFileBasedAssets ( kibanaAssetsFolderPath , assetType )
76+ if err != nil {
77+ errs = append ( errs , errors . Wrapf ( err , "could not load kibana %s assets" , assetType ))
78+ continue
79+ }
7980
80- a , err = loadFileBasedAssets (kibanaAssetsFolderPath , AssetTypeKibanaMap )
81- if err != nil {
82- errs = append (errs , errors .Wrap (err , "could not load kibana map assets" ))
83- } else {
8481 assets = append (assets , a ... )
8582 }
8683
0 commit comments