Compare commits

...
2 Commits
Author SHA1 Message Date
shadowdaoandClaude Opus 5.5 90fae8451f fix(aws): review fixes for hosts settings
Secret Scan / scan (push) Successful in 8s
Build App (Preview) / compute-version (pull_request) Successful in 6s
Secret Scan / scan (pull_request) Successful in 14s
Build App (Preview) / create-release (pull_request) Successful in 2s
Build App (Preview) / test (pull_request) Successful in 9m36s
Build App (Preview) / build-macos (pull_request) Successful in 6m14s
Build App (Preview) / build-windows (pull_request) Successful in 11m11s
Build App (Preview) / build-linux (pull_request) Successful in 21m26s
Build App (Preview) / prune-previews (pull_request) Successful in 3s
- Runs carry an explicit kind (deploy, follow, repair, update, destroy,
  onboard, push, boundary); the admin-bundle offer after an AWS refusal
  keys on kind deploy/onboard, not the label, so a refused follow of an
  existing environment's deploy no longer offers a new-environment bundle.
- looksDenied no longer matches a bare "explicit deny" (SCP and bucket
  policy denies aren't fixed by a bundle); the hint says it may need an admin.
- The aws sso login hint breaks long profile names.
- The "Not an admin?" disclosure shows a ▸/▾ marker like the Environments
  toggle.
- Note: the previous commit's Modal footer flex-wrap is app-wide (every
  modal's buttons now wrap when the dialog is narrow); kept deliberately.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-17 12:19:04 -08:00
shadowdaoandClaude Opus 5.5 a93a8135be fix(aws): settings layout and deploy for anyone who can
Build App (Preview) / compute-version (pull_request) Successful in 5s
Secret Scan / scan (push) Successful in 23s
Secret Scan / scan (pull_request) Successful in 9s
Build App (Preview) / create-release (pull_request) Successful in 3s
Build App (Preview) / build-macos (pull_request) Successful in 6m24s
Build App (Preview) / build-windows (pull_request) Successful in 11m28s
Build App (Preview) / build-linux (pull_request) Successful in 23m6s
Build App (Preview) / test (pull_request) Successful in 26m21s
Build App (Preview) / prune-previews (pull_request) Successful in 5s
Hosts settings live in a 224-320px sidebar; nowrap buttons and long ARNs,
policy names and run summaries overflowed it. Button and StatusIndicator get
an opt-in wrap prop; host, environment, progress and policy rows wrap with
min-w-0 children; policy copy buttons sit in an auto-fill grid; pre blocks
scroll; the Modal footer wraps.

Deploy a new environment and self-join are offered to anyone after a scan.
When the permission check didn't confirm environment-admin rights a note
says AWS has the last word, and the policies and environment request sit
under a 'Not an admin?' disclosure. The boundary note shows whenever the
boundary is missing. AWS refusals show AWS's message (awsErrorMessage now
names the denied action) and offer the admin bundle: in the deploy and join
modals, and under a failed deploy/join run whose output reads as denied.
The backend already had no tier check on onboard_aws_user; its comment is
corrected.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-17 12:16:55 -08:00
19 changed files with 589 additions and 163 deletions

No files matched your search

