fix: preferences should be false incase of invalid bucket (#2661)

rudderlabs · Nov 7, 2022 · 725e9e7 · 725e9e7
1 parent 0964e83
commit 725e9e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/services/fileuploader/fileuploader.go b/services/fileuploader/fileuploader.go
@@ -85,20 +85,24 @@ func (p *provider) updateLoop(ctx context.Context, backendConfig backendconfig.B
 
 	settings := make(map[string]StorageSettings)
 
-	var bucket backendconfig.StorageBucket
-	var preferences backendconfig.StoragePreferences
-
 	for ev := range ch {
 		configs := ev.Data.(map[string]backendconfig.ConfigT)
 		for _, c := range configs {
+
+			var bucket backendconfig.StorageBucket
+			var preferences backendconfig.StoragePreferences
+
 			if c.Settings.DataRetention.UseSelfStorage {
 				settings := c.Settings.DataRetention.StorageBucket
 				defaultBucket := getDefaultBucket(ctx, settings.Type)
 				bucket = overrideWithSettings(defaultBucket.Config, settings, c.WorkspaceID)
 			} else {
 				bucket = getDefaultBucket(ctx, config.GetString("JOBS_BACKUP_STORAGE_PROVIDER", "S3"))
 			}
-			preferences = c.Settings.DataRetention.StoragePreferences
+			// bucket type and configuration must not be empty
+			if bucket.Type != "" && len(bucket.Config) > 0 {
+				preferences = c.Settings.DataRetention.StoragePreferences
+			}
 			settings[c.WorkspaceID] = StorageSettings{
 				Bucket:      bucket,
 				Preferences: preferences,

diff --git a/services/fileuploader/fileuploader_test.go b/services/fileuploader/fileuploader_test.go
@@ -76,14 +76,12 @@ func TestFileUploaderUpdatingWithConfigBackend(t *testing.T) {
 					DataRetention: backendconfig.DataRetention{
 						UseSelfStorage: true,
 						StorageBucket: backendconfig.StorageBucket{
-							Type: "some-type",
-							Config: map[string]interface{}{
-								"some-key": "some-value",
-							},
+							Type:   "",
+							Config: map[string]interface{}{},
 						},
 						StoragePreferences: backendconfig.StoragePreferences{
-							ProcErrors:   true,
-							GatewayDumps: true,
+							ProcErrors:   false,
+							GatewayDumps: false,
 						},
 					},
 				},
@@ -103,6 +101,10 @@ func TestFileUploaderUpdatingWithConfigBackend(t *testing.T) {
 	preferences, err = fileUploaderProvider.GetStoragePreferences("testWorkspaceId-0")
 	Expect(err).To(HaveOccurred())
 	Expect(preferences).To(BeEquivalentTo(backendconfig.StoragePreferences{}))
+
+	preferences, err = fileUploaderProvider.GetStoragePreferences("testWorkspaceId-2")
+	Expect(err).To(BeNil())
+	Expect(preferences).To(BeEquivalentTo(backendconfig.StoragePreferences{}))
 }
 
 func TestFileUploaderWithoutConfigUpdates(t *testing.T) {