Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion backend-config/account_association.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (c *ConfigT) enrichDestinationWithAccounts(dest *DestinationT) {
obskit.DestinationType(dest.DestinationDefinition.Name),
)
if !dest.Enabled {
accountAssociationLogger.Infon("Skipping disabled destination from associating account")
accountAssociationLogger.Debugn("Skipping disabled destination from associating account")
return
}
// Check and set the delivery account if specified in the destination config
Expand Down
21 changes: 20 additions & 1 deletion gateway/webhook/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,25 @@ import (
"github.com/rudderlabs/rudder-server/testhelper/backendconfigtest"
)

func transformerModuleVersion(t *testing.T) string {
t.Helper()
goMod, err := os.ReadFile("../../go.mod")
require.NoError(t, err, "failed to read go.mod")
for line := range strings.SplitSeq(string(goMod), "\n") {
line = strings.TrimSpace(line)
if strings.HasPrefix(line, "github.com/rudderlabs/rudder-transformer/go ") {
// version is like "v1.126.2-beta", strip "v" prefix and any pre-release suffix
v := strings.TrimPrefix(strings.Fields(line)[1], "v")
if i := strings.Index(v, "-"); i != -1 {
v = v[:i]
}
return v
}
}
t.Fatal("github.com/rudderlabs/rudder-transformer/go not found in go.mod")
return ""
}

func TestIntegrationWebhook(t *testing.T) {
ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT)
ctx, cancel := context.WithTimeout(ctx, 3*time.Minute)
Expand All @@ -68,7 +87,7 @@ func TestIntegrationWebhook(t *testing.T) {
})

g.Go(func() (err error) {
transformerContainer, err = transformertest.Setup(pool, t)
transformerContainer, err = transformertest.Setup(pool, t, transformertest.WithDockerImageTag(transformerModuleVersion(t)))
if err != nil {
return fmt.Errorf("starting transformer: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ require (
github.com/rudderlabs/rudder-go-kit v0.74.0
github.com/rudderlabs/rudder-observability-kit v0.0.6
github.com/rudderlabs/rudder-schemas v0.10.0
github.com/rudderlabs/rudder-transformer/go v1.122.0
github.com/rudderlabs/rudder-transformer/go v1.126.2-beta
github.com/rudderlabs/sql-tunnels v0.1.7
github.com/rudderlabs/sqlconnect-go v1.20.3
github.com/samber/lo v1.52.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1211,8 +1211,8 @@ github.com/rudderlabs/rudder-observability-kit v0.0.6 h1:xIA/1Sp38B542EYzxR7qUfN
github.com/rudderlabs/rudder-observability-kit v0.0.6/go.mod h1:nR3GvY7HvuBaBqOKFfzLP9uYZu7OpzMqW2eeT2ikXtU=
github.com/rudderlabs/rudder-schemas v0.10.0 h1:OzhmoV3wIyZG4cH7RtixYEF23VwWaxyIGPKiVZ0XCT0=
github.com/rudderlabs/rudder-schemas v0.10.0/go.mod h1:mb7XxrdYj6iqz5GNbhv4cvmGjMGYgirpQnfm7WPXmyE=
github.com/rudderlabs/rudder-transformer/go v1.122.0 h1:XmCKiSbhj5SMRPPQzyXnx6RnP2FjPnZ4ARXGR4ByrPk=
github.com/rudderlabs/rudder-transformer/go v1.122.0/go.mod h1:3NGitPz4pYRRZ6Xt09S+8hb0tHK/9pZcKJ3OgOTaSmE=
github.com/rudderlabs/rudder-transformer/go v1.126.2-beta h1:HIu5s0RUFGNyQS5Z2tPIWyegkajFgPCTzOfK91gqt4Y=
github.com/rudderlabs/rudder-transformer/go v1.126.2-beta/go.mod h1:3NGitPz4pYRRZ6Xt09S+8hb0tHK/9pZcKJ3OgOTaSmE=
github.com/rudderlabs/sonnet v1.0.2 h1:nPfmDKD9gUwT571Dwtcsx0VIglSchvyNjuRLju4Xs3s=
github.com/rudderlabs/sonnet v1.0.2/go.mod h1:tjQmKEGAo/xwmhw9AwLkazP5b5m8VpUvWNzPSx4ve0g=
github.com/rudderlabs/sql-tunnels v0.1.7 h1:wDCRl6zY4M5gfWazf7XkSTGQS3yjBzUiUgEMBIfHNDA=
Expand Down
Loading