From c02cd538b6bd552adeea114d25b39be1505f71d3 Mon Sep 17 00:00:00 2001 From: AlteredCoder Date: Mon, 25 May 2020 15:32:15 +0200 Subject: [PATCH] move dataset to types --- pkg/cwhub/hubMgmt.go | 5 +++-- pkg/{cwhub/utils.go => types/dataset.go} | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename pkg/{cwhub/utils.go => types/dataset.go} (97%) diff --git a/pkg/cwhub/hubMgmt.go b/pkg/cwhub/hubMgmt.go index 4f61e96a3..ca6f7dd8d 100644 --- a/pkg/cwhub/hubMgmt.go +++ b/pkg/cwhub/hubMgmt.go @@ -16,6 +16,7 @@ import ( "path/filepath" "strings" + "github.com/crowdsecurity/crowdsec/pkg/types" "github.com/enescakir/emoji" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" @@ -751,7 +752,7 @@ func DownloadItem(target Item, tdir string, overwrite bool, dataFolder string) ( log.Infof("Installing : %+v \n", string(body)) dec := yaml.NewDecoder(bytes.NewReader(body)) for { - data := &dataSet{} + data := &types.DataSet{} err = dec.Decode(data) if err != nil { if err == io.EOF { @@ -760,7 +761,7 @@ func DownloadItem(target Item, tdir string, overwrite bool, dataFolder string) ( return target, fmt.Errorf("unable to read file %s data: %s", tdir+"/"+target.RemotePath, err) } } - err = getData(data.Data, dataFolder) + err = types.getData(data.Data, dataFolder) if err != nil { return target, fmt.Errorf("unable to get data: %s", err) } diff --git a/pkg/cwhub/utils.go b/pkg/types/dataset.go similarity index 97% rename from pkg/cwhub/utils.go rename to pkg/types/dataset.go index 493097b78..c53bd1310 100644 --- a/pkg/cwhub/utils.go +++ b/pkg/types/dataset.go @@ -1,4 +1,4 @@ -package cwhub +package types import ( "fmt" @@ -15,7 +15,7 @@ type dataSource struct { DestPath string `yaml:"dest_file"` } -type dataSet struct { +type DataSet struct { Data []*dataSource `yaml:"data",omitempty` }