Clean up the fdccompatiblemode experiment.

src/dataconnect/schemaMigration.ts

@@ -24,10 +24,9 @@
 import { Options } from "../options";
 import { FirebaseError } from "../error";
 import { logLabeledBullet, logLabeledWarning, logLabeledSuccess } from "../utils";
-import * as experiments from "../experiments";
 import * as errors from "./errors";
 
 export async function diffSchema(
   schema: Schema,
   schemaValidation?: SchemaValidation,
 ): Promise<Diff[]> {
@@ -41,13 +40,11 @@
   let diffs: Diff[] = [];
 
   // If the schema validation mode is unset, we surface both STRICT and COMPATIBLE mode diffs, starting with COMPATIBLE.
-  let validationMode: SchemaValidation = experiments.isEnabled("fdccompatiblemode")
-    ? schemaValidation ?? "COMPATIBLE"
-    : "STRICT";
+  let validationMode: SchemaValidation = schemaValidation ?? "COMPATIBLE";
   setSchemaValidationMode(schema, validationMode);
 
   try {
-    if (!schemaValidation && experiments.isEnabled("fdccompatiblemode")) {
+    if (!schemaValidation) {
       logLabeledBullet("dataconnect", `generating required schema changes...`);
     }
     await upsertSchema(schema, /** validateOnly=*/ true);
@@ -56,8 +53,8 @@
     } else {
       logLabeledSuccess("dataconnect", `Database schema is compatible.`);
     }
   } catch (err: any) {
     if (err?.status !== 400) {
       throw err;
     }
     const invalidConnectors = errors.getInvalidConnectors(err);
@@ -78,15 +75,15 @@
   }
 
   // If the validation mode is unset, then we also surface any additional optional STRICT diffs.
-  if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+  if (!schemaValidation) {
     validationMode = "STRICT";
     setSchemaValidationMode(schema, validationMode);
     try {
       logLabeledBullet("dataconnect", `generating schema changes, including optional changes...`);
       await upsertSchema(schema, /** validateOnly=*/ true);
       logLabeledSuccess("dataconnect", `no additional optional changes`);
     } catch (err: any) {
       if (err?.status !== 400) {
         throw err;
       }
       const incompatible = errors.getIncompatibleSchemaError(err);
@@ -108,7 +105,7 @@
   return diffs;
 }
 
 export async function migrateSchema(args: {
   options: Options;
   schema: Schema;
   /** true for `dataconnect:sql:migrate`, false for `deploy` */
@@ -127,16 +124,14 @@
   let diffs: Diff[] = [];
 
   // If the schema validation mode is unset, we surface both STRICT and COMPATIBLE mode diffs, starting with COMPATIBLE.
-  let validationMode: SchemaValidation = experiments.isEnabled("fdccompatiblemode")
-    ? schemaValidation ?? "COMPATIBLE"
-    : "STRICT";
+  let validationMode: SchemaValidation = schemaValidation ?? "COMPATIBLE";
   setSchemaValidationMode(schema, validationMode);
 
   try {
     await upsertSchema(schema, validateOnly);
     logger.debug(`Database schema was up to date for ${instanceId}:${databaseId}`);
   } catch (err: any) {
     if (err?.status !== 400) {
       throw err;
     }
     // Parse and handle failed precondition errors, then retry.
@@ -183,13 +178,13 @@
   }
 
   // If the validation mode is unset, then we also surface any additional optional STRICT diffs.
-  if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+  if (!schemaValidation) {
     validationMode = "STRICT";
     setSchemaValidationMode(schema, validationMode);
     try {
       await upsertSchema(schema, validateOnly);
     } catch (err: any) {
       if (err.status !== 400) {
         throw err;
       }
       // Parse and handle failed precondition errors, then retry.
@@ -274,11 +269,9 @@
 }
 
 function setSchemaValidationMode(schema: Schema, schemaValidation: SchemaValidation) {
-  if (experiments.isEnabled("fdccompatiblemode")) {
-    const postgresDatasource = schema.datasources.find((d) => d.postgresql);
-    if (postgresDatasource?.postgresql) {
-      postgresDatasource.postgresql.schemaValidation = schemaValidation;
-    }
+  const postgresDatasource = schema.datasources.find((d) => d.postgresql);
+  if (postgresDatasource?.postgresql) {
+    postgresDatasource.postgresql.schemaValidation = schemaValidation;
   }
 }
 

src/experiments.ts

@@ -137,13 +137,6 @@ export const ALL_EXPERIMENTS = experiments({
     default: true,
     public: false,
   },
-
-  fdccompatiblemode: {
-    shortDescription: "Enable Data Connect schema migrations in Compatible Mode",
-    fullDescription: "Enable Data Connect schema migrations in Compatible Mode",
-    default: true,
-    public: false,
-  },
 });
 
 export type ExperimentName = keyof typeof ALL_EXPERIMENTS;

src/init/features/dataconnect/index.ts

@@ -8,7 +8,6 @@ import { provisionCloudSql } from "../../../dataconnect/provisionCloudSql";
 import { checkFreeTrialInstanceUsed, upgradeInstructions } from "../../../dataconnect/freeTrial";
 import * as cloudsql from "../../../gcp/cloudsql/cloudsqladmin";
 import { ensureApis, ensureSparkApis } from "../../../dataconnect/ensureApis";
-import * as experiments from "../../../experiments";
 import {
   listLocations,
   listAllServices,
@@ -25,9 +24,6 @@ import * as sdk from "./sdk";
 import { getPlatformFromFolder } from "../../../dataconnect/fileUtils";
 
 const DATACONNECT_YAML_TEMPLATE = readTemplateSync("init/dataconnect/dataconnect.yaml");
-const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = readTemplateSync(
-  "init/dataconnect/dataconnect-fdccompatiblemode.yaml",
-);
 const CONNECTOR_YAML_TEMPLATE = readTemplateSync("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = readTemplateSync("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = readTemplateSync("init/dataconnect/queries.gql");
@@ -239,9 +235,7 @@ function subDataconnectYamlValues(replacementValues: {
     connectorDirs: "__connectorDirs__",
     locationId: "__location__",
   };
-  let replaced = experiments.isEnabled("fdccompatiblemode")
-    ? DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE
-    : DATACONNECT_YAML_TEMPLATE;
+  let replaced = DATACONNECT_YAML_TEMPLATE;
   for (const [k, v] of Object.entries(replacementValues)) {
     replaced = replaced.replace(replacements[k], JSON.stringify(v));
   }

templates/init/dataconnect/dataconnect.yaml

@@ -8,4 +8,5 @@ schema:
       database: __cloudSqlDatabase__
       cloudSql:
         instanceId: __cloudSqlInstanceId__
+      # schemaValidation: "COMPATIBLE"
 connectorDirs: __connectorDirs__