@marimo-team/frontend 0.23.16-dev17 → 0.23.16-dev19

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-DKJE99Vg.js"></script>
+    <script type="module" crossorigin src="./assets/index-B8eK-daS.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-TXkS1QI3.js">
     <link rel="modulepreload" crossorigin href="./assets/objects-BlG0ZrO0.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
@@ -134,7 +134,7 @@
     <link rel="modulepreload" crossorigin href="./assets/debounce-OiXznToA.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-CKO8g4BU.js">
     <link rel="modulepreload" crossorigin href="./assets/main-BNL5rxQw.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-BF-9DQVg.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-D9tCNe6o.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-C5HnBH5U.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-WiYBwhUO.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-dialog-Bb8Lz8ko.js">
@@ -147,40 +147,40 @@
     <link rel="modulepreload" crossorigin href="./assets/usePress-5hBv4sjD.js">
     <link rel="modulepreload" crossorigin href="./assets/input-JxFwu-3G.js">
     <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-fY-ZfT0b.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-C8nxD_W9.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-D1nZ5myN.js">
     <link rel="modulepreload" crossorigin href="./assets/config-BJVx3eBW.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-jlwhGxSb.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-BS_NcSch.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-dHmZR8bI.js">
     <link rel="modulepreload" crossorigin href="./assets/links-wcQA1Np1.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-Cc95uCyI.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-BpMmDGqa.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-Bxb1_Gtw.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-3iHFdt22.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-neDQUo4Q.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-B2bcpQmX.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-DO7_JroJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-WCga518J.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-DoCFSir5.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-Pl4KKOUa.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-N0U-K9F6.js">
     <link rel="modulepreload" crossorigin href="./assets/hat-glasses-BttHlyvs.js">
     <link rel="modulepreload" crossorigin href="./assets/package-Bxz_8e44.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-DUCpRFlS.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-DhdBaOiL.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-C2HrF0bD.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DzTD8LVq.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-BOZA7gbn.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-CYq4mK5a.js">
-    <link rel="modulepreload" crossorigin href="./assets/tree-actions-lcVncuGx.js">
+    <link rel="modulepreload" crossorigin href="./assets/tree-actions-DJTGQWz0.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-D-V4psAa.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-BA1JM9Ro.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-CR010iV5.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-1vflBYah.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-DTmSq3hN.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-Bg5iAViP.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-B2JvSXP-.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-Dx_STMJD.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-Cp0LZT-a.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-DjR4GTXM.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-C9vdWclk.js">
     <link rel="modulepreload" crossorigin href="./assets/command-Dqxie4gq.js">
     <link rel="modulepreload" crossorigin href="./assets/field-BsxD35VE.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-Bcz1Zikb.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-PgHhDa-M.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-C3_FQaAj.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-CnYLah74.js">
     <link rel="modulepreload" crossorigin href="./assets/table-CH2plyy9.js">
     <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-j6fR_dBA.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-BSxEOIn2.js">
@@ -201,33 +201,33 @@
     <link rel="modulepreload" crossorigin href="./assets/plus-AgXtozBz.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-72W0TZ3L.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-Z-MD3n3J.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-CQL-gLeb.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-BoDVlAbV.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-iDRxid4h.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-DNNRTPQJ.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-C7opZZRp.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-Cw6-dEvS.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-BYiduGzU.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-CIPE8AIY.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-BXtGMMA7.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-BlWpUqQd.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-CdR34W0K.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-BWk7h_Uf.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-Drt3XC71.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-CboCOq4o.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-B30N1GS0.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-BQWruwg8.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-BqcMp63O.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-DAu6VO6j.js">
     <link rel="modulepreload" crossorigin href="./assets/file-CJH9JNGH.js">
     <link rel="modulepreload" crossorigin href="./assets/image-5XI2VU-q.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-BPxqyom6.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-Czm7CWoc.js">
     <link rel="modulepreload" crossorigin href="./assets/events-90X9nql5.js">
     <link rel="modulepreload" crossorigin href="./assets/share-852X_cqy.js">
     <link rel="modulepreload" crossorigin href="./assets/blob-C3EfaMOb.js">
     <link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
     <link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-CsW0tABf.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-A_CUgvqo.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-D2ccy8VQ.js">
     <link rel="modulepreload" crossorigin href="./assets/label-CqjrpwRC.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-DivigueA.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-BQE_pb7P.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-sLaKP2vj.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-CSUFC7OJ.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-B5UJtZJr.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-Bl8_FVn8.js">
     <link rel="modulepreload" crossorigin href="./assets/useBoolean-CFj86iac.js">
     <link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-CSMoa-ga.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.23.16-dev17",
