fix tests and check-format

pkg/loki/config_wrapper_test.go

@@ -805,7 +805,7 @@ schema_config:
       index:
         prefix: index_
         period: 24h`
-		config, _ := testContext(boltdbSchemaConfig, []string{"-boltdb.shipper.compactor.shared-store", "s3", "-boltdb.shipper.shared-store", "s3"})
+		config, _ := testContext(boltdbSchemaConfig, []string{"-boltdb.shipper.compactor.shared-store", "s3"})
 
 		assert.Equal(t, "/opt/loki/boltdb-shipper-active", config.StorageConfig.BoltDBShipperConfig.ActiveIndexDirectory)
 		assert.Equal(t, "/opt/loki/boltdb-shipper-cache", config.StorageConfig.BoltDBShipperConfig.CacheLocation)

pkg/storage/stores/shipper/bloomshipper/client_test.go

@@ -524,19 +524,21 @@ func createPeriodConfigs() []config.PeriodConfig {
 			ObjectType: "folder-1",
 			// from 2023-09-20: table range [19620:19623]
 			From: config.DayTime{Time: model.TimeFromUnix(time.Date(2023, time.September, 20, 0, 0, 0, 0, time.UTC).Unix())},
-			IndexTables: config.PeriodicTableConfig{
-				Period: day,
-				Prefix: "first-period-",
-			},
+			IndexTables: config.IndexPeriodicTableConfig{
+				PeriodicTableConfig: config.PeriodicTableConfig{
+					Period: day,
+					Prefix: "first-period-",
+				}},
 		},
 		{
 			ObjectType: "folder-2",
 			// from 2023-09-24: table range [19624:19627]
 			From: config.DayTime{Time: model.TimeFromUnix(time.Date(2023, time.September, 24, 0, 0, 0, 0, time.UTC).Unix())},
-			IndexTables: config.PeriodicTableConfig{
-				Period: day,
-				Prefix: "second-period-",
-			},
+			IndexTables: config.IndexPeriodicTableConfig{
+				PeriodicTableConfig: config.PeriodicTableConfig{
+					Period: day,
+					Prefix: "second-period-",
+				}},
 		},
 	}
 	return periodicConfigs

tools/tsdb/helpers/util.go

@@ -71,7 +71,7 @@ func GetPeriodConfigForTableNumber(table string, periodicConfigs []config.Period
 		}
 	}
 
-	return config.PeriodConfig{}, config.TableRange{}, "", fmt.Errorf("table does not belong to any period.")
+	return config.PeriodConfig{}, config.TableRange{}, "", fmt.Errorf("table does not belong to any period")
 }
 
 func ResolveTenants(objectClient client.ObjectClient, pathPrefix, tableName string) ([]string, error) {

tools/tsdb/migrate-versions/main_test.go

@@ -38,7 +38,7 @@ func TestMigrateTables(t *testing.T) {
 		ObjectType: "filesystem",
 		Schema:     "v12",
 		IndexTables: config.IndexPeriodicTableConfig{
-			PathPrefix: "/index",
+			PathPrefix: "index/",
 			PeriodicTableConfig: config.PeriodicTableConfig{
 				Prefix: indexPrefix,
 				Period: 24 * time.Hour,