Move persisted queries from preview to general availability

.changesets/feat_glasser_persisted_queries_ga.md

@@ -0,0 +1,15 @@
+### Move Persisted Queries to General Availability ([PR #3914](https://github.com/apollographql/router/pull/3914))
+
+[Persisted Queries](https://www.apollographql.com/docs/graphos/operations/persisted-queries/) (a GraphOS Enterprise feature) is now moving to General Availability, from Preview where it has been since Apollo Router 1.25.
+
+For more information about launch stages, please see the documentation here: https://www.apollographql.com/docs/resources/product-launch-stages/
+
+The feature is now configured with a `persisted_queries` top-level key in the YAML configuration instead of with `preview_persisted_queries`. Existing configuration files will keep working as before, only with a warning. To fix that warning, rename the configuration section like so:
+
+```diff
+-preview_persisted_queries:
++persisted_queries:
+   enabled: true
+```
+
+By [@glasser](https://github.com/glasser) in https://github.com/apollographql/router/pull/3914

apollo-router/src/configuration/metrics.rs

@@ -206,7 +206,7 @@ impl Metrics {
         );
         log_usage_metrics!(
             value.apollo.router.config.persisted_queries,
-            "$.preview_persisted_queries[?(@.enabled == true)]",
+            "$.persisted_queries[?(@.enabled == true)]",
             opt.log_unknown,
             "$[?(@.log_unknown == true)]",
             opt.safelist.require_id,

apollo-router/src/configuration/migrations/0012-persisted-queries-ga.yaml

@@ -0,0 +1,5 @@
+description: Persisted queries are no longer preview, `preview_persisted_queries` is renamed `persisted_queries`
+actions:
+  - type: move
+    from: preview_persisted_queries
+    to: persisted_queries

apollo-router/src/configuration/migrations/README.md

@@ -5,8 +5,8 @@ It uses [proteus](https://github.com/rust-playground/proteus) under the hood, wh
 
 A migration has the following format:
 
-The filename should begin with a 5 digit numerical prefix. This allows us to apply migrations in a deterministic order.
-`Filename: 00001-name.yaml`
+The filename should begin with a 4 digit numerical prefix. This allows us to apply migrations in a deterministic order.
+`Filename: 0001-name.yaml`
 
 The yaml consists of a description and a number of actions:
 ```yaml

apollo-router/src/configuration/mod.rs

@@ -151,11 +151,9 @@ pub struct Configuration {
     #[serde(default)]
     pub(crate) apq: Apq,
 
-    // NOTE: when renaming this to move out of preview, also update paths
-    // in `uplink/license.rs`.
     /// Configures managed persisted queries
     #[serde(default)]
-    pub preview_persisted_queries: PersistedQueries,
+    pub persisted_queries: PersistedQueries,
 
     /// Configuration for operation limits, parser limits, HTTP limits, etc.
     #[serde(default)]
@@ -228,7 +226,7 @@ impl<'de> serde::Deserialize<'de> for Configuration {
             apollo_plugins: ApolloPlugins,
             tls: Tls,
             apq: Apq,
-            preview_persisted_queries: PersistedQueries,
+            persisted_queries: PersistedQueries,
             #[serde(skip)]
             uplink: UplinkConfig,
             limits: Limits,
@@ -247,7 +245,7 @@ impl<'de> serde::Deserialize<'de> for Configuration {
             .apollo_plugins(ad_hoc.apollo_plugins.plugins)
             .tls(ad_hoc.tls)
             .apq(ad_hoc.apq)
-            .persisted_query(ad_hoc.preview_persisted_queries)
+            .persisted_query(ad_hoc.persisted_queries)
             .operation_limits(ad_hoc.limits)
             .chaos(ad_hoc.experimental_chaos)
             .uplink(ad_hoc.uplink)
@@ -310,7 +308,7 @@ impl Configuration {
             homepage: homepage.unwrap_or_default(),
             cors: cors.unwrap_or_default(),
             apq: apq.unwrap_or_default(),
-            preview_persisted_queries: persisted_query.unwrap_or_default(),
+            persisted_queries: persisted_query.unwrap_or_default(),
             limits: operation_limits.unwrap_or_default(),
             experimental_chaos: chaos.unwrap_or_default(),
             experimental_graphql_validation_mode: graphql_validation_mode.unwrap_or_default(),
@@ -380,7 +378,7 @@ impl Configuration {
             tls: tls.unwrap_or_default(),
             notify: notify.unwrap_or_default(),
             apq: apq.unwrap_or_default(),
-            preview_persisted_queries: persisted_query.unwrap_or_default(),
+            persisted_queries: persisted_query.unwrap_or_default(),
             uplink,
         };
 
@@ -439,31 +437,31 @@ impl Configuration {
         }
 
         // PQs.
-        if self.preview_persisted_queries.enabled {
-            if self.preview_persisted_queries.safelist.enabled && self.apq.enabled {
+        if self.persisted_queries.enabled {
+            if self.persisted_queries.safelist.enabled && self.apq.enabled {
                 return Err(ConfigurationError::InvalidConfiguration {
                     message: "apqs must be disabled to enable safelisting",
-                    error: "either set preview_persisted_queries.safelist.enabled: false or apq.enabled: false in your router yaml configuration".into()
+                    error: "either set persisted_queries.safelist.enabled: false or apq.enabled: false in your router yaml configuration".into()
                 });
-            } else if !self.preview_persisted_queries.safelist.enabled
-                && self.preview_persisted_queries.safelist.require_id
+            } else if !self.persisted_queries.safelist.enabled
+                && self.persisted_queries.safelist.require_id
             {
                 return Err(ConfigurationError::InvalidConfiguration {
                     message: "safelist must be enabled to require IDs",
-                    error: "either set preview_persisted_queries.safelist.enabled: true or preview_persisted_queries.safelist.require_id: false in your router yaml configuration".into()
+                    error: "either set persisted_queries.safelist.enabled: true or persisted_queries.safelist.require_id: false in your router yaml configuration".into()
                 });
             }
         } else {
             // If the feature isn't enabled, sub-features shouldn't be.
-            if self.preview_persisted_queries.safelist.enabled {
+            if self.persisted_queries.safelist.enabled {
                 return Err(ConfigurationError::InvalidConfiguration {
                     message: "persisted queries must be enabled to enable safelisting",
-                    error: "either set preview_persisted_queries.safelist.enabled: false or preview_persisted_queries.enabled: true in your router yaml configuration".into()
+                    error: "either set persisted_queries.safelist.enabled: false or persisted_queries.enabled: true in your router yaml configuration".into()
                 });
-            } else if self.preview_persisted_queries.log_unknown {
+            } else if self.persisted_queries.log_unknown {
                 return Err(ConfigurationError::InvalidConfiguration {
                     message: "persisted queries must be enabled to enable logging unknown operations",
-                    error: "either set preview_persisted_queries.log_unknown: false or preview_persisted_queries.enabled: true in your router yaml configuration".into()
+                    error: "either set persisted_queries.log_unknown: false or persisted_queries.enabled: true in your router yaml configuration".into()
                 });
             }
         }

apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap

@@ -1603,6 +1603,52 @@ expression: "&schema"
         }
       ]
     },
+    "persisted_queries": {
+      "description": "Configures managed persisted queries",
+      "default": {
+        "enabled": false,
+        "log_unknown": false,
+        "safelist": {
+          "enabled": false,
+          "require_id": false
+        }
+      },
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "Activates Persisted Queries (disabled by default)",
+          "default": false,
+          "type": "boolean"
+        },
+        "log_unknown": {
+          "description": "Enabling this field configures the router to log any freeform GraphQL request that is not in the persisted query list",
+          "default": false,
+          "type": "boolean"
+        },
+        "safelist": {
+          "description": "Restricts execution of operations that are not found in the Persisted Query List",
+          "default": {
+            "enabled": false,
+            "require_id": false
+          },
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "description": "Enables using the persisted query list as a safelist (disabled by default)",
+              "default": false,
+              "type": "boolean"
+            },
+            "require_id": {
+              "description": "Enabling this field configures the router to reject any request that does not include the persisted query ID",
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
     "plugins": {
       "description": "Plugin configuration",
       "default": null,
@@ -1666,52 +1712,6 @@ expression: "&schema"
       },
       "additionalProperties": false
     },
-    "preview_persisted_queries": {
-      "description": "Configures managed persisted queries",
-      "default": {
-        "enabled": false,
-        "log_unknown": false,
-        "safelist": {
-          "enabled": false,
-          "require_id": false
-        }
-      },
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "description": "Activates Persisted Queries (disabled by default)",
-          "default": false,
-          "type": "boolean"
-        },
-        "log_unknown": {
-          "description": "Enabling this field configures the router to log any freeform GraphQL request that is not in the persisted query list",
-          "default": false,
-          "type": "boolean"
-        },
-        "safelist": {
-          "description": "Restricts execution of operations that are not found in the Persisted Query List",
-          "default": {
-            "enabled": false,
-            "require_id": false
-          },
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "description": "Enables using the persisted query list as a safelist (disabled by default)",
-              "default": false,
-              "type": "boolean"
-            },
-            "require_id": {
-              "description": "Enabling this field configures the router to reject any request that does not include the persisted query ID",
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
     "rhai": {
       "description": "Configuration for the Rhai Plugin",
       "type": "object",

apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__upgrade_old_configuration@persisted-queries-preview.yaml.snap

@@ -0,0 +1,8 @@
+---
+source: apollo-router/src/configuration/tests.rs
+expression: new_config
+---
+---
+persisted_queries:
+  enabled: true
+

apollo-router/src/configuration/testdata/metrics/persisted_queries.router.yaml

@@ -1,6 +1,6 @@
 apq:
   enabled: false
-preview_persisted_queries:
+persisted_queries:
   enabled: true
   log_unknown: true
   safelist:

apollo-router/src/configuration/testdata/migrations/persisted-queries-preview.yaml

@@ -0,0 +1,3 @@
+preview_persisted_queries:
+  enabled: true
+

apollo-router/src/services/layers/persisted_queries/manifest_poller.rs

@@ -398,19 +398,18 @@ async fn poll_uplink(
     while let Some(event) = uplink_executor.next().await {
         match event {
             ManifestPollEvent::NewManifest(new_manifest) => {
-                let freeform_graphql_behavior = if config.preview_persisted_queries.safelist.enabled
-                {
-                    if config.preview_persisted_queries.safelist.require_id {
+                let freeform_graphql_behavior = if config.persisted_queries.safelist.enabled {
+                    if config.persisted_queries.safelist.require_id {
                         FreeformGraphQLBehavior::DenyAll {
-                            log_unknown: config.preview_persisted_queries.log_unknown,
+                            log_unknown: config.persisted_queries.log_unknown,
                         }
                     } else {
                         FreeformGraphQLBehavior::AllowIfInSafelist {
                             safelist: FreeformGraphQLSafelist::new(&new_manifest),
-                            log_unknown: config.preview_persisted_queries.log_unknown,
+                            log_unknown: config.persisted_queries.log_unknown,
                         }
                     }
-                } else if config.preview_persisted_queries.log_unknown {
+                } else if config.persisted_queries.log_unknown {
                     FreeformGraphQLBehavior::LogUnlessInSafelist {
                         safelist: FreeformGraphQLSafelist::new(&new_manifest),
                         apq_enabled: config.apq.enabled,

apollo-router/src/services/layers/persisted_queries/mod.rs

@@ -37,7 +37,7 @@ impl PersistedQueryLayer {
     /// Create a new [`PersistedQueryLayer`] from CLI options, YAML configuration,
     /// and optionally, an existing persisted query manifest poller.
     pub(crate) async fn new(configuration: &Configuration) -> Result<Self, BoxError> {
-        if configuration.preview_persisted_queries.enabled {
+        if configuration.persisted_queries.enabled {
             Ok(Self {
                 manifest_poller: Some(
                     PersistedQueryManifestPoller::new(configuration.clone()).await?,

apollo-router/src/uplink/license_enforcement.rs

@@ -178,7 +178,7 @@ impl LicenseEnforcementReport {
                 .name("Operation aliases limiting")
                 .build(),
             ConfigurationRestriction::builder()
-                .path("$.preview_persisted_queries")
+                .path("$.persisted_queries")
                 .name("Persisted queries")
                 .build(),
         ]

apollo-router/tests/integration_tests.rs

@@ -533,7 +533,7 @@ async fn persisted_queries() {
     .await;
 
     let config = serde_json::json!({
-        "preview_persisted_queries": {
+        "persisted_queries": {
             "enabled": true
         },
         "apq": {
@@ -1482,7 +1482,7 @@ async fn all_stock_router_example_yamls_are_valid() {
                         let mut configuration: Configuration = serde_yaml::from_str(&raw_yaml)
                             .unwrap_or_else(|e| panic!("unable to parse YAML {display_path}: {e}"));
                         let (_mock_guard, configuration) =
-                            if configuration.preview_persisted_queries.enabled {
+                            if configuration.persisted_queries.enabled {
                                 let (_mock_guard, uplink_config) = mock_empty_pq_uplink().await;
                                 configuration.uplink = Some(uplink_config);
                                 (Some(_mock_guard), configuration)

docs/source/config.json

@@ -59,8 +59,7 @@
         "Safelisting with persisted queries": [
           "/configuration/persisted-queries",
           [
-            "enterprise",
-            "preview"
+            "enterprise"
           ]
         ],
         "Privacy and data collection": "/privacy"

docs/source/configuration/persisted-queries.mdx

@@ -6,8 +6,6 @@ minVersion: 1.25.0
 
 <GraphOSEnterpriseRequired />
 
-<PreviewFeature discordLink="https://discordapp.com/channels/1022972389463687228/1143901714173407342"/>
-
 <PQIntro />
 
 ## Differences from automatic persisted queries
@@ -40,21 +38,21 @@ For more information on other configuration aspects, see the [GraphOS persisted
 
 The router provides four configuration options that you can combine to create the recommended [security levels](#router-security-levels). This section details each configuration option. Refer to the [security levels](#router-security-levels) section for recommended combinations.
 
-#### `preview_persisted_queries`
+#### `persisted_queries`
 
 This base configuration enables the feature. All other configuration options build off this one.
 
 ```yaml title="router.yaml"
-preview_persisted_queries:
+persisted_queries:
   enabled: true
 ```
 
 #### `log_unknown`
 
-Adding `log_unknown: true` to `preview_persisted_queries` configures the router to log any incoming operations not preregistered to the PQL.
+Adding `log_unknown: true` to `persisted_queries` configures the router to log any incoming operations not preregistered to the PQL.
 
 ```yaml title="router.yaml"
-preview_persisted_queries:
+persisted_queries:
   enabled: true
   log_unknown: true
 ```
@@ -63,10 +61,10 @@ If used with the [`safelist`](#safelist) option, the router logs unregistered an
 
 #### `safelist`
 
-Adding `safelist: true` to `preview_persisted_queries` causes the router to reject any operations that haven't been preregistered to your PQL.
+Adding `safelist: true` to `persisted_queries` causes the router to reject any operations that haven't been preregistered to your PQL.
 
 ```yaml title="router.yaml"
-preview_persisted_queries:
+persisted_queries:
   enabled: true
   safelist:
     enabled: true
@@ -85,7 +83,7 @@ Adding `require_id: true` to the `safelist` option causes the router to reject a
 - use a full operation string rather than the operation ID
 
 ```yaml title="router.yaml"
-preview_persisted_queries:
+persisted_queries:
   enabled: true
   safelist:
     enabled: true

examples/persisted-queries/additive_pq.yaml

@@ -7,5 +7,5 @@
 # 2) make requests against the router:
 #    curl --get http://localhost:4000 --header 'content-type: application/json' --data-urlencode 'extensions={"persistedQuery":{"sha256Hash":"hash-of-operation", "version": 1}}'
 
-preview_persisted_queries:
+persisted_queries:
   enabled: true