+  "version": "0.23.16-dev19",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -57,7 +57,7 @@
     "@marimo-team/codemirror-ai": "^0.3.7",
     "@marimo-team/codemirror-languageserver": "^1.16.12",
     "@marimo-team/codemirror-mcp": "^0.1.7",
-    "@marimo-team/codemirror-sql": "^0.2.8",
+    "@marimo-team/codemirror-sql": "^0.3.0",
     "@marimo-team/llm-info": "workspace:*",
     "@marimo-team/marimo-api": "workspace:*",
     "@marimo-team/react-slotz": "^0.2.0",

package/src/components/editor/connections/storage/__tests__/__snapshots__/as-code.test.ts.snap

@@ -51,6 +51,21 @@ store = S3Store("operator-bucket",
 )"
 `;
 
+exports[`generateStorageCode > CoreWeave > with container credentials 1`] = `
+"from obstore.store import S3Store
+import os
+
+_container_credentials_full_uri = os.environ.get("AWS_CONTAINER_CREDENTIALS_FULL_URI")
+_container_authorization_token_file = os.environ.get("AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE")
+store = S3Store("operator-bucket",
+    region="US-EAST-04A",
+    container_credentials_full_uri=_container_credentials_full_uri,
+    container_authorization_token_file=_container_authorization_token_file,
+    endpoint="https://operator-bucket.cwobject.com",
+    virtual_hosted_style_request=True,
+)"
+`;
+
 exports[`generateStorageCode > CoreWeave > with secrets 1`] = `
 "from obstore.store import S3Store
 import os
@@ -119,6 +134,29 @@ exports[`generateStorageCode > S3 > minimal connection (bucket only) 1`] = `
 store = S3Store("my-bucket",)"
 `;
 
+exports[`generateStorageCode > S3 > with container credentials 1`] = `
+"from obstore.store import S3Store
+
+store = S3Store("my-bucket",
+    region="us-east-1",
+    container_credentials_full_uri="http://169.254.170.23/v1/credentials",
+    container_authorization_token_file="/var/run/secrets/token",
+)"
+`;
+
+exports[`generateStorageCode > S3 > with container credentials from secrets 1`] = `
+"from obstore.store import S3Store
+import os
+
+_container_credentials_full_uri = os.environ.get("AWS_CONTAINER_CREDENTIALS_FULL_URI")
+_container_authorization_token_file = os.environ.get("AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE")
+store = S3Store("my-bucket",
+    region="us-east-1",
+    container_credentials_full_uri=_container_credentials_full_uri,
+    container_authorization_token_file=_container_authorization_token_file,
+)"
+`;
+
 exports[`generateStorageCode > S3 > with custom endpoint 1`] = `
 "from obstore.store import S3Store
 
@@ -130,6 +168,18 @@ store = S3Store("my-bucket",
 )"
 `;
 
