Merge branch 'production' into max/zt/combine-on-ramps

Author: maxvp

src/content/docs/durable-objects/api/storage-api.mdx

@@ -191,7 +191,21 @@ The `put()` method returns a `Promise`, but most applications can discard this p
 
 * `txn`
 
-  * Provides access to the `put()`, `get()`, `delete()` and `list()` methods documented above to run in the current transaction context. In order to get transactional behavior within a transaction closure, you must call the methods on the `txn` Object instead of on the top-level `state.storage` Object.<br/><br/>Also supports a `rollback()` function that ensures any changes made during the transaction will be rolled back rather than committed. After `rollback()` is called, any subsequent operations on the `txn` Object will fail with an exception. `rollback()` takes no parameters and returns nothing to the caller.
+  * Provides access to the `put()`, `get()`, `delete()` and `list()` methods documented above to run in the current transaction context. In order to get transactional behavior within a transaction closure, you must call the methods on the `txn` Object instead of on the top-level `ctx.storage` Object.<br/><br/>Also supports a `rollback()` function that ensures any changes made during the transaction will be rolled back rather than committed. After `rollback()` is called, any subsequent operations on the `txn` Object will fail with an exception. `rollback()` takes no parameters and returns nothing to the caller.
+
+  * When using [the SQLite-backed storage engine](/durable-objects/best-practices/access-durable-objects-storage/#sqlite-storage-backend), the `txn` object is obsolete. Any storage operations performed directly on the `ctx.storage` object, including SQL queries using [`ctx.storage.sql.exec()`](#sqlexec), will be considered part of the transaction.
+
+### transactionSync
+
+* `transactionSync(callback)`: <Type text='any' />
+
+  * Only available when using [the SQLite-backed storage engine](/durable-objects/best-practices/access-durable-objects-storage/#sqlite-storage-backend).
+
+  * Invokes `callback()` wrapped in a transaction, and returns its result.
+
+  * If `callback()` throws an exception, the transaction will be rolled back.
+
+  * The callback must complete synchronously, that is, it should not be declared `async` nor otherwise return a Promise. Only synchronous storage operations can be part of the transaction. This is intended for use with SQL queries using [`ctx.storage.sql.exec()`](#sqlexec), which complete sychronously.
 
 ### sync
 
@@ -233,7 +247,7 @@ The `put()` method returns a `Promise`, but most applications can discard this p
 
 :::note[SQLite in Durable Objects Beta]
 
-SQL API methods accessed with `ctx.storage.sql` are only allowed on [Durable Object classes with SQLite storage backend](/durable-objects/reference/durable-objects-migrations/#enable-sqlite-storage-backend-on-create-durable-object-class-migration) and will return an error if called on Durable Object classes with a key-value storage backend.
+SQL API methods accessed with `ctx.storage.sql` are only allowed on [Durable Object classes with SQLite storage backend](/durable-objects/reference/durable-objects-migrations/#enable-sqlite-storage-backend-on-new-durable-object-class-migration) and will return an error if called on Durable Object classes with a key-value storage backend.
 
 :::
 
@@ -282,6 +296,8 @@ A cursor (`SqlStorageCursor`) to iterate over query row results as objects. `Sql
 *  `rowsWritten`: <Type text='number' />
   * The number of rows written so far as part of this SQL `query`. This may increase as you iterate the cursor. The final value is used for [SQL billing](/durable-objects/platform/pricing/#sqlite-storage-backend).
 
+Note that `sql.exec()` cannot execute transaction-related statements like `BEGIN TRANSACTION` or `SAVEPOINT`. Instead, use the [`ctx.storage.transaction()`](#transaction) or [`ctx.storage.transactionSync()`](#transactionsync) APIs to start a transaction, and then execute SQL queries in your callback.
+
 #### Examples
 
 <Render file="durable-objects-sql" />

src/content/docs/reference-architecture/by-solution.mdx

@@ -43,18 +43,27 @@ Architecture documentation related to using Cloudflare for Zero Trust, SSE and S
 - [Securing data at rest](/reference-architecture/diagrams/security/securing-data-at-rest/)
 - [Securing data in transit](/reference-architecture/diagrams/security/securing-data-in-transit/)
 - [Securing data in use](/reference-architecture/diagrams/security/securing-data-in-use/)
+- [Extend ZTNA with external authorization and serverless computing](/reference-architecture/diagrams/sase/augment-access-with-serverless/)
 
 #### Design guides
 
 - [Building zero trust architecture into your startup](/reference-architecture/design-guides/zero-trust-for-startups/)
 - [Network-focused migration from VPN concentrators to Zero Trust Network Access](/reference-architecture/design-guides/network-vpn-migration/)
+- [Using a zero trust framework to secure SaaS applications](/reference-architecture/design-guides/zero-trust-for-saas/)
 
 #### Implementation guides
 
 - [Secure your Internet traffic and SaaS apps](/learning-paths/secure-internet-traffic/)
 - [Replace your VPN](/learning-paths/replace-vpn/)
 - [Deploy Zero Trust Web Access](/learning-paths/zero-trust-web-access/)
 
+### Networking
+
+#### Reference architecture diagrams
+
+- [Protect public networks with Cloudflare](/reference-architecture/diagrams/network/protect-public-networks-with-cloudflare/)
+- [Bring your own IP space to Cloudflare](/reference-architecture/diagrams/network/bring-your-own-ip-space-to-cloudflare/)
+
 ### Application Performance
 
 Content related to DNS, caching, load balancing and other Cloudflare services designed to improve application reliability and performance.
@@ -68,6 +77,11 @@ Content related to DNS, caching, load balancing and other Cloudflare services de
 
 Content related to protecting your applications from threats such as DDoS attack, SQL injection, exploiting application vulnerabilities, scraping API data and more.
 
+#### Reference architecture diagrams
+
+- [Bot management](/reference-architecture/diagrams/bots/bot-management/)
+
+
 #### Design guides
 
 - [Secure application delivery](/reference-architecture/design-guides/secure-application-delivery/)
@@ -78,16 +92,26 @@ Architecture content for our developer platform.
 
 #### Reference architecture diagrams
 
+##### AI
+
 - [Automatic captioning for video uploads](/reference-architecture/diagrams/ai/ai-video-caption/)
 - [Composable AI architecture](/reference-architecture/diagrams/ai/ai-composable/)
 - [Content-based asset creation](/reference-architecture/diagrams/ai/ai-asset-creation/)
 - [Multi-vendor AI observability and control](/reference-architecture/diagrams/ai/ai-multivendor-observability-control/)
 - [Retrieval Augmented Generation (RAG)](/reference-architecture/diagrams/ai/ai-rag/)
+- [Ingesting BigQuery Data into Workers AI](/reference-architecture/diagrams/ai/bigquery-workers-ai/)
+
+##### Serverless
+
 - [Optimizing Image Delivery with Cloudflare Image Resizing and R2](/reference-architecture/diagrams/content-delivery/optimizing-image-delivery-with-cloudflare-image-resizing-and-r2/)
 - [A/B-testing using Workers](/reference-architecture/diagrams/serverless/a-b-testing-using-workers/)
 - [Fullstack Applications](/reference-architecture/diagrams/serverless/fullstack-application/)
 - [Serverless ETL pipelines](/reference-architecture/diagrams/serverless/serverless-etl/)
 - [Serverless global APIs](/reference-architecture/diagrams/serverless/serverless-global-apis/)
 - [Serverless image content management](/reference-architecture/diagrams/serverless/serverless-image-content-management/)
+
+##### Storage
+
 - [Egress-free object storage in multi-cloud setups](/reference-architecture/diagrams/storage/egress-free-storage-multi-cloud/)
 - [On-demand Object Storage Data Migration](/reference-architecture/diagrams/storage/on-demand-object-storage-migration/)
+- [Event notifications for storage](/reference-architecture/diagrams/storage/event-notifications-for-storage/)

src/content/docs/workers/wrangler/configuration.mdx

@@ -63,6 +63,10 @@ Top-level keys apply to the Worker as a whole (and therefore all environments).
 
   - Whether Wrangler should keep variables configured in the dashboard on deploy. Refer to [source of truth](#source-of-truth).
 
+- `migrations` <Type text="object[]" /> <MetaInfo text="optional" />
+
+  - When making changes to your Durable Object classes, you must perform a migration. Refer to [Durable Object migrations](/durable-objects/reference/durable-objects-migrations/).
+
 - `send_metrics` <Type text="boolean" /> <MetaInfo text="optional" />
 
   - Whether Wrangler should send usage metrics to Cloudflare for this project.
@@ -161,13 +165,13 @@ At a minimum, the `name`, `main` and `compatibility_date` keys are required to d
 
 - `logpush` <Type text="boolean" /> <MetaInfo text="optional" />
 
-  - Enables Workers Trace Events Logpush for a Worker. Any scripts with this property will automatically get picked up by the Workers Logpush job configured for your account. Defaults to `false`.
+  - Enables Workers Trace Events Logpush for a Worker. Any scripts with this property will automatically get picked up by the Workers Logpush job configured for your account. Defaults to `false`. Refer to [Workers Logpush](/workers/observability/logs/logpush/).
 
 - `limits` <Type text="Limits" /> <MetaInfo text="optional" />
 
   - Configures limits to be imposed on execution at runtime. Refer to [Limits](#limits).
 
-* `observability` object optional
+* `observability` <Type text="object" /> <MetaInfo text="optional" />
 
   - Configures automatic observability settings for telemetry data emitted from your Worker. Refer to [Observability](#observability).
 
@@ -322,6 +326,26 @@ Example:
 crons = ["* * * * *"]
 ```
 
+## Observability
+
+The [Observability](/workers/observability/logs/workers-logs) setting allows you to automatically ingest, store, filter, and analyze logging data emitted from Cloudflare Workers directly from your Cloudflare Worker's dashboard.
+
+- `enabled` <Type text="boolean" /> <MetaInfo text="required" />
+
+  - When set to `true` on a Worker, logs for the Worker are persisted. Defaults to `true` for all new Workers.
+
+- `head_sampling_rate` <Type text="number" /> <MetaInfo text="optional" />
+  - A number between 0 and 1, where 0 indicates zero out of one hundred requests are logged, and 1 indicates every request is logged. If `head_sampling_rate` is unspecified, it is configured to a default value of 1 (100%). Read more about [head-based sampling](/workers/observability/logs/workers-logs/#head-based-sampling).
+
+Example:
+
+```toml title="wrangler.toml"
+[observability]
+enabled = true
+head_sampling_rate = 0.1 # 10% of requests are logged
+```
+
+
 ## Custom builds
 
 You can configure a custom build step that will be run before your Worker is deployed. Refer to [Custom builds](/workers/wrangler/custom-builds/).
@@ -510,7 +534,7 @@ When making changes to your Durable Object classes, you must perform a migration
 
   - The new Durable Objects being defined.
 
-- `renamed_classes` <Type text="from: string, to: string}[]" /> <MetaInfo text="optional" />
+- `renamed_classes` <Type text="{from: string, to: string}[]" /> <MetaInfo text="optional" />
 
   - The Durable Objects being renamed.
 
@@ -629,28 +653,6 @@ binding = "<BINDING_NAME2>"
 id = "<NAMESPACE_ID2>"
 ```
 
-### Observability
-
-The [Observability](/workers/observability/logs/workers-logs) setting allows you to automatically ingest, store, filter, and analyze logging data emitted from Cloudflare Workers directly from your Cloudflare Worker's dashboard.
-
-- `enabled` boolean required
-
-  - When set to `true` on a Worker, logs for the Worker are persisted. Defaults to `true` for all new Workers.
-
-- `head_sampling_rate` number optional
-  - A number between 0 and 1, where 0 indicates zero out of one hundred requests are logged, and 1 indicates every request is logged. If `head_sampling_rate` is unspecified, it is configured to a default value of 1 (100%). Read more about [head-based sampling](/workers/observability/logs/workers-logs/#head-based-sampling).
-
-Example:
-
-```toml title="wrangler.toml"
-[observability]
-enabled = true
-
-[observability]
-enabled = true
-head_sampling_rate = 0.1 # 10% of requests are logged
-```
-
 ### Queues
 
 [Queues](/queues/) is Cloudflare's global message queueing service, providing [guaranteed delivery](/queues/reference/delivery-guarantees/) and [message batching](/queues/configuration/batching-retries/). To interact with a queue with Workers, you need a producer Worker to send messages to the queue and a consumer Worker to pull batches of messages out of the Queue. A single Worker can produce to and consume from multiple Queues.

src/content/partials/workers/storage_api_pricing.mdx

@@ -42,7 +42,7 @@ You can introspect rows read and rows written using `cursor.rowsRead` and `curso
 
 :::
 
-For [Durable Objects classes with SQLite storage backend](/durable-objects/reference/durable-objects-migrations/#enable-sqlite-storage-backend-on-create-durable-object-class-migration) via `ctx.storage.sql` the following pricing is used instead:
+For [Durable Objects classes with SQLite storage backend](/durable-objects/reference/durable-objects-migrations/#enable-sqlite-storage-backend-on-new-durable-object-class-migration) via `ctx.storage.sql` the following pricing is used instead:
 
 |                             | Workers Paid plan          |
 | ----------------------------| -------------------------- |