Refactor buildConfig by extracting API credential resolution by Copilot · Pull Request #5759 · github/gh-aw-firewall

Copilot · 2026-07-01T18:31:51Z

buildConfig had grown into a 190-line mixed-responsibility function that combined config assembly, API credential/env resolution, and nested sub-object construction. This change separates the credential surface into its own module and trims the main assembly path down to field mapping plus small focused helpers.

Extract credential resolution
- Added src/commands/resolve-credentials.ts to centralize all API proxy credential and auth-related env lookup:
  - provider API keys
  - provider routing/auth headers
  - OIDC auth env mappings
  - GitHub token fallback
- Keeps credential access isolated from the main config assembly flow.
Simplify buildConfig
- src/commands/build-config.ts now delegates:
  - API credential/env resolution to resolveApiCredentials(...)
  - chrootIdentity creation to a focused helper
  - dind creation to a focused helper
- Preserves existing behavior while making the function primarily responsible for assembling WrapperConfig.
Add focused unit coverage
- Added src/commands/resolve-credentials.test.ts for direct coverage of env/option precedence and OIDC mapping behavior.
- Retains existing build-config integration coverage for end-to-end assembly behavior.

const chrootIdentity = buildChrootIdentity(options);
const dind = buildDindConfig(options);
const apiCredentials = resolveApiCredentials(options, {
  resolvedCopilotApiTarget,
  resolvedCopilotApiBasePath,
});

return {
  ...baseConfigFields,
  ...apiCredentials,
  chrootIdentity,
  dind,
};

Copilot

Pull request overview

This PR refactors buildConfig by extracting API-proxy credential/env resolution into a dedicated module, reducing buildConfig to mostly field mapping plus a couple of focused sub-builders. It also adds targeted unit tests for credential/env precedence behavior.

Changes:

Added src/commands/resolve-credentials.ts to centralize API credential/env + OIDC mapping resolution.
Simplified src/commands/build-config.ts by delegating credential resolution and extracting chrootIdentity / dind helpers.
Added src/commands/resolve-credentials.test.ts to cover precedence and OIDC mapping behavior.

Show a summary per file

File	Description
src/commands/resolve-credentials.ts	New module that resolves API proxy credentials, routing targets, auth headers, and OIDC-related config from options/env.
src/commands/resolve-credentials.test.ts	New unit tests validating env/option precedence, OIDC env mappings, and GitHub token precedence.
src/commands/build-config.ts	Refactored to delegate credential resolution and extract `chrootIdentity` / `dind` construction helpers.

Review details

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Files reviewed: 3/3 changed files
Comments generated: 1
Review effort level: Low

lpcox · 2026-07-01T19:19:10Z

@copilot address review feedback

github-actions · 2026-07-01T19:19:49Z

Chroot tests passed! Smoke Chroot - All security and functionality tests succeeded.

github-actions · 2026-07-01T19:19:49Z

🔑 Smoke Copilot PAT PAT auth validated. All systems operational. ✅

github-actions · 2026-07-01T19:19:50Z

✅ Smoke Copilot BYOK AOAI (Entra) completed. Copilot AOAI BYOK (Entra) mode operational. 🔓

github-actions · 2026-07-01T19:19:51Z

✅ Contribution Check completed successfully!

Contribution check complete for PR #5759: the PR appears to follow the applicable CONTRIBUTING.md guidelines based on the pre-fetched metadata, diff, and CONTRIBUTING.md content. No comment needed.

github-actions · 2026-07-01T19:19:53Z

📰 VERDICT: Smoke Copilot has concluded. All systems operational. This is a developing story. 🎤

github-actions · 2026-07-01T19:19:56Z

❌ Smoke Copilot BYOK AOAI (api-key) reports failed. AOAI BYOK (api-key) mode investigation needed...

github-actions · 2026-07-01T19:19:57Z

🔌 Smoke Services — Service connectivity failed ⚠️

github-actions · 2026-07-01T19:20:01Z

✅ Build Test Suite completed successfully!

github-actions · 2026-07-01T19:20:01Z

✅ Smoke Claude passed

github-actions · 2026-07-01T19:20:02Z

