fix: resolved conflicts and added config test cases

README.md

@@ -99,4 +99,4 @@ Creating a source or destination connector will fail in the next cases:
 ## Useful resources
 * [Quotas and limits in Amazon Redshift](https://docs.aws.amazon.com/redshift/latest/mgmt/amazon-redshift-limits.html)
 
-![scarf pixel](https://static.scarf.sh/a.png?x-pxid=617ebf4a-148c-44ad-8f64-6cc5780d34ae)
+![scarf pixel](https://static.scarf.sh/a.png?x-pxid=dc0e518d-385c-4e33-bd1c-6b4d2eaebb74)

common/configuration.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@ package common
 
 const (
 	MaxConfigStringLength = 127
-	MinConfigBatchSize    = 1
-	MaxConfigBatchSize    = 100000
+	ConfigTable           = "table"
+	ConfigKeyColumns      = "keyColumns"
 )
 
 // Configuration contains common for source and destination configurable values.

common/error.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

destination/config/config.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

destination/config/config_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

source/config/config.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ type Config struct {
 	// will take a snapshot of the entire table before starting cdc mode.
 	Snapshot bool `json:"snapshot" default:"true"`
 	// BatchSize is a size of rows batch.
-	BatchSize int `json:"batchSize" default:"1000"`
+	BatchSize int `json:"batchSize" default:"1000" validate:"gt=0,lt=100001"`
 }
 
 // Validate executes manual validations beyond what is defined in struct tags.
@@ -66,7 +66,8 @@ func (c *Config) Validate() error {
 		}
 	}
 
-	// c.OrderingColumn handling "lowercase", "excludesall= " and "lte=127" validations.
+	// c.OrderingColumns required validation is handled in stuct tag
+	// handling "lowercase", "excludesall= " and "lte=127" validations.
 	for i, col := range c.OrderingColumns {
 		if col != strings.ToLower(col) {
 			return common.NewLowercaseError(fmt.Sprintf("orderingColumn[%d]", i))
@@ -79,14 +80,6 @@ func (c *Config) Validate() error {
 		}
 	}
 
-	// c.BatchSize handling "gte=1" and "lte=100000" validations.
-	if c.BatchSize < common.MinConfigBatchSize {
-		return common.NewGreaterThanError(ConfigBatchSize, common.MinConfigBatchSize)
-	}
-	if c.BatchSize > common.MaxConfigBatchSize {
-		return common.NewLessThanError(ConfigBatchSize, common.MaxConfigBatchSize)
-	}
-
 	return nil
 }
 

source/config/config_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Meroxa, Inc. & Yalantis
+// Copyright © 2024 Meroxa, Inc. & Yalantis
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -154,30 +154,6 @@ func TestValidateConfig(t *testing.T) {
 			},
 			wantErr: common.NewLessThanError("orderingColumn[0]", common.MaxConfigStringLength),
 		},
-		{
-			name: "failure_batch_size_less_than_min_value",
-			in: &Config{
-				Configuration: common.Configuration{
-					DSN: testValueDSN,
-				},
-				Tables:          []string{"test_table"},
-				OrderingColumns: []string{"id"},
-				BatchSize:       0,
-			},
-			wantErr: common.NewGreaterThanError(ConfigBatchSize, common.MinConfigBatchSize),
-		},
-		{
-			name: "failure_batch_size_greater_than_max_value",
-			in: &Config{
-				Configuration: common.Configuration{
-					DSN: testValueDSN,
-				},
-				Tables:          []string{"test_table"},
-				OrderingColumns: []string{"id"},
-				BatchSize:       100001,
-			},
-			wantErr: common.NewLessThanError(ConfigBatchSize, common.MaxConfigBatchSize),
-		},
 	}
 
 	for _, tt := range tests {
@@ -195,3 +171,23 @@ func TestValidateConfig(t *testing.T) {
 		})
 	}
 }
+
+func TestGetTableOrderingMap(t *testing.T) {
+	t.Parallel()
+
+	is := is.New(t)
+
+	config := &Config{
+		Tables:          []string{"table1", "table2"},
+		OrderingColumns: []string{"id1", "id2"},
+	}
+
+	expectedMap := map[string]string{
+		"table1": "id1",
+		"table2": "id2",
+	}
+
+	result := config.GetTableOrderingMap()
+
+	is.Equal(result, expectedMap)
+}