Move batch transformations under the transform umbrella

cmd/aws/cli/main.go

@@ -14,12 +14,12 @@ package main
 import (
 	"github.com/snowplow/snowbridge/cmd/cli"
 	"github.com/snowplow/snowbridge/config"
-	"github.com/snowplow/snowbridge/pkg/batchtransform/batchtransformconfig"
 	kafkasource "github.com/snowplow/snowbridge/pkg/source/kafka"
 	kinesissource "github.com/snowplow/snowbridge/pkg/source/kinesis"
 	pubsubsource "github.com/snowplow/snowbridge/pkg/source/pubsub"
 	sqssource "github.com/snowplow/snowbridge/pkg/source/sqs"
 	stdinsource "github.com/snowplow/snowbridge/pkg/source/stdin"
+	"github.com/snowplow/snowbridge/pkg/transform/batch/batchtransformconfig"
 	"github.com/snowplow/snowbridge/pkg/transform/single/transformconfig"
 )
 

cmd/cli/cli.go

@@ -28,15 +28,15 @@ import (
 
 	"github.com/snowplow/snowbridge/cmd"
 	"github.com/snowplow/snowbridge/config"
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
-	"github.com/snowplow/snowbridge/pkg/batchtransform/batchtransformconfig"
 	"github.com/snowplow/snowbridge/pkg/failure/failureiface"
 	"github.com/snowplow/snowbridge/pkg/models"
 	"github.com/snowplow/snowbridge/pkg/observer"
 	"github.com/snowplow/snowbridge/pkg/source/sourceconfig"
 	"github.com/snowplow/snowbridge/pkg/source/sourceiface"
 	"github.com/snowplow/snowbridge/pkg/target/targetiface"
 	"github.com/snowplow/snowbridge/pkg/telemetry"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
+	"github.com/snowplow/snowbridge/pkg/transform/batch/batchtransformconfig"
 	transform "github.com/snowplow/snowbridge/pkg/transform/single"
 	"github.com/snowplow/snowbridge/pkg/transform/single/transformconfig"
 )

cmd/main/cli/main.go

@@ -14,11 +14,11 @@ package main
 import (
 	"github.com/snowplow/snowbridge/cmd/cli"
 	"github.com/snowplow/snowbridge/config"
-	"github.com/snowplow/snowbridge/pkg/batchtransform/batchtransformconfig"
 	kafkasource "github.com/snowplow/snowbridge/pkg/source/kafka"
 	pubsubsource "github.com/snowplow/snowbridge/pkg/source/pubsub"
 	sqssource "github.com/snowplow/snowbridge/pkg/source/sqs"
 	stdinsource "github.com/snowplow/snowbridge/pkg/source/stdin"
+	"github.com/snowplow/snowbridge/pkg/transform/batch/batchtransformconfig"
 	"github.com/snowplow/snowbridge/pkg/transform/single/transformconfig"
 )
 

pkg/failure/snowplow_test.go

@@ -17,9 +17,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/models"
 	"github.com/snowplow/snowbridge/pkg/testutil"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // --- Test FailureTarget

pkg/target/common.go

@@ -12,8 +12,8 @@
 package target
 
 import (
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/models"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // chunkBatcherWithConfig returns a batch transformation which incorporates models.GetChunkedMessages() into the batch transformation model.

pkg/target/eventhub.go

@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/models"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // EventHubConfig holds a config object for Azure EventHub

pkg/target/http.go

@@ -24,9 +24,9 @@ import (
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/common"
 	"github.com/snowplow/snowbridge/pkg/models"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 
 	"golang.org/x/oauth2"
 )

pkg/target/http_test.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/testutil"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 func createTestServerWithResponseCode(results *[][]byte, waitgroup *sync.WaitGroup, responseCode int) *httptest.Server {

pkg/target/kafka.go

@@ -20,9 +20,9 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/common"
 	"github.com/snowplow/snowbridge/pkg/models"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // KafkaConfig contains configurable options for the kafka target

pkg/target/kafka_test.go

@@ -19,8 +19,8 @@ import (
 	"github.com/IBM/sarama/mocks"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/testutil"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/target/targetiface/target.go

@@ -12,8 +12,8 @@
 package targetiface
 
 import (
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
 	"github.com/snowplow/snowbridge/pkg/models"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // Target describes the interface for how to push the data pulled from the source

pkg/batchtransform/batchtransformconfig/batch_transform_config.go → pkg/transform/batch/batchtransformconfig/batch_transform_config.go

@@ -15,7 +15,7 @@ import (
 	"fmt"
 
 	"github.com/snowplow/snowbridge/config"
-	"github.com/snowplow/snowbridge/pkg/batchtransform"
+	batchtransform "github.com/snowplow/snowbridge/pkg/transform/batch"
 )
 
 // SupportedTransformations is a ConfigurationPair slice containing all the officially supported transformations.