✅ Smoke Copilot BYOK completed. Copilot BYOK mode operational. 🔓

github-actions · 2026-07-01T19:20:05Z

✅ Smoke Gemini completed. All facets verified. 💎

Smoke test finished with FAIL status.

github-actions · 2026-07-01T19:20:05Z

📡 Smoke OTel Tracing completed. All tracing scenarios validated. ✅

github-actions · 2026-07-01T19:20:14Z

🚀 Security Guard has started processing this pull request

github-actions · 2026-07-01T19:20:18Z

✨ The prophecy is fulfilled... Smoke Codex has completed its mystical journey. The stars align. 🌟

github-actions · 2026-07-01T19:21:22Z

✅ Coverage Check Passed

Overall Coverage

Metric	Base	PR	Delta
Lines	98.65%	98.69%	📈 +0.04%
Statements	98.53%	98.57%	📈 +0.04%
Functions	99.55%	99.55%	➡️ +0.00%
Branches	94.46%	94.48%	📈 +0.02%

📁 Per-file Coverage Changes (2 files)

File	Lines (Before → After)	Statements (Before → After)
`src/commands/build-config.ts`	94.4% → 95.7% (+1.21%)	94.4% → 95.7% (+1.21%)
`src/workdir-setup.ts`	92.7% → 94.5% (+1.82%)	92.7% → 94.5% (+1.82%)

✨ New Files (1 files)

src/commands/resolve-credentials.ts: 100.0% lines

Coverage comparison generated by scripts/ci/compare-coverage.ts

Copilot · 2026-07-01T19:21:25Z

@copilot address review feedback

Fixed in the latest commit. Changed resolveOptionOrEnv to use ?? instead of ||, and applied the same fix to the inline anthropicTokenUrl resolution. Added a test case that confirms an explicitly provided empty string for *ApiBasePath options is now authoritative over the corresponding environment variable.

github-actions · 2026-07-01T19:23:25Z

🔥 Smoke Test: PAT Auth — PASS

Test	Result
GitHub MCP connectivity	✅
GitHub.com HTTP (200)	✅
File write/read	⚠️ template vars unresolved

Auth mode: PAT (COPILOT_GITHUB_TOKEN)
PR: Refactor buildConfig by extracting API credential resolution
Author: @Copilot — Assignees: @lpcox, @Copilot

🔑 PAT report filed by Smoke Copilot PAT
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:23:25Z

🔥 Smoke Test Results

PR: Refactor buildConfig by extracting API credential resolution
Author: @Copilot | Assignees: @lpcox @Copilot

Test	Result
GitHub MCP connectivity	✅
GitHub.com HTTP	✅ 200
File write/read	⚠️ template vars unresolved

Overall: PASS (2/2 verifiable tests passed; file test skipped due to unresolved template variables)

📰 BREAKING: Report filed by Smoke Copilot
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:23:26Z

Smoke Test: Claude Engine Validation

Check	Result
API Status	✅ PASS
GH Check	✅ PASS
File Status	✅ PASS

Overall result: PASS ✅

Generated by Smoke Claude for #5759 · 30.1 AIC · ⊞ 3.3K · ◷
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:23:27Z

Smoke Test: Copilot BYOK (Direct) Mode

✅ GitHub MCP connectivity — Confirmed (listed 2 merged PRs)
✅ GitHub.com connectivity — HTTP connectivity verified
✅ File write/read test — File operations working
✅ BYOK inference test — Running in direct BYOK mode via api-proxy → api.githubcopilot.com

Result: PASS (all smoke tests passed)
Mode: Direct BYOK (COPILOT_PROVIDER_API_KEY via api-proxy sidecar)
Author: @lpcox

🔑 BYOK report filed by Smoke Copilot BYOK
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:25:08Z

🔬 Smoke Test: API Proxy OpenTelemetry Tracing

