Skip to content

Commit 21f0a44

Browse files
committed
cleaner version
Signed-off-by: Julio Jimenez <julio@clickhouse.com>
1 parent d4b4974 commit 21f0a44

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

entrypoint.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,13 @@ upload_to_s3() {
218218
local local_file="$1"
219219
local s3_bucket="$2"
220220
local s3_key="$3"
221+
local desired_format="${SBOM_FORMAT:-cyclonedx}"
221222

222-
log_info "Uploading CycloneDX SBOM to s3://$s3_bucket/$s3_key"
223+
log_info "Uploading $desired_format SBOM to s3://$s3_bucket/$s3_key"
223224

224225
if aws s3 cp "$local_file" "s3://$s3_bucket/$s3_key" \
225226
--content-type "application/json" \
226-
--metadata "format=cyclonedx,source=github-action"; then
227+
--metadata "format=$desired_format,source=github-action"; then
227228
log_success "SBOM uploaded successfully to S3"
228229
else
229230
log_error "Failed to upload SBOM to S3"
@@ -296,10 +297,10 @@ main() {
296297
fi
297298

298299
# Upload to S3
299-
# upload_to_s3 "$cyclonedx_sbom" "$S3_BUCKET" "$s3_key"
300-
301-
# log_success "SBOM processing completed successfully!"
302-
# log_info "CycloneDX SBOM available at: s3://$S3_BUCKET/$s3_key"
300+
upload_to_s3 "$processed_sbom" "$S3_BUCKET" "$s3_key"
301+
302+
log_success "SBOM processing completed successfully!"
303+
log_info "CycloneDX SBOM available at: s3://$S3_BUCKET/$s3_key"
303304
}
304305

305306
# Run main function

0 commit comments

Comments
 (0)