+exports[`generateStorageCode > S3 > with plain-http endpoint 1`] = `
+"from obstore.store import S3Store
+
+store = S3Store("my-bucket",
+    region="us-east-1",
+    access_key_id="AKIAIOSFODNN7EXAMPLE",
+    secret_access_key="wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+    endpoint_url="http://cwlota.com",
+    allow_http=True,
+)"
+`;
+
 exports[`generateStorageCode > S3 > with secrets 1`] = `
 "from obstore.store import S3Store
 import os

package/src/components/editor/connections/storage/__tests__/as-code.test.ts

@@ -9,9 +9,13 @@ describe("generateStorageCode", () => {
     type: "s3",
     bucket: "my-bucket",
     region: "us-east-1",
-    access_key_id: "AKIAIOSFODNN7EXAMPLE",
-    secret_access_key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
     endpoint_url: undefined,
+    allow_http: false,
+    auth: {
+      type: "Access keys",
+      access_key_id: "AKIAIOSFODNN7EXAMPLE",
+      secret_access_key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+    },
   };
 
   const baseGCS: StorageConnection = {
@@ -31,8 +35,11 @@ describe("generateStorageCode", () => {
     type: "coreweave",
     bucket: "operator-bucket",
     region: "US-EAST-04A",
-    access_key_id: "AKIAIOSFODNN7EXAMPLE",
-    secret_access_key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+    auth: {
+      type: "Access keys",
+      access_key_id: "AKIAIOSFODNN7EXAMPLE",
+      secret_access_key: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+    },
   };
 
   const baseGDrive: StorageConnection = {
@@ -52,6 +59,8 @@ describe("generateStorageCode", () => {
       const conn: StorageConnection = {
         type: "s3",
         bucket: "my-bucket",
+        allow_http: false,
+        auth: { type: "Access keys" },
       };
       expect(
         generateStorageCode(conn, { library: "obstore" }),
@@ -68,13 +77,61 @@ describe("generateStorageCode", () => {
       ).toMatchSnapshot();
     });
 
+    it("with plain-http endpoint", () => {
+      const conn: StorageConnection = {
+        ...baseS3,
+        endpoint_url: "http://cwlota.com",
+        allow_http: true,
+      };
+      expect(
+        generateStorageCode(conn, { library: "obstore" }),
+      ).toMatchSnapshot();
+    });
+
+    it("with container credentials", () => {
+      const conn: StorageConnection = {
+        ...baseS3,
+        auth: {
+          type: "Container credentials",
+          container_credentials_full_uri:
+            "http://169.254.170.23/v1/credentials",
+          container_authorization_token_file: "/var/run/secrets/token",
+        },
+      };
+      expect(
+        generateStorageCode(conn, { library: "obstore" }),
+      ).toMatchSnapshot();
+    });
+
+    it("with container credentials from secrets", () => {
+      const conn: StorageConnection = {
+        ...baseS3,
+        auth: {
+          type: "Container credentials",
+          container_credentials_full_uri: prefixSecret(
+            "AWS_CONTAINER_CREDENTIALS_FULL_URI",
+          ),
+          container_authorization_token_file: prefixSecret(
+            "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE",
+          ),
+        },
+      };
+      expect(
+        generateStorageCode(conn, { library: "obstore" }),
+      ).toMatchSnapshot();
+    });
+
     it("with secrets", () => {
       const conn: StorageConnection = {
         type: "s3",
         bucket: "my-bucket",
         region: "us-east-1",
-        access_key_id: prefixSecret("AWS_ACCESS_KEY_ID"),
-        secret_access_key: prefixSecret("AWS_SECRET_ACCESS_KEY"),
+        allow_http: false,
+        auth: {
+          type: "Access keys",
+          access_key_id: prefixSecret("AWS_ACCESS_KEY_ID"),
+          secret_access_key: prefixSecret("AWS_SECRET_ACCESS_KEY"),
+        },
       };
       expect(
         generateStorageCode(conn, { library: "obstore" }),
@@ -143,6 +200,25 @@ describe("generateStorageCode", () => {
         type: "coreweave",
         bucket: "operator-bucket",
         region: "US-EAST-04A",
+        auth: { type: "Access keys" },
+      };
+      expect(
+        generateStorageCode(conn, { library: "obstore" }),
+      ).toMatchSnapshot();
+    });
+
+    it("with container credentials", () => {
+      const conn: StorageConnection = {
+        ...baseCoreWeave,
+        auth: {
+          type: "Container credentials",
+          container_credentials_full_uri: prefixSecret(
+            "AWS_CONTAINER_CREDENTIALS_FULL_URI",
+          ),
+          container_authorization_token_file: prefixSecret(
+            "AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE",
+          ),
+        },
       };
       expect(
         generateStorageCode(conn, { library: "obstore" }),
@@ -154,8 +230,11 @@ describe("generateStorageCode", () => {
         type: "coreweave",
         bucket: "operator-bucket",
         region: "US-EAST-04A",
-        access_key_id: prefixSecret("COREWEAVE_OBJECT_STORAGE_KEY"),
-        secret_access_key: prefixSecret("COREWEAVE_OBJECT_STORAGE_SECRET"),
+        auth: {
+          type: "Access keys",
+          access_key_id: prefixSecret("COREWEAVE_OBJECT_STORAGE_KEY"),
+          secret_access_key: prefixSecret("COREWEAVE_OBJECT_STORAGE_SECRET"),
+        },
       };
       expect(
         generateStorageCode(conn, { library: "obstore" }),

package/src/components/editor/connections/storage/as-code.ts

@@ -3,7 +3,11 @@
 import dedent from "string-dedent";
 import { assertNever } from "@/utils/assertNever";
 import { isSecret, unprefixSecret } from "../secrets";
-import { type StorageConnection, StorageConnectionSchema } from "./schemas";
+import {
+  type S3Auth,
+  type StorageConnection,
+  StorageConnectionSchema,
+} from "./schemas";
 
 export type StorageLibrary = "obstore" | "fsspec";
 
@@ -50,6 +54,36 @@ class SecretContainer {
   }
 }
 
+/**
+ * Credential kwargs shared by every S3-compatible store.
+ */
+function s3AuthParams(
+  auth: S3Auth | undefined,
+  secrets: SecretContainer,
+): string[] {
+  // obstore polls the credential endpoint with the token read from the file,
+  // refreshing credentials for the lifetime of the store.
+  if (auth?.type === "Container credentials") {
+    return [
+      `    container_credentials_full_uri=${secrets.print("container_credentials_full_uri", auth.container_credentials_full_uri)},`,
+      `    container_authorization_token_file=${secrets.print("container_authorization_token_file", auth.container_authorization_token_file)},`,
+    ];
+  }
+
+  const params: string[] = [];
+  if (auth?.access_key_id) {
+    params.push(
+      `    access_key_id=${secrets.print("access_key_id", auth.access_key_id)},`,
+    );
+  }
+  if (auth?.secret_access_key) {
+    params.push(
+      `    secret_access_key=${secrets.print("secret_access_key", auth.secret_access_key)},`,
+    );
+  }
+  return params;
+}
+
 function generateS3Code(
   connection: Extract<StorageConnection, { type: "s3" }>,
   secrets: SecretContainer,
@@ -61,21 +95,15 @@ function generateS3Code(
   if (connection.region) {
     params.push(`    region=${secrets.print("region", connection.region)},`);
   }
-  if (connection.access_key_id) {
-    params.push(
-      `    access_key_id=${secrets.print("access_key_id", connection.access_key_id)},`,
-    );
-  }
-  if (connection.secret_access_key) {
-    params.push(
-      `    secret_access_key=${secrets.print("secret_access_key", connection.secret_access_key)},`,
-    );
-  }
+  params.push(...s3AuthParams(connection.auth, secrets));
   if (connection.endpoint_url) {
     params.push(
       `    endpoint_url=${secrets.print("endpoint_url", connection.endpoint_url)},`,
     );
   }
+  if (connection.allow_http) {
+    params.push("    allow_http=True,");
+  }
 
   const paramsStr = params.length > 0 ? `\n${params.join("\n")}\n` : "";
 
@@ -140,16 +168,7 @@ function generateCoreWeaveCode(
     `    region=${secrets.print("region", connection.region)},`,
   ];
 
-  if (connection.access_key_id) {
-    params.push(
-      `    access_key_id=${secrets.print("access_key_id", connection.access_key_id)},`,
-    );
-  }
-  if (connection.secret_access_key) {
-    params.push(
-      `    secret_access_key=${secrets.print("secret_access_key", connection.secret_access_key)},`,
-    );
-  }
+  params.push(...s3AuthParams(connection.auth, secrets));
 
   params.push(
     `    endpoint="https://${connection.bucket}.cwobject.com",`,

package/src/components/editor/connections/storage/schemas.ts

@@ -2,6 +2,83 @@
 import { z } from "zod";
 import { FieldOptions } from "@/components/forms/options";
 
+/**
+ * Credentials shared by every S3-compatible store (Amazon S3, CoreWeave, ...).
+ *
+ * Rendered as tabs: either long-lived access keys, or a credential-vending
+ * endpoint (ECS/EKS task roles, CoreWeave sandboxes, ...) that obstore polls
+ * with a bearer token read from disk.
+ */
+const s3AuthField = () =>
+  z
+    .discriminatedUnion("type", [
+      z.object({
+        type: z.literal("Access keys"),
+        access_key_id: z
+          .string()
+          .optional()
+          .describe(
+            FieldOptions.of({
+              label: "Access Key ID",
+              description: "Leave empty to use the default credential chain",
+              inputType: "password",
+              optionRegex:
+                "(access.?key.?id|object.?storage.?key|aws.?access.?key)",
+            }),
+          ),
+        secret_access_key: z
+          .string()
+          .optional()
+          .describe(
+            FieldOptions.of({
+              label: "Secret Access Key",
+              inputType: "password",
+              optionRegex:
+                "(secret.?access.?key|object.?storage.?secret|aws.?secret)",
+            }),
+          ),
+      }),
+      z.object({
+        type: z.literal("Container credentials"),
+        container_credentials_full_uri: z
+          .string()
+          .nonempty()
+          .describe(
+            FieldOptions.of({
+              label: "Credentials URI",
+              description: "Endpoint that vends credentials to the container",
+              placeholder: "http://169.254.170.23/v1/credentials",
+              optionRegex: "container.?credentials",
+            }),
+          ),
+        container_authorization_token_file: z
+          .string()
+          .nonempty()
+          .describe(
+            FieldOptions.of({
+              label: "Authorization Token File",
+              description: "File holding the token sent to the credentials URI",
+              placeholder: "/var/run/secrets/token",
+              optionRegex:
+                "(container.?authorization.?token.?file|container.?auth.?token)",
+            }),
+          ),
+      }),
+    ])
+    .default({ type: "Access keys" })
+    .describe(FieldOptions.of({ label: "Credentials", special: "tabs" }));
+
+const allowHttpField = () =>
+  z
+    .boolean()
+    .default(false)
+    .describe(
+      FieldOptions.of({
+        label: "Allow HTTP",
+        description: "Required for plain-http (non-TLS) endpoints",
+      }),
+    );
+
 export const S3StorageSchema = z
   .object({
     type: z.literal("s3"),
@@ -25,36 +102,20 @@ export const S3StorageSchema = z
           optionRegex: "(region|aws.?region)",
         }),
       ),
-    access_key_id: z
-      .string()
-      .optional()
-      .describe(
-        FieldOptions.of({
-          label: "Access Key ID",
-          inputType: "password",
-          optionRegex: "(access.?key.?id|aws.?access.?key)",
-        }),
-      ),
-    secret_access_key: z
-      .string()
-      .optional()
-      .describe(
-        FieldOptions.of({
-          label: "Secret Access Key",
-          inputType: "password",
-          optionRegex: "(secret.?access.?key|aws.?secret)",
-        }),
-      ),
     endpoint_url: z
       .string()
       .optional()
       .describe(
         FieldOptions.of({
           label: "Endpoint URL",
+          description:
+            "Ignored if the AWS_ENDPOINT_URL_S3 environment variable is set",
           placeholder: "https://s3.amazonaws.com",
           optionRegex: "(endpoint|s3.?url|s3.?endpoint)",
         }),
       ),
+    allow_http: allowHttpField(),
+    auth: s3AuthField(),
   })
   .describe(FieldOptions.of({ direction: "two-columns" }));
 
@@ -139,28 +200,7 @@ export const CoreWeaveStorageSchema = z
           placeholder: "US-EAST-04A",
         }),
       ),
-    access_key_id: z
-      .string()
-      .optional()
-      .describe(
-        FieldOptions.of({
-          label: "Access Key ID",
-          inputType: "password",
-          optionRegex:
-            "(access.?key.?id|object.?storage.?key|aws.?access.?key)",
-        }),
-      ),
-    secret_access_key: z
-      .string()
-      .optional()
-      .describe(
-        FieldOptions.of({
-          label: "Secret Access Key",
-          inputType: "password",
-          optionRegex:
-            "(secret.?access.?key|object.?storage.?secret|aws.?secret)",
-        }),
-      ),
+    auth: s3AuthField(),
   })
   .describe(FieldOptions.of({ direction: "two-columns" }));
 
@@ -189,3 +229,4 @@ export const StorageConnectionSchema = z.discriminatedUnion("type", [
 ]);
 
 export type StorageConnection = z.infer<typeof StorageConnectionSchema>;
+export type S3Auth = Extract<StorageConnection, { type: "s3" }>["auth"];