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

Jump to bottom

fixes transformer seeds that resulted in them being the same #1953

Merged
merged 1 commit into from
May 10, 2024
Merged

fixes transformer seeds that resulted in them being the same #1953

Show file tree
Hide file tree
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
7 changes: 0 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,3 @@ compose-dev-auth-up:
compose-dev-auth-down:
docker compose -f $(DEV_COMPOSE_FILE) -f $(DEV_AUTH_COMPOSE_FILE) down
.PHONY: compose-dev-auth-down

goworksync:
go work sync
cd worker && go mod tidy
cd cli && go mod tidy
cd backend && go mod tidy
.PHONY: goworksync
17 changes: 14 additions & 3 deletions worker/internal/benthos/transformers/transform_first_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package transformers

import (
"fmt"
"time"

"github.com/benthosdev/benthos/v4/public/bloblang"
transformer_utils "github.com/nucleuscloud/neosync/worker/internal/benthos/transformers/utils"
Expand All @@ -14,7 +13,7 @@ func init() {
Param(bloblang.NewInt64Param("max_length").Default(10000)).
Param(bloblang.NewAnyParam("value").Optional()).
Param(bloblang.NewBoolParam("preserve_length").Default(false)).
Param(bloblang.NewInt64Param("seed").Default(time.Now().UnixNano()))
Param(bloblang.NewInt64Param("seed").Optional())

err := bloblang.RegisterFunctionV2("transform_first_name", spec, func(args *bloblang.ParsedParams) (bloblang.Function, error) {
valuePtr, err := args.GetOptionalString("value")
Expand All @@ -37,10 +36,22 @@ func init() {
return nil, err
}

seed, err := args.GetInt64("seed")
seedArg, err := args.GetOptionalInt64("seed")
if err != nil {
return nil, err
}
var seed int64
if seedArg != nil {
seed = *seedArg
} else {
// we want a bit more randomness here with generate_email so using something that isn't time based
var err error
seed, err = transformer_utils.GenerateCryptoSeed()
if err != nil {
return nil, err
}
}

randomizer := rng.New(seed)

return func() (any, error) {
Expand Down
16 changes: 13 additions & 3 deletions worker/internal/benthos/transformers/transform_float.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"math"
"strconv"
"sync"
"time"

"github.com/benthosdev/benthos/v4/public/bloblang"
transformer_utils "github.com/nucleuscloud/neosync/worker/internal/benthos/transformers/utils"
Expand All @@ -19,7 +18,7 @@ func init() {
Param(bloblang.NewFloat64Param("randomization_range_max")).
Param(bloblang.NewInt64Param("precision").Optional()).
Param(bloblang.NewInt64Param("scale").Optional()).
Param(bloblang.NewInt64Param("seed").Default(time.Now().UnixNano()))
Param(bloblang.NewInt64Param("seed").Optional())

err := bloblang.RegisterFunctionV2("transform_float64", spec, func(args *bloblang.ParsedParams) (bloblang.Function, error) {
value, err := args.Get("value")
Expand All @@ -45,10 +44,21 @@ func init() {
if err != nil {
return nil, err
}
seed, err := args.GetInt64("seed")
seedArg, err := args.GetOptionalInt64("seed")
if err != nil {
return nil, err
}
var seed int64
if seedArg != nil {
seed = *seedArg
} else {
// we want a bit more randomness here with generate_email so using something that isn't time based
var err error
seed, err = transformer_utils.GenerateCryptoSeed()
if err != nil {
return nil, err
}
}
randomizer := rng.New(seed)

maxnumgetter := newMaxNumCache()
Expand Down
17 changes: 14 additions & 3 deletions worker/internal/benthos/transformers/transform_full_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package transformers
import (
"fmt"
"strings"
"time"

"github.com/benthosdev/benthos/v4/public/bloblang"
transformer_utils "github.com/nucleuscloud/neosync/worker/internal/benthos/transformers/utils"
Expand All @@ -15,7 +14,7 @@ func init() {
Param(bloblang.NewInt64Param("max_length").Default(10000)).
Param(bloblang.NewAnyParam("value").Optional()).
Param(bloblang.NewBoolParam("preserve_length").Default(false)).
Param(bloblang.NewInt64Param("seed").Default(time.Now().UnixNano()))
Param(bloblang.NewInt64Param("seed").Optional())

err := bloblang.RegisterFunctionV2("transform_full_name", spec, func(args *bloblang.ParsedParams) (bloblang.Function, error) {
valuePtr, err := args.GetOptionalString("value")
Expand All @@ -38,10 +37,22 @@ func init() {
return nil, err
}

seed, err := args.GetInt64("seed")
seedArg, err := args.GetOptionalInt64("seed")
if err != nil {
return nil, err
}
var seed int64
if seedArg != nil {
seed = *seedArg
} else {
// we want a bit more randomness here with generate_email so using something that isn't time based
var err error
seed, err = transformer_utils.GenerateCryptoSeed()
if err != nil {
return nil, err
}
}

randomizer := rng.New(seed)

return func() (any, error) {
Expand Down
17 changes: 14 additions & 3 deletions worker/internal/benthos/transformers/transform_lastname.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package transformers

import (
"fmt"
"time"

"github.com/benthosdev/benthos/v4/public/bloblang"
transformer_utils "github.com/nucleuscloud/neosync/worker/internal/benthos/transformers/utils"
Expand All @@ -14,7 +13,7 @@ func init() {
Param(bloblang.NewInt64Param("max_length").Default(10000)).
Param(bloblang.NewAnyParam("value").Optional()).
Param(bloblang.NewBoolParam("preserve_length").Default(false)).
Param(bloblang.NewInt64Param("seed").Default(time.Now().UnixNano()))
Param(bloblang.NewInt64Param("seed").Optional())

err := bloblang.RegisterFunctionV2("transform_last_name", spec, func(args *bloblang.ParsedParams) (bloblang.Function, error) {
valuePtr, err := args.GetOptionalString("value")
Expand All @@ -36,10 +35,22 @@ func init() {
return nil, err
}

seed, err := args.GetInt64("seed")
seedArg, err := args.GetOptionalInt64("seed")
if err != nil {
return nil, err
}
var seed int64
if seedArg != nil {
seed = *seedArg
} else {
// we want a bit more randomness here with generate_email so using something that isn't time based
var err error
seed, err = transformer_utils.GenerateCryptoSeed()
if err != nil {
return nil, err
}
}

randomizer := rng.New(seed)

return func() (any, error) {
Expand Down