Skip to content

Commit

Permalink
Merge branch 'main' into feat-parquet-support
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienaury authored Oct 3, 2024
2 parents 961d61e + 3619954 commit cc56c9b
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 44 deletions.
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/cgi-fr/pimo

go 1.22

toolchain go1.22.2
go 1.23

require (
github.com/CGI-FR/xixo v0.1.8
Expand Down
3 changes: 1 addition & 2 deletions pkg/ff1/ff1.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ func (ff1m MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.E
return nil, err
}

//nolint: gosec
radix := int(ff1m.radix)
radix := int(ff1m.radix) //nolint:gosec
value := e.(string)
var preserved map[int]rune
if len(ff1m.domain) > 0 {
Expand Down
3 changes: 1 addition & 2 deletions pkg/findincsv/findincsv.go
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error

h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec

if len(conf.Masking.Mask.FindInCSV.URI) != 0 {
mask, err := NewMask(conf.Masking.Mask.FindInCSV, conf.Seed, seeder)
Expand Down
2 changes: 1 addition & 1 deletion pkg/hashcsv/hashcsv.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
conf.Seed += int64(h.Sum64()) //nolint: gosec
conf.Seed += int64(h.Sum64()) //nolint:gosec

if len(conf.Masking.Mask.HashInCSV.URI) != 0 {
mask, err := NewMask(conf.Masking.Mask.HashInCSV, conf.Seed, seeder)
Expand Down
2 changes: 1 addition & 1 deletion pkg/markov/markov.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
if len(conf.Masking.Mask.Markov.Sample) != 0 {
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
conf.Seed += int64(h.Sum64()) //nolint: gosec
conf.Seed += int64(h.Sum64()) //nolint:gosec
mask, err := NewMask(conf.Seed, model.NewSeeder(conf.Masking.Seed.Field, conf.Seed), conf.Masking.Mask.Markov.Sample,
conf.Masking.Mask.Markov.Separator,
conf.Masking.Mask.Markov.MaxSize,
Expand Down
3 changes: 1 addition & 2 deletions pkg/model/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,7 @@ func NewSeeder(sourceField string, seed int64) Seeder {
}
hash.Reset()
_, err := hash.Write([]byte(fmt.Sprintf("%v", e)))
//nolint: gosec
return int64(hash.Sum64()) + seed, true, err
return int64(hash.Sum64()) + seed, true, err //nolint:gosec
}
} else {
seeder = func(context Dictionary) (int64, bool, error) {
Expand Down
3 changes: 1 addition & 2 deletions pkg/pipe/pipe.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskContextEngine, bool
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
mask, err := NewMask(conf.Seed, conf.Masking.Mask.Pipe.InjectParent, conf.Masking.Mask.Pipe.InjectRoot, conf.Cache, conf.Functions, conf.Masking.Mask.Pipe.DefinitionFile, conf.Masking.Mask.Pipe.Masking...)
if err != nil {
return mask, true, err
Expand Down
2 changes: 1 addition & 1 deletion pkg/randdate/randdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
conf.Seed += int64(h.Sum64()) //nolint: gosec
conf.Seed += int64(h.Sum64()) //nolint:gosec
return NewMask(conf.Masking.Mask.RandDate.DateMin, conf.Masking.Mask.RandDate.DateMax, conf.Seed, seeder), true, nil
}
return nil, false, nil
Expand Down
3 changes: 1 addition & 2 deletions pkg/randdura/randdura.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
mask, err := NewMask(conf.Masking.Mask.RandomDuration.Min, conf.Masking.Mask.RandomDuration.Max, conf.Seed, seeder)
if err != nil {
return nil, false, err
Expand Down
3 changes: 1 addition & 2 deletions pkg/randomcsv/randomcsv.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec

if len(conf.Masking.Mask.RandomChoiceInCSV.URI) != 0 {
mask, err := NewMask(conf.Masking.Mask.RandomChoiceInCSV, conf.Seed, seeder)
Expand Down
3 changes: 1 addition & 2 deletions pkg/randomdecimal/randomdecimal.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
return NewMask(conf.Masking.Mask.RandomDecimal.Min, conf.Masking.Mask.RandomDecimal.Max, conf.Masking.Mask.RandomDecimal.Precision, conf.Seed, seeder), true, nil
}
return nil, false, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/randomint/randomint.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
conf.Seed += int64(h.Sum64()) //nolint: gosec
conf.Seed += int64(h.Sum64()) //nolint:gosec
return NewMask(conf.Masking.Mask.RandomInt.Min, conf.Masking.Mask.RandomInt.Max, conf.Seed, seeder), true, nil
}
return nil, false, nil
Expand Down
3 changes: 1 addition & 2 deletions pkg/randomlist/randomlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec

if len(conf.Masking.Mask.RandomChoice) != 0 {
return NewMask(conf.Masking.Mask.RandomChoice, conf.Seed, seeder), true, nil
Expand Down
3 changes: 1 addition & 2 deletions pkg/randomuri/randomuri.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec

if len(conf.Masking.Mask.RandomChoiceInURI) != 0 {
mask, err := NewMask(conf.Masking.Mask.RandomChoiceInURI, conf.Seed, seeder)
Expand Down
3 changes: 1 addition & 2 deletions pkg/rangemask/rangemask.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ func Func(seed int64, seedField string) interface{} {
case int8:
scale = int(typedscale)
case uint:
//nolint: gosec
scale = int(typedscale)
scale = int(typedscale) //nolint:gosec
case uint64:
if typedscale > math.MaxInt {
return nil, errors.New("scale is out of range")
Expand Down
3 changes: 1 addition & 2 deletions pkg/regex/regex.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec

mask, err := NewMask(conf.Masking.Mask.Regex, conf.Seed, seeder)
if err != nil {
Expand Down
6 changes: 2 additions & 4 deletions pkg/sha3/sha3.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ func NewMask(length int, resistance int, domain string, maxstrlen int, seed int6
err = checkMaximumStringLen(maxstrlen, length, domain)
}
salt := make([]byte, 0, 16)
//nolint: gosec
salt = binary.LittleEndian.AppendUint64(salt, uint64(seed))
salt = binary.LittleEndian.AppendUint64(salt, uint64(seed)) //nolint:gosec
return MaskEngine{
length: length,
domain: domain,
Expand All @@ -73,8 +72,7 @@ func (me MaskEngine) Mask(e model.Entry, context ...model.Dictionary) (model.Ent
return nil, err
}
if ok {
//nolint: gosec
salt = binary.LittleEndian.AppendUint64(me.salt, uint64(seed))
salt = binary.LittleEndian.AppendUint64(me.salt, uint64(seed)) //nolint:gosec
}
}

Expand Down
3 changes: 1 addition & 2 deletions pkg/timeline/timeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
mask, err := NewMask(conf.Masking.Mask.TimeLine, conf.Seed, seeder)
if err != nil {
return nil, false, err
Expand Down
3 changes: 1 addition & 2 deletions pkg/transcode/transcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
if conf.Masking.Mask.Transcode != nil {
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
if classes := conf.Masking.Mask.Transcode.Classes; len(classes) > 0 {
return NewMask(classes, conf.Seed, seeder), true, nil
}
Expand Down
9 changes: 3 additions & 6 deletions pkg/weightedchoice/weightedchoice.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ func NewChooser(seed int64, cs ...Choice) Chooser {
totals := make([]int, len(cs))
runningTotal := 0
for i, c := range cs {
//nolint: gosec
runningTotal += int(c.Weight)
runningTotal += int(c.Weight) //nolint:gosec
totals[i] = runningTotal
}
// nolint: gosec
Expand Down Expand Up @@ -111,8 +110,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
// set differents seeds for differents jsonpath
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
//nolint: gosec
conf.Seed += int64(h.Sum64())
conf.Seed += int64(h.Sum64()) //nolint:gosec
return NewMask(maskWeight, conf.Seed, seeder), true, nil
}
return nil, false, nil
Expand All @@ -123,8 +121,7 @@ func Func(seed int64, seedField string) interface{} {
return func(choices_ map[string]interface{}) (model.Entry, error) {
choices := make([]model.WeightedChoiceType, len(choices_))
for k, v := range choices_ {
//nolint: gosec
choices = append(choices, model.WeightedChoiceType{Choice: k, Weight: uint(v.(int))})
choices = append(choices, model.WeightedChoiceType{Choice: k, Weight: uint(v.(int))}) //nolint:gosec
}
mask := NewMask(choices, seed+callnumber, model.NewSeeder(seedField, seed+callnumber))
callnumber++
Expand Down
2 changes: 1 addition & 1 deletion pkg/xml/xml.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func Factory(conf model.MaskFactoryConfiguration) (model.MaskEngine, bool, error
if len(conf.Masking.Mask.XML.XPath) > 0 && len(conf.Masking.Mask.XML.Masking) > 0 {
h := fnv.New64a()
h.Write([]byte(conf.Masking.Selector.Jsonpath))
conf.Seed += int64(h.Sum64()) //nolint: gosec
conf.Seed += int64(h.Sum64()) //nolint:gosec
mask, err := NewMask(conf.Masking.Mask.XML.XPath, conf.Masking.Mask.XML.InjectParent, conf.Cache, conf.Functions, conf.Seed, conf.Masking.Mask.XML.Masking...)
if err != nil {
log.Err(err).Msg("Error during factoring XML mask")
Expand Down

0 comments on commit cc56c9b

Please sign in to comment.