Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .claude/agents/iyarc-prune.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ over an unsafe or unverified bump.
## Environment notes

- For a manual run of [the workflow](../../.github/workflows/iyarc-prune.yml#L29-L42),
select `master` in **Use workflow from**. The AWS login uses the
[workflow's branch identity](https://docs.github.com/en/actions/reference/security/oidc#filtering-for-a-specific-branch),
select `master` in **Use workflow from**. The AWS login uses the `ai-inference`
[environment identity](https://docs.github.com/en/actions/reference/security/oidc#filtering-for-a-specific-environment),
not the checkout ref. Merge workflow changes before a live run; local agent
invocations are unaffected.
- This is a Lerna + Yarn (v1, `1.22.22`) workspaces monorepo with ~116 packages
Expand Down
35 changes: 10 additions & 25 deletions .github/workflows/claude-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:

jobs:
claude-pr:
environment: ai-inference
if: |
(
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
Expand All @@ -27,34 +28,24 @@ jobs:
timeout-minutes: 10
env:
AWS_REGION: us-west-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
steps:
- name: Checkout repository
uses: actions/checkout@v6

- name: Configure AWS Credentials (OIDC)
uses: aws-actions/configure-aws-credentials@v6
uses: aws-actions/configure-aws-credentials@e1253824e5c10ff9df46874f81ed3ec929e19cfd # v6.3.0
with:
role-to-assume: arn:aws:iam::199765120567:role/${{ github.event.repository.name }}-iam-protected
role-to-assume: arn:aws:iam::199765120567:role/${{ github.event.repository.name }}-iam-unprotected
aws-region: us-west-2

- name: Assume inference role
id: inference-role
run: |
CREDS="$(aws sts assume-role \
--role-arn arn:aws:iam::168000258654:role/BedrockInferenceRole \
--role-session-name claude-inference-session \
--query 'Credentials' \
--output json)"

AWS_ACCESS_KEY_ID="$(echo "$CREDS" | jq -r '.AccessKeyId')"
AWS_SECRET_ACCESS_KEY="$(echo "$CREDS" | jq -r '.SecretAccessKey')"
AWS_SESSION_TOKEN="$(echo "$CREDS" | jq -r '.SessionToken')"

echo "::add-mask::$AWS_SECRET_ACCESS_KEY"
{ echo "aws-access-key-id=$AWS_ACCESS_KEY_ID"; echo "aws-secret-access-key=$AWS_SECRET_ACCESS_KEY"; echo "aws-session-token=$AWS_SESSION_TOKEN"; } >> "$GITHUB_OUTPUT"
uses: aws-actions/configure-aws-credentials@e1253824e5c10ff9df46874f81ed3ec929e19cfd # v6.3.0
with:
role-to-assume: arn:aws:iam::168000258654:role/BedrockInferenceRole
role-session-name: bitgojs-claude-inference-session
role-chaining: true
role-skip-session-tagging: true
aws-region: us-west-2

- name: Determine prompt to use
id: determine-prompt
Expand Down Expand Up @@ -86,9 +77,6 @@ jobs:
env:
ANTHROPIC_MODEL: arn:aws:bedrock:us-west-2:168000258654:inference-profile/global.anthropic.claude-sonnet-5-5
AWS_REGION: us-west-2
AWS_ACCESS_KEY_ID: ${{ steps.inference-role.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.inference-role.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.inference-role.outputs.aws-session-token }}
MAX_THINKING_TOKENS: '0'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -109,9 +97,6 @@ jobs:
env:
ANTHROPIC_MODEL: arn:aws:bedrock:us-west-2:168000258654:inference-profile/global.anthropic.claude-sonnet-5-5
AWS_REGION: us-west-2
AWS_ACCESS_KEY_ID: ${{ steps.inference-role.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.inference-role.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.inference-role.outputs.aws-session-token }}
MAX_THINKING_TOKENS: '0'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/iyarc-prune.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:

jobs:
prune:
environment: ai-inference
runs-on: ubuntu-latest
timeout-minutes: 60
defaults:
Expand All @@ -30,7 +31,7 @@ jobs:
run: |
set -euo pipefail
if [ "$GITHUB_REF" != 'refs/heads/master' ]; then
echo '::error::Run iyarc-prune from master. The AWS role trusts the workflow ref, not the checkout ref. Merge workflow changes before dispatching them.'
echo '::error::Run iyarc-prune from master. Merge workflow changes before dispatching them.'
exit 1
fi

Expand All @@ -55,14 +56,19 @@ jobs:
run: node scripts/iyarc-prune.js install-scanner

- name: Authenticate workflow with AWS
uses: aws-actions/configure-aws-credentials@v6
uses: aws-actions/configure-aws-credentials@e1253824e5c10ff9df46874f81ed3ec929e19cfd # v6.3.0
with:
role-to-assume: arn:aws:iam::199765120567:role/${{ github.event.repository.name }}-iam-protected
role-to-assume: arn:aws:iam::199765120567:role/${{ github.event.repository.name }}-iam-unprotected
aws-region: us-west-2

- name: Obtain credentials for the Bedrock model service
id: inference-role
run: node scripts/iyarc-prune.js assume-inference-role
uses: aws-actions/configure-aws-credentials@e1253824e5c10ff9df46874f81ed3ec929e19cfd # v6.3.0
with:
role-to-assume: arn:aws:iam::168000258654:role/BedrockInferenceRole
role-session-name: iyarc-prune-session
role-chaining: true
role-skip-session-tagging: true
aws-region: us-west-2

- name: Load iyarc-prune agent instructions
id: agent
Expand All @@ -82,9 +88,6 @@ jobs:
# Bedrock: replaying a tool-call turn requires a leading thinking block; disable to avoid 400.
MAX_THINKING_TOKENS: '0'
AWS_REGION: us-west-2
AWS_ACCESS_KEY_ID: ${{ steps.inference-role.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.inference-role.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.inference-role.outputs.aws-session-token }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Load trusted workflow helper from the original checkout
Expand Down
23 changes: 0 additions & 23 deletions scripts/iyarc-prune.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,6 @@ function installScanner() {
fs.appendFileSync(env.GITHUB_PATH, `${directory}\n`);
}

function assumeInferenceRole() {
const credentials = JSON.parse(
run('aws', [
'sts',
'assume-role',
'--role-arn',
'arn:aws:iam::168000258654:role/BedrockInferenceRole',
'--role-session-name',
'iyarc-prune-session',
'--query',
'Credentials',
'--output',
'json',
])
);
console.log(`::add-mask::${credentials.SecretAccessKey}`);
console.log(`::add-mask::${credentials.SessionToken}`);
setOutput('aws-access-key-id', credentials.AccessKeyId);
setOutput('aws-secret-access-key', credentials.SecretAccessKey);
setOutput('aws-session-token', credentials.SessionToken);
}

function loadInstructions() {
const instructions = fs.readFileSync('.claude/agents/iyarc-prune.md', 'utf8');
const endOfFrontmatter = instructions.indexOf('\n---\n');
Expand Down Expand Up @@ -242,7 +220,6 @@ function reportPullRequest() {

const operations = {
'install-scanner': installScanner,
'assume-inference-role': assumeInferenceRole,
'load-instructions': loadInstructions,
'write-agent-summary': writeAgentSummary,
'require-successful-completion': requireSuccessfulCompletion,
Expand Down
Loading