@@ -374,9 +374,10 @@ pub(crate) fn ec2_collision_refusal(
/// Everything a self-onboarding apply needs settled before it starts: the
/// caller's record, the capacity ([`resolve_ec2`]), the module variables
/// and, with EC2 capacity, the name check ([`ec2_collision_refusal`]).
/// Check-then-apply leaves a narrow race (another admin creating the same
/// names in between); only admins apply, and the module would then fail on
/// create rather than adopt.
/// Check-then-apply leaves a narrow race (someone else creating the same
/// names in between); the module would then fail on create rather than
/// adopt. Anyone may start this: there is no tier check in the app, and AWS
/// refuses (mapped to `AccessDenied`) what the caller isn't permitted.
pub(crate) async fn prepare_onboarding<A: OnboardApi>(
api: &A,
env: &str,
+14 -14
View File
@@ -64,10 +64,10 @@ function ErrorLine({
}) {
return (
<div role="alert" className="text-xs text-[var(--error)] leading-snug flex items-center gap-2 flex-wrap">
<span>{awsErrorMessage(failure.error)}</span>
<span className="min-w-0 break-words">{awsErrorMessage(failure.error)}</span>
{failure.error.kind === "sso_expired" && !onSignIn && (
<span>
Sign in with <code>aws sso login --profile {failure.error.profile}</code> and try again.
Sign in with <code className="break-all">aws sso login --profile {failure.error.profile}</code> and try again.
</span>
)}
{failure.error.kind === "sso_expired" && onSignIn && (
@@ -124,7 +124,7 @@ function PermissionReportView({ report }: { report: PermissionReport }) {
>
{badge}
</span>
<span className="text-xs text-[var(--text-secondary)]">
<span className="min-w-0 break-all text-xs text-[var(--text-secondary)]" data-testid="report-identity">
{report.identity.arn} · {report.region}
</span>
</div>
@@ -154,8 +154,8 @@ function PermissionReportView({ report }: { report: PermissionReport }) {
</summary>
<ul className="mt-1 space-y-0.5 pl-4">
{t.results.map((r) => (
<li key={r.action} className="text-[var(--text-secondary)]">
<span className="font-mono">{r.action}</span> — {r.verdict}
<li key={r.action} className="text-[var(--text-secondary)] break-words">
<span className="font-mono break-all">{r.action}</span> — {r.verdict}
{r.note && (
<>
{" "}
@@ -263,7 +263,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
<li
ref={rowRef}
data-testid={`host-${host.id}`}
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2.5 space-y-1.5"
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2.5 space-y-1.5 min-w-0"
>
{editing ? (
<div className="space-y-2">
@@ -273,7 +273,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
<input id={id} className={inputClass} list="aws-regions" value={region} onChange={(e) => setRegion(e.target.value)} />
)}
</Field>
<div className="flex gap-2">
<div className="flex gap-2 flex-wrap">
<Button size="sm" variant="primary" onClick={save} disabled={busy || !name.trim() || !region.trim()}>
Save changes
</Button>
@@ -283,16 +283,16 @@ function ConnectionRow({ host }: { host: HostConnection }) {
</div>
</div>
) : (
<div className="flex items-start justify-between gap-2 flex-wrap">
<div className="flex items-start justify-between gap-2 flex-wrap" data-testid={`host-header-${host.id}`}>
<div className="min-w-0">
<div className="text-[13px] font-medium text-[var(--text-primary)]">{host.name}</div>
<div className="text-xs text-[var(--text-secondary)]">
<div className="text-[13px] font-medium text-[var(--text-primary)] break-words">{host.name}</div>
<div className="text-xs text-[var(--text-secondary)] break-words">
<span>{auth.method === "profile" ? `Profile: ${auth.name}` : "Access keys"}</span>
{" · "}
<span>{host.kind.default_region}</span>
</div>
</div>
<div className="flex gap-1.5">
<div className="flex gap-1.5 flex-wrap">
<Button size="sm" onClick={runCheck} disabled={busy} aria-label={`Check ${host.name}`}>
Check
</Button>
@@ -309,7 +309,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
)}
{confirmRemove && (
<div role="alertdialog" aria-label={`Remove ${host.name}?`} className="flex items-center gap-2 flex-wrap text-xs">
<span>Remove {host.name}? Its stored credentials are deleted.</span>
<span className="min-w-0 break-words">Remove {host.name}? Its stored credentials are deleted.</span>
<Button data-focus="confirm-remove" size="sm" variant="danger" onClick={remove} disabled={busy} aria-label={`Confirm remove ${host.name}`}>
Confirm remove
</Button>
@@ -501,7 +501,7 @@ function AddConnectionForm() {
{busy ? "Adding…" : "Add connection"}
</Button>
{signedInAs && (
<p role="status" className="text-xs text-[var(--success)]">
<p role="status" className="text-xs text-[var(--success)] break-all">
Signed in as {signedInAs}
</p>
)}
@@ -516,7 +516,7 @@ export default function HostsSettings() {
const { appSettings } = useSettings();
const hosts = appSettings?.hosts ?? [];
return (
<div className="space-y-3">
<div className="space-y-3 min-w-0">
<p className="text-xs text-[var(--text-secondary)] leading-snug">
Where project environments run. AWS connections check what your credentials can do, and find, deploy and join environments.
</p>
@@ -177,7 +177,7 @@ export default function AdminBundleModal({
Saved to <code className="font-mono text-[var(--text-primary)] break-all">{saved}</code>
</p>
<p>From that folder, run:</p>
<pre className="font-mono text-[var(--text-primary)] bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 whitespace-pre-wrap">
<pre className="font-mono text-[var(--text-primary)] bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 whitespace-pre-wrap break-all max-w-full overflow-x-auto">
{COMMANDS}
</pre>
<Button size="sm" onClick={copy}>
@@ -30,6 +30,7 @@ export default function DeployEnvironmentModal({
onClose,
onDeploy,
onDetect,
onBundle,
}: {
connectionId: string;
region: string;
@@ -40,6 +41,8 @@ export default function DeployEnvironmentModal({
/** Starts the run; resolves to the command's error, or null once started. */
onDeploy: (name: string, network: NetworkChoice, maxWorkspaceHours: number) => Promise<AwsError | null>;
onDetect: () => void;
/** Switch to an environment bundle for an admin (offered when AWS refuses the deploy). */
onBundle?: () => void;
}) {
const [name, setName] = useState("main");
const [draft, setDraft] = useState<NetworkDraft>(DEFAULT_NETWORK);
@@ -80,7 +83,7 @@ export default function DeployEnvironmentModal({
const createBoundary = async () => {
setBoundaryError(null);
const err = await boundary.start(BOUNDARY_STATE_KEY, region, "Permissions boundary", () =>
const err = await boundary.start(BOUNDARY_STATE_KEY, region, "boundary", "Permissions boundary", () =>
deployAwsPermissionsBoundary(connectionId, region),
);
if (err?.kind === "access_denied") setBundle({ reason: awsErrorMessage(err) });
@@ -125,18 +128,19 @@ export default function DeployEnvironmentModal({
<div className="flex gap-2 flex-wrap">
<Button
size="md"
wrap
variant="primary"
onClick={createBoundary}
disabled={!!boundaryRun && !boundaryRun.done}
>
Create the permissions boundary (needs an account administrator)
</Button>
<Button size="md" onClick={() => setBundle({})}>
<Button size="md" wrap onClick={() => setBundle({})}>
Save a bundle for an administrator instead
</Button>
</div>
{boundaryError && (
<p role="alert" className="text-[var(--error)]">
<p role="alert" className="text-[var(--error)] break-words">
{awsErrorMessage(boundaryError)}
</p>
)}
@@ -149,6 +153,7 @@ export default function DeployEnvironmentModal({
</p>
<Button
size="md"
wrap
onClick={() =>
setBundle({
reason: boundaryFailed.summary ?? `OpenTofu exited with code ${boundaryFailed.exit_code}`,
@@ -179,10 +184,18 @@ export default function DeployEnvironmentModal({
First deploy downloads OpenTofu (~30 MB) and the AWS provider (~150 MB).
</p>
{error && (
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
{awsErrorMessage(error)}
</p>
)}
{error?.kind === "access_denied" && onBundle && !repair && (
<div className="space-y-1.5 text-xs text-[var(--text-secondary)] leading-snug">
<p>An admin can deploy this environment for you from a bundle.</p>
<Button size="sm" wrap onClick={onBundle}>
Save an environment bundle for an admin…
</Button>
</div>
)}
</div>
)}
</Modal>
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { act, renderHook } from "@testing-library/react";
import { runKey, useDeployRuns } from "./DeployProgress";
import { act, render, renderHook, screen } from "@testing-library/react";
import DeployProgressView, { runKey, useDeployRuns } from "./DeployProgress";
import type { DeployProgress } from "../../../lib/types";
import { progress, tofuEvent } from "./testkit";
@@ -29,10 +29,10 @@ describe("useDeployRuns", () => {
const onDone = vi.fn();
const { result } = renderHook(() => useDeployRuns(onDone));
await act(async () => {
await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => "eu");
await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => "eu");
});
await act(async () => {
await result.current.start(KEY, "us-east-1", "Deploy of main", async () => "us");
await result.current.start(KEY, "us-east-1", "deploy", "Deploy of main", async () => "us");
});
expect(handlers.size).toBe(2);
emit(progress({ op_id: "eu", state_key: KEY, events: [tofuEvent("eu line")] }));
@@ -54,8 +54,8 @@ describe("useDeployRuns", () => {
it("removes its progress listeners on unmount", async () => {
const { result, unmount } = renderHook(() => useDeployRuns());
await act(async () => {
await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => "a");
await result.current.start("boundary/terraform.tfstate", "eu-west-1", "Boundary", async () => "b");
await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => "a");
await result.current.start("boundary/terraform.tfstate", "eu-west-1", "deploy", "Boundary", async () => "b");
});
expect(handlers.size).toBe(2);
unmount();
@@ -66,7 +66,7 @@ describe("useDeployRuns", () => {
const { result } = renderHook(() => useDeployRuns());
let err: unknown;
await act(async () => {
err = await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => {
err = await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => {
throw { kind: "other", message: "A deployment is already running" };
});
});
@@ -75,3 +75,28 @@ describe("useDeployRuns", () => {
expect(result.current.runs).toEqual({});
});
});
describe("DeployProgress layout", () => {
it("wraps its header and a long failure summary", () => {
render(
<DeployProgressView
connectionId="h1"
run={{
stateKey: KEY,
region: "eu-west-1",
kind: "deploy",
label: "Deploy of main",
opId: "x",
events: [],
done: true,
cancellable: false,
result: { ok: false, exit_code: 1, summary: "a very long summary ".repeat(10) },
}}
/>,
);
const header = screen.getByTestId("deploy-progress-header");
expect(header.className).toContain("flex-wrap");
expect(header.firstElementChild?.className).toContain("min-w-0");
expect(screen.getByRole("status").firstElementChild?.className).toContain("whitespace-normal");
});
});
@@ -13,10 +13,18 @@ import Button from "../../ui/Button";
import Modal from "../../ui/Modal";
import StatusIndicator from "../../ui/StatusIndicator";
/**
* What a run does. Decisions about a run (such as offering an admin bundle
* when AWS refuses it) key on this, never on its label: a follow of an
* existing environment's deploy is labelled like a new deploy.
*/
export type RunKind = "deploy" | "follow" | "repair" | "update" | "destroy" | "onboard" | "push" | "boundary";
/** One OpenTofu run this view is showing: a start, or a follow of one already running. */
export interface DeployRun {
stateKey: string;
region: string;
kind: RunKind;
label: string;
/** Null until the starting command resolves. */
opId: string | null;
@@ -57,7 +65,13 @@ export function useDeployRuns(
}, []);
const start = useCallback(
async (stateKey: string, region: string, label: string, run: () => Promise<string>): Promise<AwsError | null> => {
async (
stateKey: string,
region: string,
kind: RunKind,
label: string,
run: () => Promise<string>,
): Promise<AwsError | null> => {
const k = runKey(region, stateKey);
subs.current.get(k)?.unlisten?.();
const sub: Subscription = { unlisten: null };
@@ -94,7 +108,7 @@ export function useDeployRuns(
setRuns((prev) => ({
...prev,
[k]: { stateKey, region, label, opId: null, events: [], done: false, cancellable: false, result: null },
[k]: { stateKey, region, kind, label, opId: null, events: [], done: false, cancellable: false, result: null },
}));
const unlisten = await listen<ProgressPayload>(AWS_DEPLOY_PROGRESS_EVENT, ({ payload }) => {
@@ -146,7 +160,7 @@ function EventLine({ e }: { e: TofuEvent }) {
return (
<li className="text-xs leading-snug">
{(e.resource || e.action) && (
<span className="mr-1.5">
<span className="mr-1.5 break-all">
{e.resource && <span className="font-mono text-[var(--text-primary)]">{e.resource}</span>}
{e.action && <span className="ml-1 text-[var(--text-secondary)]">{e.action}</span>}
</span>
@@ -154,10 +168,10 @@ function EventLine({ e }: { e: TofuEvent }) {
{isError ? (
<>
<span className="font-semibold text-[var(--error)]">Error: </span>
<pre className="whitespace-pre-wrap break-words font-mono text-[var(--error)]">{e.message}</pre>
<pre className="max-w-full overflow-x-auto whitespace-pre-wrap break-words font-mono text-[var(--error)]">{e.message}</pre>
</>
) : (
<span className="text-[var(--text-secondary)]">{e.message}</span>
<span className="text-[var(--text-secondary)] break-words">{e.message}</span>
)}
</li>
);
@@ -205,14 +219,14 @@ export default function DeployProgress({
return (
<section
aria-label={`${run.label} progress`}
className="space-y-1.5 border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 bg-[var(--bg-primary)]"
className="space-y-1.5 min-w-0 border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 bg-[var(--bg-primary)]"
>
<div className="flex items-center justify-between gap-2 flex-wrap">
<div className="flex items-center gap-2 text-xs">
<span className="font-medium text-[var(--text-primary)]">{run.label}</span>
<div className="flex items-center justify-between gap-2 flex-wrap" data-testid="deploy-progress-header">
<div className="flex items-center gap-2 text-xs flex-wrap min-w-0">
<span className="font-medium text-[var(--text-primary)] break-words min-w-0">{run.label}</span>
{status && <StatusIndicator tone={status.tone} label={status.label} />}
</div>
<div className="flex gap-1.5">
<div className="flex gap-1.5 flex-wrap">
{!run.done && (
<Button
size="sm"
@@ -239,11 +253,12 @@ export default function DeployProgress({
</ol>
)}
{run.done && run.result && (
<p role="status" className="text-xs">
<p role="status" className="text-xs break-words">
{run.result.ok ? (
<StatusIndicator tone="ok" label={`Finished${run.result.summary ? `: ${run.result.summary}` : ""}`} />
<StatusIndicator wrap tone="ok" label={`Finished${run.result.summary ? `: ${run.result.summary}` : ""}`} />
) : (
<StatusIndicator
wrap
tone="error"
label={`Failed (exit ${run.result.exit_code})${run.result.summary ? `: ${run.result.summary}` : ""}`}
/>
@@ -251,7 +266,7 @@ export default function DeployProgress({
</p>
)}
{cancelError && !confirming && (
<p role="alert" className="text-xs text-[var(--error)]">
<p role="alert" className="text-xs text-[var(--error)] break-words">
{awsErrorMessage(cancelError)}
</p>
)}
@@ -48,6 +48,7 @@ export default function Ec2CapacityFields({
<div className="text-[13px] font-medium text-[var(--text-primary)]">EC2 capacity</div>
<SegmentedControl<"none" | "ec2">
label="EC2 capacity"
className="flex-wrap max-w-full"
value={value.enabled ? "ec2" : "none"}
onChange={(v) => set({ enabled: v === "ec2" })}
segments={[
@@ -81,7 +81,7 @@ describe("EnvironmentsPanel", () => {
expect(within(screen.getByTestId("env-dev")).getByText("Joined")).toBeInTheDocument();
});
it("offers an admin bundle instead of deploy for a workspace user with nothing found", async () => {
it("offers deploy to a workspace user too, with a note and the admin options under a disclosure", async () => {
backend(
() => scan(),
(cmd) => {
@@ -91,22 +91,162 @@ describe("EnvironmentsPanel", () => {
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
expect(await screen.findByText(/needs an environment admin/)).toBeInTheDocument();
expect(screen.queryByRole("button", { name: "Deploy a new environment" })).toBeNull();
fireEvent.click(screen.getByRole("button", { name: "Show the environment-admin policies" }));
expect(await screen.findByText("environment-admin.json")).toBeInTheDocument();
const deploy = await screen.findByRole("button", { name: "Deploy a new environment" });
expect(deploy.className).toContain("--accent-emphasis");
expect(screen.getByTestId("deploy-unconfirmed-note")).toHaveTextContent(
"Your permission check didn't confirm environment-admin rights; the deploy will stop with AWS's message if a permission is missing.",
);
const options = screen.getByTestId("not-admin-options");
expect(options.tagName).toBe("DETAILS");
expect(within(options).getByText(/Not an admin\?/)).toBeInTheDocument();
fireEvent.click(within(options).getByRole("button", { name: "Show the environment-admin policies" }));
expect(await within(options).findByRole("button", { name: "Copy environment-admin.json" })).toBeInTheDocument();
expect(invoke).toHaveBeenCalledWith("aws_policy_document", { tier: "environment_admin" });
fireEvent.click(screen.getByRole("button", { name: "Request an environment from an admin…" }));
fireEvent.click(within(options).getByRole("button", { name: "Request an environment from an admin…" }));
const dialog = screen.getByRole("dialog");
expect(within(dialog).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
});
it("treats a connection with no permission report as not an admin", async () => {
it("opens the deploy form for a workspace user", async () => {
backend(() => scan());
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
expect(screen.getByRole("dialog", { name: "Deploy a new environment" })).toBeInTheDocument();
});
it("an admin sees deploy without the note or the not-an-admin options", async () => {
backend(() => scan());
render(<EnvironmentsPanel connection={conn} tier="environment_admin" />);
await open();
expect(await screen.findByRole("button", { name: "Deploy a new environment" })).toBeInTheDocument();
expect(screen.queryByTestId("deploy-unconfirmed-note")).toBeNull();
expect(screen.queryByTestId("not-admin-options")).toBeNull();
});
it("a connection with no permission report gets deploy with the note", async () => {
backend(() => scan());
render(<EnvironmentsPanel connection={conn} />);
await open();
expect(await screen.findByRole("button", { name: "Request an environment from an admin…" })).toBeInTheDocument();
expect(screen.queryByRole("button", { name: "Deploy a new environment" })).toBeNull();
expect(await screen.findByRole("button", { name: "Deploy a new environment" })).toBeInTheDocument();
expect(screen.getByTestId("deploy-unconfirmed-note")).toBeInTheDocument();
expect(screen.getByText(/Run Check to see what your credentials can do/)).toBeInTheDocument();
});
it("shows the boundary note to anyone when the account has no boundary", async () => {
backend(() => scan({ boundary: "no" }));
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
expect(await screen.findByText(/no Triple-C permissions boundary yet/)).toBeInTheDocument();
});
it("offers a bundle when AWS refuses a deploy run's permission", async () => {
backend(
() => scan(),
(cmd) => {
if (cmd === "deploy_aws_environment") return "d1";
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Deploy" }));
await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull());
const key = "environments/main/terraform.tfstate";
emit(
progress({
op_id: "d1",
state_key: key,
events: [tofuEvent("creating IAM Role: AccessDenied: User is not authorized to perform iam:CreateRole", { level: "error" })],
}),
);
emit(progress({ op_id: "d1", state_key: key, done: true, cancellable: false, result: { ok: false, exit_code: 1, summary: null } }));
const hint = await screen.findByTestId("denied-hint");
expect(hint).toHaveTextContent("AWS refused a permission");
fireEvent.click(within(hint).getByRole("button", { name: "Save a bundle for an admin…" }));
expect(within(screen.getByRole("dialog")).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
});
it("never offers a new-environment bundle for a refused follow of an existing deploy", async () => {
const key = "environments/dev/terraform.tfstate";
backend(
() => scan({ environments: [env({ actions: ["follow"], state: { state: "ready" } })] }),
(cmd) => {
if (cmd === "follow_aws_deployment") return "f9";
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
await waitFor(() => expect(invoke.mock.calls.some((c) => c[0] === "follow_aws_deployment")).toBe(true));
await screen.findByRole("region", { name: "Deploy of dev progress" });
emit(
progress({
op_id: "f9",
state_key: key,
events: [tofuEvent("AccessDenied: User is not authorized to perform ecs:UpdateService", { level: "error" })],
}),
);
emit(progress({ op_id: "f9", state_key: key, done: true, cancellable: false, result: { ok: false, exit_code: 1, summary: null } }));
expect(await screen.findByText(/Failed \(exit 1\)/)).toBeInTheDocument();
expect(screen.queryByTestId("denied-hint")).toBeNull();
});
it("marks the not-an-admin disclosure open or closed like the Environments toggle", async () => {
backend(() => scan());
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
const options = await screen.findByTestId("not-admin-options");
const summary = options.querySelector("summary")!;
expect(summary).toHaveTextContent("▸");
(options as HTMLDetailsElement).open = true;
fireEvent(options, new Event("toggle"));
await waitFor(() => expect(summary).toHaveTextContent("▾"));
});
it("shows a refused deploy's AWS message and offers the bundle", async () => {
backend(
() => scan(),
(cmd) => {
if (cmd === "deploy_aws_environment")
throw { kind: "access_denied", action: "s3:CreateBucket", message: "User is not authorized" };
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
const dialog = screen.getByRole("dialog");
fireEvent.click(within(dialog).getByRole("button", { name: "Deploy" }));
expect(await within(dialog).findByText("AWS denied s3:CreateBucket: User is not authorized")).toBeInTheDocument();
fireEvent.click(within(dialog).getByRole("button", { name: "Save an environment bundle for an admin…" }));
expect(within(screen.getByRole("dialog")).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
});
it("keeps the key rows wrapping in a narrow sidebar", async () => {
backend(
() => scan({ environments: [env({ actions: ["join", "update", "repair"] })] }),
(cmd) => {
if (cmd === "aws_policy_document") return [{ name: "a.json", json: "{}" }, { name: "b.json", json: "{}" }];
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
const row = await screen.findByTestId("env-row-dev");
expect(row.className).toContain("flex-wrap");
expect(row.firstElementChild?.className).toContain("min-w-0");
const actions = screen.getByTestId("env-actions-dev");
expect(actions.className).toContain("flex-wrap");
expect(actions.className).toContain("min-w-0");
expect(screen.getByTestId("region-row").className).toContain("flex-wrap");
expect(screen.getByRole("button", { name: "Deploy a new environment" }).className).toContain("whitespace-normal");
fireEvent.click(screen.getByRole("button", { name: "Show the environment-admin policies" }));
const grid = await screen.findByTestId("policy-copy-grid");
expect(grid.className).toContain("grid");
expect(grid.className).toContain("auto-fill");
for (const b of within(grid).getAllByRole("button")) expect(b.className).toContain("whitespace-normal");
});
it("an incomplete environment offers repair and destroy, destroy only after typing its name", async () => {
@@ -248,7 +388,43 @@ describe("EnvironmentsPanel", () => {
expect(await within(screen.getByTestId("env-dev")).findByText("Joined")).toBeInTheDocument();
});
it("a workspace user's join opens the onboarding bundle and waits for an admin", async () => {
it("a workspace user can join themselves, with the note", async () => {
backend(
() => scan({ environments: [env()] }),
(cmd) => {
if (cmd === "onboard_aws_user") return "j1";
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
const dialog = screen.getByRole("dialog", { name: "Join dev" });
expect(within(dialog).getByTestId("join-unconfirmed-note")).toBeInTheDocument();
fireEvent.click(within(dialog).getByRole("button", { name: "Join" }));
await waitFor(() =>
expect(invoke).toHaveBeenCalledWith("onboard_aws_user", expect.objectContaining({ environment: "dev" })),
);
});
it("a refused join shows AWS's message and offers the onboarding bundle", async () => {
backend(
() => scan({ environments: [env()] }),
(cmd) => {
if (cmd === "onboard_aws_user") throw { kind: "access_denied", action: "s3:PutObject", message: "explicit deny" };
throw new Error(`unexpected ${cmd}`);
},
);
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
const dialog = screen.getByRole("dialog", { name: "Join dev" });
fireEvent.click(within(dialog).getByRole("button", { name: "Join" }));
expect(await within(dialog).findByText("AWS denied s3:PutObject: explicit deny")).toBeInTheDocument();
expect(within(dialog).getByText(/AWS refused this with your permissions/)).toBeInTheDocument();
});
it("a workspace user can switch the join to an onboarding bundle and then waits for an admin", async () => {
backend(
() => scan({ environments: [env()] }),
(cmd) => {
@@ -259,6 +435,11 @@ describe("EnvironmentsPanel", () => {
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
fireEvent.click(
within(screen.getByRole("dialog", { name: "Join dev" })).getByRole("button", {
name: "Save an onboarding bundle for an admin…",
}),
);
const dialog = screen.getByRole("dialog");
// Opening the bundle is not a request yet.
expect(screen.queryByText("Waiting for an admin to onboard you")).toBeNull();
@@ -280,6 +461,14 @@ describe("EnvironmentsPanel", () => {
expect(within(screen.getByTestId("env-dev")).getByText("Waiting for an admin to onboard you")).toBeInTheDocument();
});
it("an admin's join has no unconfirmed note", async () => {
backend(() => scan({ environments: [env()] }));
render(<EnvironmentsPanel connection={conn} tier="environment_admin" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
expect(within(screen.getByRole("dialog", { name: "Join dev" })).queryByTestId("join-unconfirmed-note")).toBeNull();
});
it("an admin joins with EC2 capacity: a type from the table, max instances and their triple-c-user value", async () => {
backend(
() => scan({ environments: [env()] }),
@@ -422,7 +611,7 @@ describe("EnvironmentsPanel", () => {
expect(within(dialog).queryByText(/Choosing None removes/)).toBeNull();
});
it("a joined workspace user's capacity change is a bundle starting from their record", async () => {
it("a joined workspace user's capacity bundle starts from their record", async () => {
backend(
() => scan({ environments: [env({ onboarding: { state: "joined", ec2: compute({ max_instances: 1 }) } })] }),
(cmd) => {
@@ -434,6 +623,7 @@ describe("EnvironmentsPanel", () => {
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "EC2 capacity in dev" }));
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Save an onboarding bundle for an admin…" }));
const dialog = screen.getByRole("dialog", { name: "Onboarding bundle" });
fireEvent.click(within(dialog).getByRole("button", { name: "Save bundle to folder…" }));
await waitFor(() =>
@@ -525,6 +715,7 @@ describe("EnvironmentsPanel", () => {
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
await open();
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Save an onboarding bundle for an admin…" }));
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Close" }));
expect(screen.queryByText("Waiting for an admin to onboard you")).toBeNull();
expect(within(screen.getByTestId("env-dev")).getByRole("button", { name: "Join dev" })).toHaveTextContent("Join");
@@ -10,7 +10,7 @@ import {
unlockAwsState,
updateAwsEnvironment,
} from "../../../lib/tauri-commands";
import { awsErrorMessage, toAwsError } from "../../../lib/aws-error";
import { awsErrorMessage, looksDenied, toAwsError } from "../../../lib/aws-error";
import { clearEc2CapacityCache } from "../../../lib/ec2Capacity";
import type {
AwsError,
@@ -34,7 +34,7 @@ import AdminBundleModal from "./AdminBundleModal";
import UpdateEnvironmentModal from "./UpdateEnvironmentModal";
import DeployEnvironmentModal from "./DeployEnvironmentModal";
import JoinEnvironmentModal from "./JoinEnvironmentModal";
import DeployProgress, { runKey, useDeployRuns, type DeployRun } from "./DeployProgress";
import DeployProgress, { runKey, useDeployRuns, type DeployRun, type RunKind } from "./DeployProgress";
import PolicyFiles from "./PolicyFiles";
import {
COMMON_REGIONS,
@@ -45,6 +45,7 @@ import {
onboardingStateKey,
stateLock,
stateStatus,
UNCONFIRMED_NOTE,
} from "./environmentFormat";
/** A typed confirmation: the action runs only once the environment's name is typed. */
@@ -118,6 +119,7 @@ type Bundle = {
type JoinOf = {
region: string;
name: string;
ownerId: string;
stateKey: string;
recorded: UserCompute | null;
reapply: boolean;
@@ -131,6 +133,21 @@ const recordedEc2 = (e: DetectedEnvironment): UserCompute | null =>
/** A row-level key: the same environment name can exist in every region. */
const rowKey = (region: string, name: string) => `${region}:${name}`;
/**
* A failed new deploy or self-onboarding started here that AWS refused a
* permission for: the bundle for an admin is the way on. Only those two
* kinds: an environment bundle deploys a *new* environment, so a follow,
* repair or update of an existing one is never offered it.
*/
function deniedRun(r: DeployRun): "environment" | "user_onboard" | null {
if (r.kind !== "deploy" && r.kind !== "onboard") return null;
if (!r.done || !r.result || r.result.ok) return null;
const denied =
looksDenied(r.result.summary) || r.events.some((e) => e.level === "error" && looksDenied(e.message));
if (!denied) return null;
return r.kind === "deploy" ? "environment" : "user_onboard";
}
/** The environment a run's state key belongs to, if any. */
function runEnvironment(stateKey: string): string | null {
const m = /^(?:environments|users)\/([^/]+)\//.exec(stateKey);
@@ -139,14 +156,16 @@ function runEnvironment(stateKey: string): string | null {
/**
* The environments a connection can reach in a region (spec §2): detection,
* each environment's state and actions, and deploy/join for this caller's tier.
* each environment's state and actions, and deploy/join. Deploy and join are
* offered to anyone (AWS has the last word and its refusal is shown); an
* unconfirmed tier only adds a note and the bundle-for-an-admin alternative.
*/
export default function EnvironmentsPanel({
connection,
tier,
}: {
connection: HostConnection;
/** The connection's last permission report; absent means unknown, treated as not an admin. */
/** The connection's last permission report; absent means unknown (not confirmed as an admin). */
tier?: PermissionSummary;
}) {
const isAdmin = tier === "environment_admin";
@@ -176,6 +195,7 @@ export default function EnvironmentsPanel({
// onboarding that didn't finish has no record to start from.
const lastEc2 = useRef(new Map<string, Ec2Compute>());
const [copyNote, setCopyNote] = useState<string | null>(null);
const [notAdminOpen, setNotAdminOpen] = useState(false);
const request = useRef(0);
const followed = useRef(new Set<string>());
@@ -210,11 +230,18 @@ export default function EnvironmentsPanel({
/** Start a run in `runRegion` (always the region of the scan the action came from). */
const launch = useCallback(
async (runRegion: string, envName: string, stateKey: string, label: string, run: () => Promise<string>) => {
async (
runRegion: string,
envName: string,
stateKey: string,
kind: RunKind,
label: string,
run: () => Promise<string>,
) => {
const rk = rowKey(runRegion, envName);
setRowErrors(({ [rk]: _gone, ...rest }) => rest);
setPending((p) => ({ ...p, [rk]: true }));
const err = await start(stateKey, runRegion, label, run);
const err = await start(stateKey, runRegion, kind, label, run);
setPending(({ [rk]: _gone, ...rest }) => rest);
if (err) setRowErrors((r) => ({ ...r, [rk]: err }));
return err;
@@ -230,7 +257,7 @@ export default function EnvironmentsPanel({
const seen = runKey(scan.region, key);
if (!runs[seen] && !followed.current.has(seen)) {
followed.current.add(seen);
void launch(scan.region, name, key, label, () => followAwsDeployment(connection.id, scan.region, key));
void launch(scan.region, name, key, "follow", label, () => followAwsDeployment(connection.id, scan.region, key));
}
};
for (const e of scan.environments) {
@@ -261,50 +288,42 @@ export default function EnvironmentsPanel({
const stale = detecting || !current;
const deploy = (runRegion: string, name: string, network: NetworkChoice, hours: number) =>
launch(runRegion, name, environmentStateKey(name), `Deploy of ${name}`, () =>
launch(runRegion, name, environmentStateKey(name), "deploy", `Deploy of ${name}`, () =>
deployAwsEnvironment(connection.id, runRegion, name, network, hours),
);
// Without `hours`, the environment's recorded cap is kept.
const repair = (runRegion: string, name: string, network?: NetworkChoice, hours?: number) =>
launch(runRegion, name, environmentStateKey(name), `Repair of ${name}`, () =>
launch(runRegion, name, environmentStateKey(name), "repair", `Repair of ${name}`, () =>
repairAwsEnvironment(connection.id, runRegion, name, network, hours),
);
const update = (runRegion: string, name: string, hours: number) =>
launch(runRegion, name, environmentStateKey(name), `Update of ${name}`, () =>
launch(runRegion, name, environmentStateKey(name), "update", `Update of ${name}`, () =>
updateAwsEnvironment(connection.id, runRegion, name, hours),
);
// Join (or, once joined, a change of EC2 capacity): admins choose the
// capacity and apply it themselves; others get a bundle for an admin.
// Join (or, once joined, a change of EC2 capacity): anyone chooses the
// capacity and applies it; the modal offers a bundle for an admin instead.
const join = (found: EnvironmentScan, e: DetectedEnvironment) => {
const recorded = recordedEc2(e);
if (isAdmin) {
setJoinOf({
region: found.region,
name: e.name,
stateKey: onboardingStateKey(e.name, found.owner_key),
recorded,
reapply: e.onboarding?.state === "joined",
incomplete: e.onboarding?.state === "incomplete",
lastChoice: lastEc2.current.get(rowKey(found.region, e.name)) ?? null,
});
} else {
setBundle({
kind: "user_onboard",
region: found.region,
environment: e.name,
ownerId: found.owner_id,
recordedEc2: recorded,
});
}
setJoinOf({
region: found.region,
name: e.name,
ownerId: found.owner_id,
stateKey: onboardingStateKey(e.name, found.owner_key),
recorded: recordedEc2(e),
reapply: e.onboarding?.state === "joined",
incomplete: e.onboarding?.state === "incomplete",
lastChoice: lastEc2.current.get(rowKey(found.region, e.name)) ?? null,
});
};
const onboardBundle = (region: string, environment: string, ownerId: string, recorded: UserCompute | null) =>
setBundle({ kind: "user_onboard", region, environment, ownerId, recordedEc2: recorded });
const runJoin = (j: JoinOf, ec2: Ec2Choice) => {
const key = rowKey(j.region, j.name);
if (ec2.kind === "ec2") {
const { kind: _kind, ...c } = ec2;
lastEc2.current.set(key, c);
} else lastEc2.current.delete(key);
return launch(j.region, j.name, j.stateKey, `Joining ${j.name}`, () => onboardAwsUser(connection.id, j.region, j.name, ec2));
return launch(j.region, j.name, j.stateKey, "onboard", `Joining ${j.name}`, () => onboardAwsUser(connection.id, j.region, j.name, ec2));
};
const rowRuns = (name: string) =>
@@ -313,14 +332,40 @@ export default function EnvironmentsPanel({
const looseRuns = Object.values(runs).filter(
(r) => r.region !== current?.region || !shown.has(runEnvironment(r.stateKey) ?? ""),
);
const progress = (r: DeployRun) => (
<DeployProgress
key={runKey(r.region, r.stateKey)}
run={r}
connectionId={connection.id}
onDismiss={() => dismiss(runKey(r.region, r.stateKey))}
/>
);
const progress = (r: DeployRun) => {
const denied = deniedRun(r);
const env = runEnvironment(r.stateKey);
const found = current?.region === r.region ? current : null;
const target = env && found ? found.environments.find((e) => e.name === env) : undefined;
const offer =
denied === "environment" ? true : denied === "user_onboard" ? !!(found && target) : false;
return (
<div key={runKey(r.region, r.stateKey)} className="space-y-1.5 min-w-0">
<DeployProgress run={r} connectionId={connection.id} onDismiss={() => dismiss(runKey(r.region, r.stateKey))} />
{offer && (
<div className="space-y-1.5 text-xs text-[var(--text-secondary)] leading-snug" data-testid="denied-hint">
<p className="break-words">
AWS refused a permission this run needs (its message is above). This may need an admin:{" "}
{denied === "environment"
? "An admin can deploy the environment for you from a bundle."
: "An admin can onboard you from a bundle."}
</p>
<Button
size="sm"
wrap
onClick={() =>
denied === "environment"
? setBundle({ kind: "environment", region: r.region })
: found && target && onboardBundle(r.region, target.name, found.owner_id, recordedEc2(target))
}
>
Save a bundle for an admin…
</Button>
</div>
)}
</div>
);
};
const envRow = (found: EnvironmentScan, e: DetectedEnvironment) => {
const at = found.region;
@@ -349,10 +394,10 @@ export default function EnvironmentsPanel({
data-testid={`env-${e.name}`}
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 space-y-1.5"
>
<div className="flex items-start justify-between gap-2 flex-wrap">
<div className="min-w-0 space-y-0.5 text-xs">
<div className="flex items-center gap-2 flex-wrap">
<span className="text-[13px] font-medium text-[var(--text-primary)]">{e.name}</span>
<div className="flex items-start justify-between gap-2 flex-wrap" data-testid={`env-row-${e.name}`}>
<div className="min-w-0 flex-1 basis-40 space-y-0.5 text-xs break-words">
<div className="flex items-center gap-2 flex-wrap min-w-0">
<span className="text-[13px] font-medium text-[var(--text-primary)] break-all">{e.name}</span>
<StatusIndicator tone={status.tone} label={status.label} />
{onboarding === "joined" && <StatusIndicator tone="ok" label="Joined" />}
{onboarding === "in_progress" && <StatusIndicator tone="busy" label="Onboarding in progress" />}
@@ -407,11 +452,11 @@ export default function EnvironmentsPanel({
})()}
</div>
)}
{!isAdmin && isWaiting && onboarding !== "joined" && (
{isWaiting && onboarding !== "joined" && (
<div className="text-[var(--text-secondary)]">Waiting for an admin to onboard you</div>
)}
</div>
<div className="flex gap-1.5 flex-wrap">
<div className="flex gap-1.5 flex-wrap min-w-0 max-w-full" data-testid={`env-actions-${e.name}`}>
{has("join") && onboarding !== "joined" && onboarding !== "in_progress" && (
<Button
size="sm"
@@ -420,17 +465,18 @@ export default function EnvironmentsPanel({
aria-label={`Join ${e.name}`}
onClick={() => join(found, e)}
>
{!isAdmin && isWaiting ? "Show onboarding bundle" : "Join"}
Join
</Button>
)}
{has("join") && onboarding === "joined" && (
<Button
size="sm"
wrap
disabled={busy || joinBlocked}
aria-label={`EC2 capacity in ${e.name}`}
onClick={() => join(found, e)}
>
{isAdmin ? "Change EC2 capacity" : "EC2 capacity bundle"}
Change EC2 capacity
</Button>
)}
{mine("follow") && (
@@ -439,7 +485,7 @@ export default function EnvironmentsPanel({
disabled={busy}
aria-label={`Follow my onboarding to ${e.name}`}
onClick={() =>
void launch(at, e.name, myKey, `Joining ${e.name}`, () => followAwsDeployment(connection.id, at, myKey))
void launch(at, e.name, myKey, "follow", `Joining ${e.name}`, () => followAwsDeployment(connection.id, at, myKey))
}
>
Follow
@@ -451,7 +497,7 @@ export default function EnvironmentsPanel({
disabled={busy}
aria-label={`Push saved state of my onboarding to ${e.name}`}
onClick={() =>
void launch(at, e.name, myKey, `Push of the saved state of joining ${e.name}`, () =>
void launch(at, e.name, myKey, "push", `Push of the saved state of joining ${e.name}`, () =>
pushAwsSavedState(connection.id, at, myKey),
)
}
@@ -477,7 +523,7 @@ export default function EnvironmentsPanel({
aria-label={`Push saved state of ${e.name}`}
onClick={() => {
const key = environmentStateKey(e.name);
void launch(at, e.name, key, `Push of the saved state of ${e.name}`, () =>
void launch(at, e.name, key, "push", `Push of the saved state of ${e.name}`, () =>
pushAwsSavedState(connection.id, at, key),
);
}}
@@ -492,7 +538,7 @@ export default function EnvironmentsPanel({
aria-label={`Follow ${e.name}`}
onClick={() => {
const key = environmentStateKey(e.name);
void launch(at, e.name, key, `Deploy of ${e.name}`, () => followAwsDeployment(connection.id, at, key));
void launch(at, e.name, key, "follow", `Deploy of ${e.name}`, () => followAwsDeployment(connection.id, at, key));
}}
>
Follow
@@ -548,7 +594,7 @@ export default function EnvironmentsPanel({
</div>
</div>
{rowError && (
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
{awsErrorMessage(rowError)}
</p>
)}
@@ -560,14 +606,14 @@ export default function EnvironmentsPanel({
const nothingFound = !!current && current.environments.length === 0;
return (
<div className="pt-1.5 space-y-2">
<div className="pt-1.5 space-y-2 min-w-0">
<Button size="sm" variant="ghost" aria-expanded={open} onClick={() => setOpen((o) => !o)}>
<span aria-hidden="true">{open ? "▾" : "▸"}</span>
Environments
</Button>
{open && (
<div className="space-y-2 pl-1">
<div className="flex items-end gap-2 flex-wrap">
<div className="space-y-2 pl-1 min-w-0">
<div className="flex items-end gap-2 flex-wrap min-w-0" data-testid="region-row">
<Field label="Region">
{(id) => (
<select id={id} className={selectClass} value={region} onChange={(e) => setRegion(e.target.value)}>
@@ -589,11 +635,11 @@ export default function EnvironmentsPanel({
</p>
)}
{detectError && (
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
{awsErrorMessage(detectError)}
</p>
)}
{current && isAdmin && current.boundary === "no" && (
{current && current.boundary === "no" && (
<p className="text-xs text-[var(--text-secondary)] leading-snug">
This account has no Triple-C permissions boundary yet; deploying creates it first.
</p>
@@ -604,32 +650,54 @@ export default function EnvironmentsPanel({
{nothingFound && (
<p className="text-xs text-[var(--text-secondary)] leading-snug">
No Triple-C environment in {current.region}.
{!isAdmin &&
" Deploying one needs an environment admin: attach the environment-admin policies to an identity, or send an admin a bundle to deploy."}
{!tier && " Run Check to find out whether you can deploy one yourself."}
{!tier && " Run Check to see what your credentials can do."}
</p>
)}
{current && isAdmin && (
<Button
size="md"
variant={nothingFound ? "primary" : "secondary"}
disabled={stale}
onClick={() => setDeployOpen(true)}
>
Deploy a new environment
</Button>
)}
{nothingFound && !isAdmin && (
<div className="space-y-2">
<PolicyFiles tier="environment_admin" label="Show the environment-admin policies" onCopy={copy} />
<Button size="md" disabled={stale} onClick={() => setBundle({ kind: "environment", region: current.region })}>
Request an environment from an admin…
{current && (
<div className="space-y-1.5 min-w-0" data-testid="deploy-section">
<Button
size="md"
wrap
variant={nothingFound ? "primary" : "secondary"}
disabled={stale}
onClick={() => setDeployOpen(true)}
>
Deploy a new environment
</Button>
{copyNote && (
<p role="status" className="text-xs text-[var(--text-secondary)]">
{copyNote}
{!isAdmin && (
<p className="text-xs text-[var(--text-secondary)] leading-snug break-words" data-testid="deploy-unconfirmed-note">
{UNCONFIRMED_NOTE}
</p>
)}
{!isAdmin && (
<details
className="text-xs min-w-0"
data-testid="not-admin-options"
open={notAdminOpen}
onToggle={(ev) => setNotAdminOpen(ev.currentTarget.open)}
>
<summary className="cursor-pointer list-none [&::-webkit-details-marker]:hidden text-[var(--text-primary)] break-words">
<span aria-hidden="true" className="mr-1">{notAdminOpen ? "▾" : "▸"}</span>
Not an admin? Ask one to deploy it
</summary>
<div className="mt-1.5 space-y-2 min-w-0">
<Button
size="sm"
wrap
disabled={stale}
onClick={() => setBundle({ kind: "environment", region: current.region })}
>
Request an environment from an admin…
</Button>
<PolicyFiles tier="environment_admin" label="Show the environment-admin policies" onCopy={copy} />
{copyNote && (
<p role="status" className="text-xs text-[var(--text-secondary)] break-words">
{copyNote}
</p>
)}
</div>
</details>
)}
</div>
)}
{looseRuns.map(progress)}
@@ -649,6 +717,12 @@ export default function EnvironmentsPanel({
repairOf ? repair(current.region, name, network, hours) : deploy(current.region, name, network, hours)
}
onDetect={() => void detect()}
onBundle={() => {
const at = current.region;
setDeployOpen(false);
setRepairOf(null);
setBundle({ kind: "environment", region: at });
}}
/>
)}
{updateOf && (
@@ -667,7 +741,7 @@ export default function EnvironmentsPanel({
confirmLabel="Destroy"
onClose={() => setDestroyOf(null)}
onConfirm={() =>
launch(destroyOf.region, destroyOf.name, environmentStateKey(destroyOf.name), `Destroy of ${destroyOf.name}`, () =>
launch(destroyOf.region, destroyOf.name, environmentStateKey(destroyOf.name), "destroy", `Destroy of ${destroyOf.name}`, () =>
destroyIncompleteAwsEnvironment(connection.id, destroyOf.region, destroyOf.name),
)
}
@@ -718,6 +792,12 @@ export default function EnvironmentsPanel({
reapply={joinOf.reapply}
incomplete={joinOf.incomplete}
lastChoice={joinOf.lastChoice}
confirmedAdmin={isAdmin}
onBundle={() => {
const j = joinOf;
setJoinOf(null);
onboardBundle(j.region, j.name, j.ownerId, j.recorded);
}}
onJoin={(ec2) => runJoin(joinOf, ec2)}
onClose={() => setJoinOf(null)}
/>
@@ -4,12 +4,13 @@ import type { AwsError, Ec2Choice, Ec2Compute, UserCompute } from "../../../lib/
import Button from "../../ui/Button";
import Modal from "../../ui/Modal";
import Ec2CapacityFields from "./Ec2CapacityFields";
import { ec2DraftFrom, ec2FromDraft, type Ec2Draft } from "./environmentFormat";
import { ec2DraftFrom, ec2FromDraft, UNCONFIRMED_NOTE, type Ec2Draft } from "./environmentFormat";
/**
* Self-onboarding (environment admins): join an environment, or re-apply an
* onboarding to change its EC2 capacity. Starts from the recorded capacity,
* so a re-apply keeps it unless changed.
* Self-onboarding: join an environment, or re-apply an onboarding to change
* its EC2 capacity. Starts from the recorded capacity, so a re-apply keeps it
* unless changed. Open to anyone: AWS refuses the run when a permission is
* missing, and an onboarding bundle for an admin is the alternative.
*/
export default function JoinEnvironmentModal({
environment,
@@ -18,6 +19,8 @@ export default function JoinEnvironmentModal({
reapply,
incomplete = false,
lastChoice = null,
confirmedAdmin = true,
onBundle,
onJoin,
onClose,
}: {
@@ -33,6 +36,10 @@ export default function JoinEnvironmentModal({
/** The EC2 capacity last chosen here in this run of the app, if any:
* the starting point when there is no record. */
lastChoice?: Ec2Compute | null;
/** The permission check confirmed environment-admin rights; otherwise a note says AWS may refuse. */
confirmedAdmin?: boolean;
/** Switch to an onboarding bundle for an admin instead. */
onBundle?: () => void;
/** Starts the run; resolves to the command's error, or null once started. */
onJoin: (ec2: Ec2Choice) => Promise<AwsError | null>;
onClose: () => void;
@@ -73,6 +80,7 @@ export default function JoinEnvironmentModal({
>
<div className="space-y-3 text-xs text-[var(--text-secondary)] leading-snug">
{!reapply && <p>Joining creates your own task role and file system in {environment}.</p>}
{!confirmedAdmin && <p data-testid="join-unconfirmed-note">{UNCONFIRMED_NOTE}</p>}
{recorded && (
<p>Stop your EC2 workspaces before removing EC2 capacity or changing your triple-c-user value: that change can't finish while one runs.</p>
)}
@@ -89,10 +97,22 @@ export default function JoinEnvironmentModal({
</p>
)}
{error && (
<p role="alert" className="text-[var(--error)]">
<p role="alert" className="text-[var(--error)] break-words">
{awsErrorMessage(error)}
</p>
)}
{onBundle && (
<div className="space-y-1.5 pt-1 border-t border-[var(--border-color)]">
<p>
{error?.kind === "access_denied"
? "AWS refused this with your permissions. An admin can onboard you from a bundle instead."
: "Can't onboard yourself? An admin can onboard you from a bundle."}
</p>
<Button size="sm" wrap onClick={onBundle}>
Save an onboarding bundle for an admin…
</Button>
</div>
)}
</div>
</Modal>
);
@@ -28,6 +28,7 @@ export default function NetworkFields({
<div className="text-[13px] font-medium text-[var(--text-primary)]">Network</div>
<SegmentedControl<NetworkChoice["mode"]>
label="Network"
className="flex-wrap max-w-full"
value={value.mode}
onChange={(mode) => set({ mode })}
segments={[
@@ -28,12 +28,12 @@ export default function PolicyFiles({
if (!files) {
return (
<div className="space-y-1">
<Button size="sm" onClick={load}>
<div className="space-y-1 min-w-0">
<Button size="sm" wrap onClick={load}>
{label}
</Button>
{error && (
<p role="alert" className="text-xs text-[var(--error)]">
<p role="alert" className="text-xs text-[var(--error)] break-words">
{error}
</p>
)}
@@ -41,30 +41,38 @@ export default function PolicyFiles({
);
}
return (
<div className="space-y-1 text-xs">
<p className="text-[var(--text-secondary)]">
<div className="space-y-1.5 text-xs min-w-0">
<p className="text-[var(--text-secondary)] leading-snug break-words">
{tier === "workspace_user" ? "Workspace user" : "Environment admin"}:{" "}
{files.length === 1
? "attach this file as a customer managed policy."
: `Attach all ${files.length} files, each as its own customer managed policy.`}
</p>
{/* One copy button per file, in a grid that drops to one column when narrow. */}
<div data-testid="policy-copy-grid" className="grid gap-1.5 grid-cols-[repeat(auto-fill,minmax(9rem,1fr))]">
{files.map((f) => (
<Button
key={f.name}
size="sm"
wrap
className="w-full justify-start break-all"
aria-label={`Copy ${f.name}`}
onClick={() => onCopy(f)}
>
Copy <span className="font-mono">{f.name}</span>
</Button>
))}
</div>
{files.map((f) => (
<div key={f.name} className="space-y-1">
<div className="flex items-center gap-2">
<span className="font-mono text-[var(--text-primary)]">{f.name}</span>
<Button size="sm" aria-label={`Copy ${f.name}`} onClick={() => onCopy(f)}>
Copy
</Button>
</div>
<details>
<summary className="cursor-pointer text-[var(--text-secondary)]">Show JSON</summary>
<pre className="mt-1 max-h-48 overflow-auto whitespace-pre-wrap break-all text-[var(--text-secondary)]">
{f.json}
</pre>
</details>
</div>
<details key={f.name} className="min-w-0">
<summary className="cursor-pointer text-[var(--text-secondary)] break-all">
Show JSON of <span className="font-mono">{f.name}</span>
</summary>
<pre className="mt-1 max-h-48 max-w-full overflow-auto whitespace-pre-wrap break-all text-[var(--text-secondary)]">
{f.json}
</pre>
</details>
))}
</div>
);
}
@@ -143,3 +143,7 @@ export function computeLine(c: UserCompute): string {
const n = c.max_instances === 1 ? "1 instance" : `up to ${c.max_instances} instances`;
return `${c.instance_type}, ${n} (triple-c-user ${c.user_tag})`;
}
/** Shown under an action whose permissions the check didn't confirm: AWS has the last word. */
export const UNCONFIRMED_NOTE =
"Your permission check didn't confirm environment-admin rights; the deploy will stop with AWS's message if a permission is missing.";
+19
View File
@@ -74,4 +74,23 @@ describe("Button", () => {
fireEvent.click(button);
expect(onClick).toHaveBeenCalledTimes(1);
});
it("wraps a long label only when asked", () => {
render(
<>
<Button>Short</Button>
<Button wrap size="md">
Request an environment from an admin…
</Button>
</>,
);
const plain = screen.getByRole("button", { name: "Short" });
expect(plain.className).toContain("whitespace-nowrap");
expect(plain.className).toContain("h-6");
const long = screen.getByRole("button", { name: "Request an environment from an admin…" });
expect(long.className).toContain("whitespace-normal");
expect(long.className).toContain("min-h-8");
expect(long.className).toContain("max-w-full");
expect(long.className).not.toMatch(/(^|\s)h-8(\s|$)/);
});
});
+13 -1
View File
@@ -19,6 +19,11 @@ interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
unavailable?: boolean;
/** Why the button cannot be used. Required for `unavailable` to say anything. */
unavailableReason?: string;
/**
* Let a long label wrap onto more lines instead of forcing the button (and
* its row) wider than a narrow container, such as the settings sidebar.
*/
wrap?: boolean;
/** React 19 passes `ref` as a prop; it lands on the `<button>` via `rest`. */
ref?: Ref<HTMLButtonElement>;
}
@@ -48,6 +53,12 @@ const SIZES: Record<ButtonSize, string> = {
md: "h-8 px-3 text-[13px] gap-1.5",
};
/** `wrap`: the same sizes as a minimum height, so a second line can grow the button. */
const WRAP_SIZES: Record<ButtonSize, string> = {
sm: "min-h-6 py-0.5 px-2 text-xs gap-1",
md: "min-h-8 py-1 px-3 text-[13px] gap-1.5",
};
export default function Button({
variant = "secondary",
size = "sm",
@@ -55,6 +66,7 @@ export default function Button({
type = "button",
unavailable = false,
unavailableReason = "",
wrap = false,
children,
...rest
}: Props) {
@@ -71,7 +83,7 @@ export default function Button({
type={type}
{...rest}
{...controlProps}
className={`inline-flex items-center justify-center whitespace-nowrap rounded-[var(--radius-control)] font-medium transition-colors disabled:cursor-not-allowed aria-disabled:cursor-not-allowed ${SIZES[size]} ${VARIANTS[variant]} ${className}`}
className={`inline-flex items-center justify-center ${wrap ? `whitespace-normal break-words text-left max-w-full min-w-0 ${WRAP_SIZES[size]}` : `whitespace-nowrap ${SIZES[size]}`} rounded-[var(--radius-control)] font-medium transition-colors disabled:cursor-not-allowed aria-disabled:cursor-not-allowed ${VARIANTS[variant]} ${className}`}
>
{children}
</button>
+1 -1
View File
@@ -208,7 +208,7 @@ export default function Modal({
</div>
{footer && (
<div className="flex items-center justify-end gap-2 px-5 py-3 border-t border-[var(--border-color)] flex-shrink-0">
<div className="flex flex-wrap items-center justify-end gap-2 px-5 py-3 border-t border-[var(--border-color)] flex-shrink-0">
{footer}
</div>
)}
+4 -1
View File
@@ -53,6 +53,8 @@ interface Props {
iconOnly?: boolean;
className?: string;
title?: string;
/** Let a long label (a failure summary) wrap instead of overflowing its container. */
wrap?: boolean;
}
export default function StatusIndicator({
@@ -61,11 +63,12 @@ export default function StatusIndicator({
iconOnly = false,
className = "",
title,
wrap = false,
}: Props) {
const style = TONES[tone];
return (
<span
className={`inline-flex items-center gap-1 whitespace-nowrap ${className}`}
className={`inline-flex gap-1 ${wrap ? "items-baseline whitespace-normal break-words min-w-0 max-w-full" : "items-center whitespace-nowrap"} ${className}`}
title={title ?? label}
>
<span
+19 -1
View File
@@ -1,5 +1,5 @@
import { describe, it, expect } from "vitest";
import { awsErrorMessage, toAwsError } from "./aws-error";
import { awsErrorMessage, looksDenied, toAwsError } from "./aws-error";
describe("toAwsError", () => {
it("passes a tagged AwsError through", () => {
@@ -21,3 +21,21 @@ describe("toAwsError", () => {
expect(toAwsError(null).kind).toBe("other");
});
});
describe("access denied", () => {
it("shows AWS's message, naming the action when the message doesn't", () => {
expect(awsErrorMessage({ kind: "access_denied", action: "iam:CreateRole", message: "User: x is not authorized" })).toBe(
"AWS denied iam:CreateRole: User: x is not authorized",
);
expect(awsErrorMessage({ kind: "access_denied", action: "s3:PutObject", message: "denied s3:PutObject" })).toBe(
"AWS denied this request: denied s3:PutObject",
);
});
it("recognises refusals in OpenTofu output", () => {
expect(looksDenied("Error: creating IAM Role: AccessDenied: User is not authorized")).toBe(true);
expect(looksDenied("api error UnauthorizedOperation: You are not authorized")).toBe(true);
expect(looksDenied("Error: creating VPC: VpcLimitExceeded")).toBe(false);
expect(looksDenied(null)).toBe(false);
expect(looksDenied("blocked by an explicit deny in a service control policy")).toBe(false);
});
});
+15
View File
@@ -34,7 +34,22 @@ export function awsErrorMessage(e: AwsError): string {
return "The access keys for this connection are missing from the keychain. Remove and re-add the connection.";
case "state_bucket_taken":
return `The state bucket name ${e.bucket} is already taken by another AWS account.`;
case "access_denied":
// AWS's own message, named by the action when it doesn't already say it.
return e.action && !e.message.includes(e.action)
? `AWS denied ${e.action}: ${e.message}`
: `AWS denied this request: ${e.message}`;
default:
return e.message;
}
}
// The codes `aws::error` maps to access_denied, and how AWS words a refusal in
// OpenTofu's output. A bare "explicit deny" is left out: an SCP or bucket
// policy deny isn't something an admin bundle fixes.
const DENIED = /AccessDenied|UnauthorizedOperation|not authorized to perform/i;
/** Whether a line of OpenTofu output (or a run's summary) reads as AWS refusing a permission. */
export function looksDenied(text: string | null | undefined): boolean {
return !!text && DENIED.test(text);
}