add base flags back

Signed-off-by: Bogdan Stancu <[email protected]>

Author: bogdan-st

integration/overrides_test.go

@@ -49,16 +49,21 @@ func TestOverridesAPIWithRunningCortex(t *testing.T) {
 
 	require.NoError(t, s3Client.Upload(context.Background(), "runtime.yaml", bytes.NewReader(runtimeConfigData)))
 
-	flags := map[string]string{
-		"-target":                         "overrides",
-		"-overrides.runtime-config-file":  "runtime.yaml",
-		"-overrides.backend":              "s3",
-		"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
-		"-overrides.s3.secret-access-key": e2edb.MinioSecretKey,
-		"-overrides.s3.bucket-name":       "cortex",
-		"-overrides.s3.endpoint":          minio.NetworkHTTPEndpoint(),
-		"-overrides.s3.insecure":          "true",
-	}
+	baseFlags := mergeFlags(AlertmanagerLocalFlags(), BlocksStorageFlags())
+	flags := mergeFlags(
+		baseFlags,
+		map[string]string{
+			"-target": "overrides",
+
+			"-overrides.runtime-config-file":  "runtime.yaml",
+			"-overrides.backend":              "s3",
+			"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
+			"-overrides.s3.secret-access-key": e2edb.MinioSecretKey,
+			"-overrides.s3.bucket-name":       "cortex",
+			"-overrides.s3.endpoint":          minio.NetworkHTTPEndpoint(),
+			"-overrides.s3.insecure":          "true",
+		},
+	)
 
 	cortexSvc := e2ecortex.NewSingleBinary("cortex-overrides", flags, "")
 	require.NoError(t, s.StartAndWaitReady(cortexSvc))
@@ -207,16 +212,21 @@ func TestOverridesAPITenantExtraction(t *testing.T) {
 	minio := e2edb.NewMinio(9010, "cortex")
 	require.NoError(t, s.StartAndWaitReady(minio))
 
-	flags := map[string]string{
-		"-target":                         "overrides",
-		"-overrides.runtime-config-file":  "runtime.yaml",
-		"-overrides.backend":              "s3",
-		"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
-		"-overrides.s3.secret-access-key": e2edb.MinioSecretKey,
-		"-overrides.s3.bucket-name":       "cortex",
-		"-overrides.s3.endpoint":          minio.NetworkHTTPEndpoint(),
-		"-overrides.s3.insecure":          "true",
-	}
+	baseFlags := mergeFlags(AlertmanagerLocalFlags(), BlocksStorageFlags())
+	flags := mergeFlags(
+		baseFlags,
+		map[string]string{
+			"-target": "overrides",
+
+			"-overrides.runtime-config-file":  "runtime.yaml",
+			"-overrides.backend":              "s3",
+			"-overrides.s3.access-key-id":     e2edb.MinioAccessKey,
+			"-overrides.s3.secret-access-key": e2edb.MinioSecretKey,
+			"-overrides.s3.bucket-name":       "cortex",
+			"-overrides.s3.endpoint":          minio.NetworkHTTPEndpoint(),
+			"-overrides.s3.insecure":          "true",
+		},
+	)
 
 	cortexSvc := e2ecortex.NewSingleBinary("cortex-overrides-tenant", flags, "")
 	require.NoError(t, s.StartAndWaitReady(cortexSvc))
@@ -253,11 +263,15 @@ func TestOverridesAPIFilesystemBackendRejected(t *testing.T) {
 	defer s.Close()
 
 	t.Run("filesystem backend should be rejected", func(t *testing.T) {
-		flags := map[string]string{
-			"-target":                        "overrides",
-			"-overrides.runtime-config-file": "runtime.yaml",
-			"-overrides.backend":             "filesystem",
-		}
+		baseFlags := mergeFlags(AlertmanagerLocalFlags(), BlocksStorageFlags())
+		flags := mergeFlags(
+			baseFlags,
+			map[string]string{
+				"-target":                        "overrides",
+				"-overrides.runtime-config-file": "runtime.yaml",
+				"-overrides.backend":             "filesystem",
+			},
+		)
 
 		cortexSvc := e2ecortex.NewSingleBinary("cortex-overrides-filesystem", flags, "")
 
@@ -271,10 +285,14 @@ func TestOverridesAPIFilesystemBackendRejected(t *testing.T) {
 	})
 
 	t.Run("no backend specified should be rejected", func(t *testing.T) {
-		flags := map[string]string{
-			"-target":                        "overrides",
-			"-overrides.runtime-config-file": "runtime.yaml",
-		}
+		baseFlags := mergeFlags(AlertmanagerLocalFlags(), BlocksStorageFlags())
+		flags := mergeFlags(
+			baseFlags,
+			map[string]string{
+				"-target":                        "overrides",
+				"-overrides.runtime-config-file": "runtime.yaml",
+			},
+		)
 
 		cortexSvc := e2ecortex.NewSingleBinary("cortex-overrides-no-backend", flags, "")