Skip to content

Commit 2bc4c15

Browse files
fix: Resolve PowerShell variable expansion issue in create_role.ps1
- Fix variable expansion in ARN generation - Use PowerShell subexpression syntax for reliable variable expansion - Add debug information to show AWS account ID and role name - Fix OIDC provider ARN generation with proper variable expansion - Ensure ARN format includes account ID: arn:aws:iam:ACCOUNT_ID:role/ROLE_NAME
1 parent 3e9e529 commit 2bc4c15

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

create_role.ps1

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ Write-Info "既存のOIDCプロバイダーを取得中..."
951951
$OIDC_PROVIDERS = aws iam list-open-id-connect-providers --query 'OpenIDConnectProviderList[].Arn' --output text 2>$null
952952

953953
# GitHub Actions用のOIDCプロバイダーARN
954-
$GITHUB_OIDC_ARN = "arn:aws:iam:$AWS_ACCOUNT_ID:oidc-provider/token.actions.githubusercontent.com"
954+
$GITHUB_OIDC_ARN = "arn:aws:iam:$($AWS_ACCOUNT_ID):oidc-provider/token.actions.githubusercontent.com"
955955

956956
# 選択肢を準備
957957
Write-Host ""
@@ -1203,7 +1203,12 @@ if ($GITHUB_CLI_AVAILABLE) {
12031203
Write-Info "=== Repository Secretsの登録 ==="
12041204

12051205
# 環境別AWS_ROLE_ARNの登録
1206-
$AWS_ROLE_ARN = "arn:aws:iam:$AWS_ACCOUNT_ID:role/$ROLE_NAME"
1206+
Write-Info "AWSアカウントID: $AWS_ACCOUNT_ID"
1207+
Write-Info "IAMロール名: $ROLE_NAME"
1208+
1209+
# PowerShellの文字列展開を確実にする
1210+
$AWS_ROLE_ARN = "arn:aws:iam:$($AWS_ACCOUNT_ID):role/$($ROLE_NAME)"
1211+
Write-Info "生成されるARN: $AWS_ROLE_ARN"
12071212
Write-Info "$SECRET_NAMEをRepository Secretsに登録中: $AWS_ROLE_ARN"
12081213
$result = gh secret set $SECRET_NAME --body $AWS_ROLE_ARN 2>&1
12091214
if ($LASTEXITCODE -eq 0) {
@@ -1257,7 +1262,7 @@ Write-Host "AWSアカウントID: $AWS_ACCOUNT_ID"
12571262
Write-Host "GitHubユーザー名: $GITHUB_USERNAME"
12581263
Write-Host "GitHubリポジトリ名: $GITHUB_REPO_NAME"
12591264
Write-Host "IAMロール名: $ROLE_NAME"
1260-
Write-Host "IAMロールARN: arn:aws:iam:$AWS_ACCOUNT_ID:role/$ROLE_NAME"
1265+
Write-Host "IAMロールARN: arn:aws:iam:$($AWS_ACCOUNT_ID):role/$($ROLE_NAME)"
12611266
Write-Host ""
12621267

12631268
if ($GITHUB_CLI_AVAILABLE) {
@@ -1273,7 +1278,7 @@ if ($GITHUB_CLI_AVAILABLE) {
12731278
Write-Host ""
12741279
Write-Host "Repository Secrets:" -ForegroundColor Cyan
12751280
Write-Host "Name: $SECRET_NAME"
1276-
Write-Host "Value: arn:aws:iam:$AWS_ACCOUNT_ID:role/$ROLE_NAME"
1281+
Write-Host "Value: arn:aws:iam:$($AWS_ACCOUNT_ID):role/$($ROLE_NAME)"
12771282
Write-Host "Name: S3_BUCKET"
12781283
Write-Host "Value: $S3_BUCKET"
12791284
Write-Host ""

0 commit comments

Comments
 (0)