Skip to content

Commit 6c92ec6

Browse files
fix: Remove hardcoded S3 bucket name in GitHub Actions workflow
- Replace hardcoded S3 bucket name with environment-specific variables - Add S3_BUCKET_DEV and S3_BUCKET_PROD variables for multi-environment deployment - Update create_role scripts to register environment-specific S3 bucket variables - Use GitHub Variables instead of hardcoded values for better flexibility - Support different S3 buckets for development and production environments
1 parent a6701cc commit 6c92ec6

3 files changed

Lines changed: 46 additions & 1 deletion

File tree

.github/workflows/deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,22 @@ jobs:
5353
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
5454
STACK_NAME="lambda-framework-prod"
5555
ENVIRONMENT="production"
56+
S3_BUCKET="${{ vars.S3_BUCKET_PROD }}"
5657
else
5758
STACK_NAME="lambda-framework-dev"
5859
ENVIRONMENT="development"
60+
S3_BUCKET="${{ vars.S3_BUCKET_DEV }}"
5961
fi
6062
6163
echo "Deploying to environment: $ENVIRONMENT"
6264
echo "Stack name: $STACK_NAME"
6365
echo "AWS Region: $AWS_REGION"
66+
echo "S3 Bucket: $S3_BUCKET"
6467
6568
sam build
6669
sam deploy --no-confirm-changeset --no-fail-on-empty-changeset \
6770
--stack-name $STACK_NAME \
68-
--s3-bucket cn-seba-aws-sam-cli-managed-default-samclisourcebucket \
71+
--s3-bucket $S3_BUCKET \
6972
--parameter-overrides ProjectName=${{ env.PROJECT_NAME }} Environment=$ENVIRONMENT
7073
env:
7174
AWS_REGION: ${{ env.AWS_REGION }}

create_role.ps1

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,23 @@ if ($GITHUB_CLI_AVAILABLE) {
12511251
} else {
12521252
Write-Warning "PROJECT_NAME の登録に失敗しました: $result"
12531253
}
1254+
1255+
# 環境別S3バケットの登録
1256+
Write-Info "S3_BUCKET_DEVをRepository Variablesに登録中: $S3_BUCKET"
1257+
$result = gh variable set S3_BUCKET_DEV --body $S3_BUCKET 2>&1
1258+
if ($LASTEXITCODE -eq 0) {
1259+
Write-Success "S3_BUCKET_DEV がRepository Variablesに登録されました"
1260+
} else {
1261+
Write-Warning "S3_BUCKET_DEV の登録に失敗しました: $result"
1262+
}
1263+
1264+
Write-Info "S3_BUCKET_PRODをRepository Variablesに登録中: $S3_BUCKET"
1265+
$result = gh variable set S3_BUCKET_PROD --body $S3_BUCKET 2>&1
1266+
if ($LASTEXITCODE -eq 0) {
1267+
Write-Success "S3_BUCKET_PROD がRepository Variablesに登録されました"
1268+
} else {
1269+
Write-Warning "S3_BUCKET_PROD の登録に失敗しました: $result"
1270+
}
12541271
} else {
12551272
Write-Info "GitHub Secretsの自動登録をスキップしました"
12561273
}
@@ -1278,6 +1295,8 @@ if ($GITHUB_CLI_AVAILABLE) {
12781295
Write-Host "登録されたRepository Variables:" -ForegroundColor Yellow
12791296
Write-Host "- AWS_REGION"
12801297
Write-Host "- PROJECT_NAME"
1298+
Write-Host "- S3_BUCKET_DEV"
1299+
Write-Host "- S3_BUCKET_PROD"
12811300
} else {
12821301
Write-Host "手動でGitHubに以下を設定してください:" -ForegroundColor Yellow
12831302
Write-Host ""
@@ -1292,4 +1311,8 @@ if ($GITHUB_CLI_AVAILABLE) {
12921311
Write-Host "Value: $AWS_REGION"
12931312
Write-Host "Name: PROJECT_NAME"
12941313
Write-Host "Value: $PROJECT_NAME"
1314+
Write-Host "Name: S3_BUCKET_DEV"
1315+
Write-Host "Value: $S3_BUCKET"
1316+
Write-Host "Name: S3_BUCKET_PROD"
1317+
Write-Host "Value: $S3_BUCKET"
12951318
}

create_role.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,19 @@ if [ "$GITHUB_CLI_AVAILABLE" = true ]; then
11921192
else
11931193
print_warning "PROJECT_NAMEの登録に失敗しました"
11941194
fi
1195+
1196+
# 環境別S3バケットの登録
1197+
if gh variable set S3_BUCKET_DEV --body "$S3_BUCKET" &> /dev/null; then
1198+
print_success "S3_BUCKET_DEVがRepository Variablesに登録されました"
1199+
else
1200+
print_warning "S3_BUCKET_DEVの登録に失敗しました"
1201+
fi
1202+
1203+
if gh variable set S3_BUCKET_PROD --body "$S3_BUCKET" &> /dev/null; then
1204+
print_success "S3_BUCKET_PRODがRepository Variablesに登録されました"
1205+
else
1206+
print_warning "S3_BUCKET_PRODの登録に失敗しました"
1207+
fi
11951208
else
11961209
print_info "GitHub Secretsの自動登録をスキップしました"
11971210
fi
@@ -1218,6 +1231,8 @@ if [ "$GITHUB_CLI_AVAILABLE" = true ]; then
12181231
echo "登録されたRepository Variables:"
12191232
echo "- AWS_REGION"
12201233
echo "- PROJECT_NAME"
1234+
echo "- S3_BUCKET_DEV"
1235+
echo "- S3_BUCKET_PROD"
12211236
else
12221237
echo "手動でGitHubに以下を設定してください:"
12231238
echo ""
@@ -1232,4 +1247,8 @@ else
12321247
echo "Value: $AWS_REGION"
12331248
echo "Name: PROJECT_NAME"
12341249
echo "Value: $PROJECT_NAME"
1250+
echo "Name: S3_BUCKET_DEV"
1251+
echo "Value: $S3_BUCKET"
1252+
echo "Name: S3_BUCKET_PROD"
1253+
echo "Value: $S3_BUCKET"
12351254
fi

0 commit comments

Comments
 (0)