Scenario	Result	Notes
1. Module Loading	✅	`otel.js` loads successfully; exports `startRequestSpan`, `setTokenAttributes`, `setBudgetAttributes`, `endSpan`, `endSpanError`, `shutdown`, `isEnabled` + test helpers. `isEnabled()` → `true`.
2. Test Suite	✅	59 tests passed, 0 failed across `otel.test.js` + `otel-fanout.test.js` (2 suites).
3. Env Var Forwarding	✅	`src/services/api-proxy-env-config.ts` forwards `GH_AW_OTLP_ENDPOINTS`, `OTEL_EXPORTER_OTLP_ENDPOINT`, `OTEL_EXPORTER_OTLP_HEADERS`, `GITHUB_AW_OTEL_TRACE_ID`, `GITHUB_AW_OTEL_PARENT_SPAN_ID`, and `OTEL_SERVICE_NAME` to the api-proxy container.
4. Token Tracker Integration	✅	`onUsage` callback present in `token-tracker-http.js` (lines 283, 324, 326) — confirmed OTEL hook point.
5. OTEL Diagnostics	✅	No OTLP endpoint configured → falls back to `FileSpanExporter` writing NDJSON to `/var/log/api-proxy/otel.jsonl`. File fallback behaves correctly; no errors.

All 5 scenarios pass. OTEL tracing integration is healthy on this branch.

📡 OTel tracing validated by Smoke OTel Tracing
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:25:18Z

fix: sysroot filter should not drop workspace custom mounts ✅
fix: filter split-fs-invisible mounts when sysroot-stage is active (arc-dind) ✅
Refactor buildConfig by extracting API credential resolution ❌
Overall status: FAIL

🔮 The oracle has spoken through Smoke Codex
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:25:24Z

Chroot Smoke Test Results

Runtime	Host Version	Chroot Version	Match?
Python	`Python 3.12.13`	`Python 3.12.3`	❌ NO
Node.js	`v24.17.0`	`v22.23.0`	❌ NO
Go	`go1.22.12`	`go1.22.12`	✅ YES

Overall: ❌ FAILED — Python and Node.js versions differ between host and chroot. Go passed.

Tested by Smoke Chroot
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:25:51Z

🏗️ Build Test Suite Results

Ecosystem	Project	Build/Install	Tests	Status
Bun	elysia	✅	1/1 passed	✅ PASS
Bun	hono	✅	1/1 passed	✅ PASS
C++	fmt	✅	N/A	✅ PASS
C++	json	✅	N/A	✅ PASS
Deno	oak	N/A	1/1 passed	✅ PASS
Deno	std	N/A	1/1 passed	✅ PASS
.NET	hello-world	✅	N/A	✅ PASS
.NET	json-parse	✅	N/A	✅ PASS
Go	color	✅	passed	✅ PASS
Go	env	✅	passed	✅ PASS
Go	uuid	✅	passed	✅ PASS
Java	gson	✅	1/1 passed	✅ PASS
Java	caffeine	✅	1/1 passed	✅ PASS
Node.js	clsx	✅	All passed	✅ PASS
Node.js	execa	✅	All passed	✅ PASS
Node.js	p-limit	✅	All passed	✅ PASS
Rust	fd	✅	1/1 passed	✅ PASS
Rust	zoxide	✅	1/1 passed	✅ PASS

Overall: 8/8 ecosystems passed — ✅ PASS

Generated by Build Test Suite for #5759 · 41.8 AIC · ⊞ 7.8K · ◷
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:27:32Z

@lpcox
MCP connectivity: ✅
GitHub.com connectivity: ✅
File I/O: ✅
BYOK inference: ✅
Running in direct BYOK mode (COPILOT_PROVIDER_API_KEY + COPILOT_PROVIDER_BASE_URL) via api-proxy → Azure OpenAI (Foundry, o4-mini-aw)
Overall: PASS

🔑 BYOK (AOAI api-key) report filed by Smoke Copilot BYOK AOAI (api-key)
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:28:02Z

Smoke Test: Gemini Engine Validation

GitHub MCP Testing: ✅ (Connected, but no results found)
GitHub.com Connectivity: ❌ (SSL error 35)
File Writing Testing: ✅
Bash Tool Testing: ✅

PR Titles Reviewed:

fix: sysroot filter should not drop workspace custom mounts #5739 fix: sysroot filter should not drop workspace custom mounts

Overall Status: FAIL

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

