Skip to content

chore(policy): ungate guardrail policy form #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notgitika merged 2 commits into from
Jun 17, 2026
+18 −44
Merged

chore(policy): ungate guardrail policy form #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19db4f
chore(policy): ungate guardrail policy form
jesseturner21 Jun 17, 2026
c2d64b8
test(dev-server): surface project creation failures in beforeAll
jesseturner21 Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions integ-tests/dev-server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@ describe('integration: dev server', () => {
{ skipInstall: false }
);

if (result.exitCode === 0) {
const json = JSON.parse(result.stdout);
projectPath = json.projectPath;
if (result.exitCode !== 0) {
throw new Error(`Project creation failed (exit ${result.exitCode}): ${result.stderr || result.stdout}`);
}

@Hweinstock Hweinstock Jun 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Is this change intentionally included?

The refactor makes sense to throw early, but seems unrelated?


const json = JSON.parse(result.stdout);
projectPath = json.projectPath;
}, 120000);

afterEach(() => {
Expand Down
47 changes: 11 additions & 36 deletions src/cli/primitives/PolicyPrimitive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { EnforcementModeSchema, PolicySchema, ValidationModeSchema } from '../..
import { detectRegion } from '../aws';
import { getPolicyGeneration, startPolicyGeneration } from '../aws/policy-generation';
import { getErrorMessage } from '../errors';
import { isGatedFeaturesEnabled } from '../feature-flags';
import type { RemovalPreview, SchemaChange } from '../operations/remove/types';
import { runCliCommand, withCommandRunTelemetry } from '../telemetry/cli-command-run.js';
import { PolicyValidationMode, standardize } from '../telemetry/schemas/common-shapes.js';
Expand All @@ -14,7 +13,6 @@ import { type PolicyEffect, authorizationPhaseForEffect, defaultDataPathForEffec
import { BasePrimitive } from './BasePrimitive';
import { SOURCE_CODE_NOTE } from './constants';
import type { AddResult, AddScreenComponent, RemovableResource } from './types';
import { Option } from '@commander-js/extra-typings';
import type { Command } from '@commander-js/extra-typings';
import { existsSync, readFileSync } from 'fs';

Expand Down Expand Up @@ -287,9 +285,6 @@ export class PolicyPrimitive extends BasePrimitive<AddPolicyOptions, RemovablePo
}

registerCommands(addCmd: Command, removeCmd: Command): void {
// Hide gated options from `--help` unless ENABLE_GATED_FEATURES is set.
const gate = <T extends Option>(option: T): T => (isGatedFeaturesEnabled() ? option : option.hideHelp());

addCmd
.command('policy')
.description('Add a policy to a policy engine')
Expand All @@ -300,34 +295,19 @@ export class PolicyPrimitive extends BasePrimitive<AddPolicyOptions, RemovablePo
.option('--statement <cedar>', 'Policy statement [non-interactive]')
.option('-g, --generate <prompt>', 'Generate policy from natural language description [non-interactive]')
.option('--gateway <name>', 'Deployed gateway name for policy generation [non-interactive]')
// Guardrail form flags are gated behind ENABLE_GATED_FEATURES: hidden from help when off.
.addOption(gate(new Option('--target <name>', 'Gateway target name for Cedar action scope [non-interactive]')))
.addOption(
gate(
new Option(
'--form-category <type>',
'Guardrail category: contentFilter, promptAttack, or sensitiveInformation [non-interactive]'
)
)
)
.addOption(
gate(new Option('--form-filters <list>', 'Comma-separated filters for the chosen category [non-interactive]'))
.option('--target <name>', 'Gateway target name for Cedar action scope [non-interactive]')
.option(
'--form-category <type>',
'Guardrail category: contentFilter, promptAttack, or sensitiveInformation [non-interactive]'
)
.addOption(
gate(
new Option(
'--form-effect <effect>',
'Policy effect: forbid, permit, or suppressOutput (default: forbid) [non-interactive]'
)
)
.option('--form-filters <list>', 'Comma-separated filters for the chosen category [non-interactive]')
.option(
'--form-effect <effect>',
'Policy effect: forbid, permit, or suppressOutput (default: forbid) [non-interactive]'
)
.addOption(
gate(
new Option(
'--form-data-path <path>',
'Data path to evaluate, e.g. context.input.prompt (default: context.input.prompt) [non-interactive]'
)
)
.option(
'--form-data-path <path>',
'Data path to evaluate, e.g. context.input.prompt (default: context.input.prompt) [non-interactive]'
)
.option(
'--validation-mode <mode>',
Expand Down Expand Up @@ -378,11 +358,6 @@ export class PolicyPrimitive extends BasePrimitive<AddPolicyOptions, RemovablePo
throw new Error('--engine is required');
}

// Guardrail form path is gated behind ENABLE_GATED_FEATURES.
if (cliOptions.formCategory && !isGatedFeaturesEnabled()) {
throw new ValidationError('Guardrail policy form is not yet available.');
}

// Validate mutual exclusion of source flags
const sourceFlags = [
cliOptions.statement,
Expand Down
7 changes: 2 additions & 5 deletions src/cli/tui/screens/policy/AddPolicyScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { PolicyNameSchema } from '../../../../schema';
import { detectRegion } from '../../../aws';
import { getPolicyGeneration, startPolicyGeneration } from '../../../aws/policy-generation';
import { isGatedFeaturesEnabled } from '../../../feature-flags';
import { policyEnginePrimitive } from '../../../primitives/registry';
import {
ConfirmReview,
Expand Down Expand Up @@ -76,13 +75,11 @@ export function AddPolicyScreen({
() =>
POLICY_SOURCE_METHOD_OPTIONS.map(opt => {
const isGenerate = opt.id === 'generate';
// Guardrail form is gated behind ENABLE_GATED_FEATURES.
const gated = opt.id === 'form' && !isGatedFeaturesEnabled();
const disabled = gated || (isGenerate && !isEngineDeployed);
const disabled = isGenerate && !isEngineDeployed;
return {
id: opt.id,
title: opt.title,
description: gated ? 'Coming soon' : disabled ? 'Deploy engine first' : opt.description,
description: disabled ? 'Deploy engine first' : opt.description,
disabled,
};
}),
Expand Down
Loading