Skip to content

Commit 7bb6d3a

Browse files
vector-of-boolvector-of-bool
authored
Revert "[MONGOCRYPT-838] Switch the upload target bucket" (#1120)
Revert "[MONGOCRYPT-838] Switch the upload target bucket based on the project/patch status (#1117)" This reverts commit dc991f2.
1 parent dc991f2 commit 7bb6d3a

1 file changed

Lines changed: 61 additions & 55 deletions

File tree

‎.evergreen/config.yml‎

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,19 @@ functions:
8080
include: [./**]
8181
- command: s3.put
8282
params:
83-
role_arn: ${upload_arn}
83+
aws_key: '${aws_key}'
84+
aws_secret: '${aws_secret}'
8485
remote_file: '${project}/${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
85-
bucket: ${upload_bucket}
86+
bucket: mciuploads
8687
permissions: public-read
8788
local_file: 'libmongocrypt.tar.gz'
8889
content_type: '${content_type|application/x-gzip}'
8990
- command: s3.put
9091
params:
91-
role_arn: ${upload_arn}
92+
aws_key: '${aws_key}'
93+
aws_secret: '${aws_secret}'
9294
remote_file: '${project}/${build_variant}/${branch_name}/${libmongocrypt_s3_suffix_copy}/libmongocrypt.tar.gz'
93-
bucket: ${upload_bucket}
95+
bucket: mciuploads
9496
permissions: public-read
9597
local_file: 'libmongocrypt.tar.gz'
9698
content_type: '${content_type|application/x-gzip}'
@@ -136,9 +138,10 @@ functions:
136138
include: [./**]
137139
- command: s3.put
138140
params:
139-
role_arn: ${upload_arn}
141+
aws_key: '${aws_key}'
142+
aws_secret: '${aws_secret}'
140143
remote_file: '${project}/${build_variant}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt-distro-packages.tar.gz'
141-
bucket: ${upload_bucket}
144+
bucket: mciuploads
142145
permissions: public-read
143146
local_file: 'libmongocrypt-distro-packages.tar.gz'
144147
content_type: '${content_type|application/x-gzip}'
@@ -221,9 +224,10 @@ functions:
221224
"download tarball":
222225
- command: s3.get
223226
params:
224-
role_arn: ${upload_arn}
227+
aws_key: '${aws_key}'
228+
aws_secret: '${aws_secret}'
225229
remote_file: '${project}/${variant_name}/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
226-
bucket: ${upload_bucket}
230+
bucket: mciuploads
227231
extract_to: all/${variant_name}
228232

229233
"setup packaging credentials":
@@ -319,10 +323,11 @@ functions:
319323
- "*"
320324
- command: s3.put
321325
params:
322-
role_arn: ${upload_arn}
326+
aws_key: ${aws_key}
327+
aws_secret: ${aws_secret}
323328
local_file: release-files.tgz
324329
remote_file: '${project}/python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files.tar.gz'
325-
bucket: ${upload_bucket}
330+
bucket: mciuploads
326331
permissions: public-read
327332
content_type: ${content_type|application/gzip}
328333
display_name: Release Python files
@@ -353,7 +358,7 @@ functions:
353358
script: |
354359
set -o xtrace
355360
# Download all the release files.
356-
aws s3 cp --recursive s3://${upload_bucket}/${project}/python-release/${branch_name}/${libmongocrypt_s3_suffix}/ release/
361+
aws s3 cp --recursive s3://mciuploads/${project}/python-release/${branch_name}/${libmongocrypt_s3_suffix}/ release/
357362
# Combine releases into one directory.
358363
ls -la release/
359364
mkdir releases
@@ -368,10 +373,11 @@ functions:
368373
- "*"
369374
- command: s3.put
370375
params:
371-
role_arn: ${upload_arn}
376+
aws_key: ${aws_key}
377+
aws_secret: ${aws_secret}
372378
local_file: release-files-all.tgz
373379
remote_file: '${project}/python-release/${branch_name}/${libmongocrypt_s3_suffix}/${task_id}-${execution}-release-files-all.tar.gz'
374-
bucket: ${upload_bucket}
380+
bucket: mciuploads
375381
permissions: public-read
376382
content_type: ${content_type|application/gzip}
377383
display_name: Release Python files all
@@ -426,8 +432,9 @@ functions:
426432
type: test
427433
params:
428434
display_name: Augmented SBOM
429-
role_arn: ${upload_arn}
430-
bucket: ${upload_bucket}
435+
aws_key: ${aws_key}
436+
aws_secret: ${aws_secret}
437+
bucket: mciuploads
431438
content_type: application/json
432439
local_file: libmongocrypt/cyclonedx.augmented.sbom.json
433440
permissions: public-read
@@ -633,17 +640,19 @@ tasks:
633640
fi
634641
- command: s3.put
635642
params:
636-
role_arn: ${upload_arn}
643+
aws_key: '${aws_key}'
644+
aws_secret: '${aws_secret}'
637645
remote_file: 'libmongocrypt/java/${revision}/libmongocrypt-java.tar.gz'
638-
bucket: ${upload_bucket}
646+
bucket: mciuploads
639647
permissions: public-read
640648
local_file: 'libmongocrypt-java.tar.gz'
641649
content_type: '${content_type|application/x-gzip}'
642650
- command: s3.put
643651
params:
644-
role_arn: ${upload_arn}
652+
aws_key: '${aws_key}'
653+
aws_secret: '${aws_secret}'
645654
remote_file: 'libmongocrypt/java/${tag_upload_location}/libmongocrypt-java.tar.gz'
646-
bucket: ${upload_bucket}
655+
bucket: mciuploads
647656
permissions: public-read
648657
optional: true
649658
display_name: 'libmongocrypt-java-${tag_upload_location}.tar.gz'
@@ -826,45 +835,50 @@ tasks:
826835
fi
827836
- command: s3.put
828837
params:
829-
role_arn: ${upload_arn}
838+
aws_key: '${aws_key}'
839+
aws_secret: '${aws_secret}'
830840
remote_file: 'libmongocrypt/all/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt-all.tar.gz'
831-
bucket: ${upload_bucket}
841+
bucket: mciuploads
832842
permissions: public-read
833843
local_file: 'libmongocrypt-all.tar.gz'
834844
content_type: '${content_type|application/x-gzip}'
835845
- command: s3.put
836846
params:
837-
role_arn: ${upload_arn}
847+
aws_key: '${aws_key}'
848+
aws_secret: '${aws_secret}'
838849
remote_file: 'libmongocrypt/all/${branch_name}/${libmongocrypt_s3_suffix_copy}/libmongocrypt-all.tar.gz'
839-
bucket: ${upload_bucket}
850+
bucket: mciuploads
840851
permissions: public-read
841852
local_file: 'libmongocrypt-all.tar.gz'
842853
content_type: '${content_type|application/x-gzip}'
843854
- command: s3.put
844855
params:
845-
role_arn: ${upload_arn}
856+
aws_key: '${aws_key}'
857+
aws_secret: '${aws_secret}'
846858
remote_file: 'libmongocrypt/all/${tag_upload_location}/libmongocrypt-all.tar.gz'
847-
bucket: ${upload_bucket}
859+
bucket: mciuploads
848860
permissions: public-read
849861
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for tagged release.
850862
display_name: 'libmongocrypt-all-${tag_upload_location}.tar.gz'
851863
local_file: 'libmongocrypt-all-${tag_upload_location}.tar.gz'
852864
content_type: '${content_type|application/x-gzip}'
853865
- command: s3.put
854866
params:
855-
role_arn: ${upload_arn}
867+
aws_key: '${aws_key}'
868+
aws_secret: '${aws_secret}'
856869
remote_file: 'libmongocrypt/all/latest/stable/libmongocrypt-all.tar.gz'
857-
bucket: ${upload_bucket}
870+
bucket: mciuploads
858871
permissions: public-read
859872
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for stable release.
860873
display_name: 'stable/libmongocrypt-all-${tag_upload_location}.tar.gz'
861874
local_file: 'stable/libmongocrypt-all-${tag_upload_location}.tar.gz'
862875
content_type: '${content_type|application/x-gzip}'
863876
- command: s3.put
864877
params:
865-
role_arn: ${upload_arn}
878+
aws_key: '${aws_key}'
879+
aws_secret: '${aws_secret}'
866880
remote_file: 'libmongocrypt/all/latest/unstable/libmongocrypt-all.tar.gz'
867-
bucket: ${upload_bucket}
881+
bucket: mciuploads
868882
permissions: public-read
869883
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for unstable release.
870884
display_name: 'unstable/libmongocrypt-all-${tag_upload_location}.tar.gz'
@@ -917,9 +931,10 @@ tasks:
917931
file: libmongocrypt/expansions.yml
918932
- command: s3.get # Download Windows build.
919933
params:
920-
role_arn: ${upload_arn}
934+
aws_key: '${aws_key}'
935+
aws_secret: '${aws_secret}'
921936
remote_file: '${project}/windows-test/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
922-
bucket: ${upload_bucket}
937+
bucket: mciuploads
923938
extract_to: libmongocrypt_download
924939
- command: shell.exec
925940
params:
@@ -945,19 +960,21 @@ tasks:
945960
# Documentation now refers to the GitHub release page, which includes the per-release tarball.
946961
# The fixed URL upload is kept to avoid possibly breaking expectations. Consider removing in the future.
947962
params:
948-
role_arn: ${upload_arn}
963+
aws_key: '${aws_key}'
964+
aws_secret: '${aws_secret}'
949965
remote_file: 'libmongocrypt/windows/latest_release/libmongocrypt${upload_suffix}.tar.gz'
950966
display_name: (Deprecated) libmongocrypt${upload_suffix}.tar.gz
951-
bucket: ${upload_bucket}
967+
bucket: mciuploads
952968
permissions: public-read
953969
local_file: 'libmongocrypt_upload.tar.gz'
954970
content_type: 'application/x-gzip'
955971
- command: s3.put # Upload tarball for GitHub Release.
956972
params:
957-
role_arn: ${upload_arn}
973+
aws_key: '${aws_key}'
974+
aws_secret: '${aws_secret}'
958975
remote_file: '${project}/${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz'
959976
display_name: libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz
960-
bucket: ${upload_bucket}
977+
bucket: mciuploads
961978
permissions: public-read
962979
local_file: 'libmongocrypt_upload.tar.gz'
963980
content_type: 'application/x-gzip'
@@ -973,10 +990,11 @@ tasks:
973990
args: --secret garasign_username=${garasign_username} --secret garasign_password=${garasign_password} +sign --file_to_sign=libmongocrypt_upload.tar.gz --output_file=libmongocrypt_upload.asc
974991
- command: s3.put # Upload signature for GitHub Release.
975992
params:
976-
role_arn: ${upload_arn}
993+
aws_key: '${aws_key}'
994+
aws_secret: '${aws_secret}'
977995
remote_file: '${project}/${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc'
978996
display_name: libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc
979-
bucket: ${upload_bucket}
997+
bucket: mciuploads
980998
permissions: public-read
981999
local_file: 'libmongocrypt/libmongocrypt_upload.asc'
9821000
content_type: 'application/pgp-signature'
@@ -999,10 +1017,11 @@ tasks:
9991017
bash .evergreen/debian_package_build.sh --is-patch=${is_patch}
10001018
- command: s3.put
10011019
params:
1002-
role_arn: ${upload_arn}
1020+
aws_key: ${aws_key}
1021+
aws_secret: ${aws_secret}
10031022
local_file: deb.tar.gz
10041023
remote_file: libmongocrypt/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages.tar.gz
1005-
bucket: ${upload_bucket}
1024+
bucket: mciuploads
10061025
permissions: public-read
10071026
content_type: ${content_type|application/x-gzip}
10081027
display_name: "deb.tar.gz"
@@ -1023,10 +1042,11 @@ tasks:
10231042
bash .evergreen/debian_package_build.sh --arch=i386 --is-patch=${is_patch}
10241043
- command: s3.put
10251044
params:
1026-
role_arn: ${upload_arn}
1045+
aws_key: ${aws_key}
1046+
aws_secret: ${aws_secret}
10271047
local_file: deb.tar.gz
10281048
remote_file: libmongocrypt/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-i386.tar.gz
1029-
bucket: ${upload_bucket}
1049+
bucket: mciuploads
10301050
permissions: public-read
10311051
content_type: ${content_type|application/x-gzip}
10321052
display_name: "deb.tar.gz"
@@ -1122,29 +1142,15 @@ pre:
11221142
REMOTE_SUFFIX_COPY="latest-${branch_name}"
11231143
fi
11241144
1125-
# If we are a non-patch build in the libmongocrypt-release project, we upload to a restricted
1126-
# CDN S3 bucket. Otherwise, we upload to a less restricted bucket for convenience. The corresponding
1127-
# role_arn_... values come from EVG project configuration variables stored on the EVG server
1128-
if test "${is_patch}" = 'true' || "${project_name}" != 'libmongocrypt-release'; then
1129-
upload_bucket='mciuploads'
1130-
upload_arn='${role_arn_for_mciuploads}'
1131-
else
1132-
upload_bucket='cdn-origin-libmongocrypt'
1133-
upload_arn='${role_arn_for_release}'
1134-
fi
1135-
11361145
PROJECT_DIRECTORY="$(pwd)"
11371146
echo "libmongocrypt_s3_suffix: $REMOTE_SUFFIX"
11381147
echo "libmongocrypt_s3_suffix_copy: $REMOTE_SUFFIX_COPY"
11391148
echo "project_directory: $PROJECT_DIRECTORY"
1140-
echo "Upload S3 bucket: $upload_bucket"
11411149
11421150
cat <<EOT > expansion.yml
11431151
libmongocrypt_s3_suffix: "$REMOTE_SUFFIX"
11441152
libmongocrypt_s3_suffix_copy: "$REMOTE_SUFFIX_COPY"
11451153
project_directory: "$PROJECT_DIRECTORY"
1146-
upload_bucket: "$upload_bucket"
1147-
upload_arn: "$upload_arn"
11481154
EOT
11491155
- command: expansions.update
11501156
params:

0 commit comments

Comments
 (0)