Skip to content

[code-simplifier] refactor: simplify guard policy setOutput, footer logic, and comment clarity #22016

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
pelikhan merged 1 commit into from
Mar 20, 2026
+7 −13
Merged

[code-simplifier] refactor: simplify guard policy setOutput, footer logic, and comment clarity #22016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions actions/setup/js/determine_automatic_lockdown.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,19 @@ async function determineAutomaticLockdown(github, context, core) {
const resolvedMinIntegrity = configuredMinIntegrity || defaultMinIntegrity;
if (!configuredMinIntegrity) {
core.info(`min-integrity not configured — automatically setting to '${defaultMinIntegrity}' for ${visibility} repository`);
core.setOutput("min_integrity", defaultMinIntegrity);
} else {
core.info(`min-integrity already configured as '${configuredMinIntegrity}' — not overriding`);
core.setOutput("min_integrity", configuredMinIntegrity);
}
core.setOutput("min_integrity", resolvedMinIntegrity);

// Set repos if not already configured
const resolvedRepos = configuredRepos || defaultRepos;
if (!configuredRepos) {
core.info(`repos not configured — automatically setting to '${defaultRepos}' for ${visibility} repository`);
core.setOutput("repos", defaultRepos);
} else {
core.info(`repos already configured as '${configuredRepos}' — not overriding`);
core.setOutput("repos", configuredRepos);
}
core.setOutput("repos", resolvedRepos);

if (isPrivate) {
core.info("Automatic guard policy determination complete for private/internal repository");
Expand Down
8 changes: 2 additions & 6 deletions actions/setup/js/pr_review_buffer.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,8 @@ function createReviewBuffer() {
let body = reviewMetadata ? reviewMetadata.body : "";

// Determine if we should add footer based on footer mode
let shouldAddFooter = false;
if (footerMode === "always") {
shouldAddFooter = true;
} else if (footerMode === "none") {
shouldAddFooter = false;
} else if (footerMode === "if-body") {
let shouldAddFooter = footerMode === "always";
if (footerMode === "if-body") {
// Only add footer if body is non-empty (has meaningful content)
shouldAddFooter = body.trim().length > 0;
core.info(`Footer mode "if-body": body is ${body.trim().length > 0 ? "non-empty" : "empty"}, ${shouldAddFooter ? "adding" : "skipping"} footer`);
Expand Down
6 changes: 3 additions & 3 deletions pkg/workflow/mcp_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ func collectMCPEnvironmentVariables(tools map[string]any, mcpTools []string, wor
maps.Copy(envVars, mcpScriptsSecrets)
}

// Check for safe-outputs env vars
// Only add env vars if safe-outputs is actually enabled
// This prevents referencing step outputs that don't exist when safe-outputs isn't used
// Add safe-outputs server connection env vars (port and API key for MCP tools)
// Only add if safe-outputs is actually enabled — avoids referencing step outputs
// that don't exist when safe-outputs isn't used.
if workflowData != nil && HasSafeOutputsEnabled(workflowData.SafeOutputs) {
// Add server configuration env vars from step outputs
envVars["GH_AW_SAFE_OUTPUTS_PORT"] = "${{ steps.safe-outputs-start.outputs.port }}"
Expand Down
Loading