localhost

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "localhost"

See Network Configuration for more information.

💎 Faceted by Smoke Gemini
_{Add label ready-for-aw to run again}

github-actions · 2026-07-01T19:30:35Z

✅ MCP merged PRs: fix: ensure chmod runs even when chown fails in rootless permission repair; refactor: split 309-line generateDockerCompose into focused phases
✅ GitHub.com connectivity
✅ File read/write test
✅ BYOK inference path

Running in direct BYOK mode (AWF_AUTH_TYPE=github-oidc + AWF_AUTH_AZURE_* + COPILOT_PROVIDER_BASE_URL) via api-proxy → Azure OpenAI (Foundry, o4-mini-aw)
Overall: PASS
cc @lpcox

🪪 BYOK (AOAI Entra) report filed by Smoke Copilot BYOK AOAI (Entra)
_{Add label ready-for-aw to run again}

Initial plan

87bd24a

Copilot AI assigned Copilot and lpcox Jul 1, 2026

Copilot started work on behalf of lpcox July 1, 2026 18:42 View session

Copilot AI linked an issue Jul 1, 2026 that may be closed by this pull request

[Refactoring] Extract credential resolution from buildConfig (190-line function) in src/commands/build-config.ts #5749

Closed

refactor: extract credential resolver

54a39f4

Copilot AI changed the title ~~[WIP] Refactor credential resolution from buildConfig~~ Refactor buildConfig by extracting API credential resolution Jul 1, 2026

Copilot finished work on behalf of lpcox July 1, 2026 18:49

Copilot AI requested a review from lpcox July 1, 2026 18:49

lpcox requested a review from Copilot July 1, 2026 18:56

Copilot started reviewing on behalf of lpcox July 1, 2026 18:56 View session

Copilot AI reviewed Jul 1, 2026

View reviewed changes

Comment thread src/commands/resolve-credentials.ts Outdated

lpcox marked this pull request as ready for review July 1, 2026 19:18

lpcox added the ready-for-aw label Jul 1, 2026

Copilot started work on behalf of lpcox July 1, 2026 19:19 View session

lpcox temporarily deployed to aoai-model July 1, 2026 19:19 — with GitHub Actions Inactive

fix: use nullish coalescing in resolveOptionOrEnv

e61d967

Copilot finished work on behalf of lpcox July 1, 2026 19:21

github-actions Bot mentioned this pull request Jul 1, 2026

[aw] No-Op Runs #5368

Closed

github-actions Bot added smoke-copilot-pat smoke-copilot labels Jul 1, 2026

github-actions Bot added smoke-claude smoke-copilot-byok labels Jul 1, 2026

github-actions Bot added the build-test label Jul 1, 2026

github-actions Bot added the smoke-copilot-byok-aoai-apikey label Jul 1, 2026

github-actions Bot added the smoke-copilot-byok-aoai-entra label Jul 1, 2026

lpcox merged commit f40b464 into main Jul 1, 2026
22 of 23 checks passed

lpcox deleted the copilot/refactor-credential-resolution branch July 1, 2026 19:53

Uh oh!

Conversation

Copilot AI commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Review details

Uh oh!

Uh oh!

lpcox commented Jul 1, 2026

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 1, 2026

✅ Coverage Check Passed

Overall Coverage

Uh oh!

Copilot AI commented Jul 1, 2026

Uh oh!

github-actions Bot commented Jul 1, 2026

🔥 Smoke Test: PAT Auth — PASS

Uh oh!

github-actions Bot commented Jul 1, 2026

🔥 Smoke Test Results

Uh oh!

github-actions Bot commented Jul 1, 2026

Smoke Test: Claude Engine Validation

Uh oh!

github-actions Bot commented Jul 1, 2026

Smoke Test: Copilot BYOK (Direct) Mode

Uh oh!

github-actions Bot commented Jul 1, 2026

🔬 Smoke Test: API Proxy OpenTelemetry Tracing

Uh oh!

github-actions Bot commented Jul 1, 2026

Uh oh!

github-actions Bot commented Jul 1, 2026

Chroot Smoke Test Results

Uh oh!

Copilot AI commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading