Skip to content

Commit fafaab7

Browse files
vector-of-boolvector-of-bool
authored
Revert "[MONGOCRYPT-838] Switch the upload target bucket" (#1121)
Revert "[MONGOCRYPT-838] Switch the upload target bucket based on the project/patch status (#1117)" This reverts commit 358e5f8.
1 parent eeb1cf7 commit fafaab7

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
@@ -629,17 +636,19 @@ tasks:
629636
fi
630637
- command: s3.put
631638
params:
632-
role_arn: ${upload_arn}
639+
aws_key: '${aws_key}'
640+
aws_secret: '${aws_secret}'
633641
remote_file: 'libmongocrypt/java/${revision}/libmongocrypt-java.tar.gz'
634-
bucket: ${upload_bucket}
642+
bucket: mciuploads
635643
permissions: public-read
636644
local_file: 'libmongocrypt-java.tar.gz'
637645
content_type: '${content_type|application/x-gzip}'
638646
- command: s3.put
639647
params:
640-
role_arn: ${upload_arn}
648+
aws_key: '${aws_key}'
649+
aws_secret: '${aws_secret}'
641650
remote_file: 'libmongocrypt/java/${tag_upload_location}/libmongocrypt-java.tar.gz'
642-
bucket: ${upload_bucket}
651+
bucket: mciuploads
643652
permissions: public-read
644653
optional: true
645654
display_name: 'libmongocrypt-java-${tag_upload_location}.tar.gz'
@@ -822,45 +831,50 @@ tasks:
822831
fi
823832
- command: s3.put
824833
params:
825-
role_arn: ${upload_arn}
834+
aws_key: '${aws_key}'
835+
aws_secret: '${aws_secret}'
826836
remote_file: 'libmongocrypt/all/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt-all.tar.gz'
827-
bucket: ${upload_bucket}
837+
bucket: mciuploads
828838
permissions: public-read
829839
local_file: 'libmongocrypt-all.tar.gz'
830840
content_type: '${content_type|application/x-gzip}'
831841
- command: s3.put
832842
params:
833-
role_arn: ${upload_arn}
843+
aws_key: '${aws_key}'
844+
aws_secret: '${aws_secret}'
834845
remote_file: 'libmongocrypt/all/${branch_name}/${libmongocrypt_s3_suffix_copy}/libmongocrypt-all.tar.gz'
835-
bucket: ${upload_bucket}
846+
bucket: mciuploads
836847
permissions: public-read
837848
local_file: 'libmongocrypt-all.tar.gz'
838849
content_type: '${content_type|application/x-gzip}'
839850
- command: s3.put
840851
params:
841-
role_arn: ${upload_arn}
852+
aws_key: '${aws_key}'
853+
aws_secret: '${aws_secret}'
842854
remote_file: 'libmongocrypt/all/${tag_upload_location}/libmongocrypt-all.tar.gz'
843-
bucket: ${upload_bucket}
855+
bucket: mciuploads
844856
permissions: public-read
845857
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for tagged release.
846858
display_name: 'libmongocrypt-all-${tag_upload_location}.tar.gz'
847859
local_file: 'libmongocrypt-all-${tag_upload_location}.tar.gz'
848860
content_type: '${content_type|application/x-gzip}'
849861
- command: s3.put
850862
params:
851-
role_arn: ${upload_arn}
863+
aws_key: '${aws_key}'
864+
aws_secret: '${aws_secret}'
852865
remote_file: 'libmongocrypt/all/latest/stable/libmongocrypt-all.tar.gz'
853-
bucket: ${upload_bucket}
866+
bucket: mciuploads
854867
permissions: public-read
855868
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for stable release.
856869
display_name: 'stable/libmongocrypt-all-${tag_upload_location}.tar.gz'
857870
local_file: 'stable/libmongocrypt-all-${tag_upload_location}.tar.gz'
858871
content_type: '${content_type|application/x-gzip}'
859872
- command: s3.put
860873
params:
861-
role_arn: ${upload_arn}
874+
aws_key: '${aws_key}'
875+
aws_secret: '${aws_secret}'
862876
remote_file: 'libmongocrypt/all/latest/unstable/libmongocrypt-all.tar.gz'
863-
bucket: ${upload_bucket}
877+
bucket: mciuploads
864878
permissions: public-read
865879
optional: true # Do not fail task if `local_file` does not exist. `local_file` only exists for unstable release.
866880
display_name: 'unstable/libmongocrypt-all-${tag_upload_location}.tar.gz'
@@ -913,9 +927,10 @@ tasks:
913927
file: libmongocrypt/expansions.yml
914928
- command: s3.get # Download Windows build.
915929
params:
916-
role_arn: ${upload_arn}
930+
aws_key: '${aws_key}'
931+
aws_secret: '${aws_secret}'
917932
remote_file: '${project}/windows-test/${branch_name}/${libmongocrypt_s3_suffix}/libmongocrypt.tar.gz'
918-
bucket: ${upload_bucket}
933+
bucket: mciuploads
919934
extract_to: libmongocrypt_download
920935
- command: shell.exec
921936
params:
@@ -941,19 +956,21 @@ tasks:
941956
# Documentation now refers to the GitHub release page, which includes the per-release tarball.
942957
# The fixed URL upload is kept to avoid possibly breaking expectations. Consider removing in the future.
943958
params:
944-
role_arn: ${upload_arn}
959+
aws_key: '${aws_key}'
960+
aws_secret: '${aws_secret}'
945961
remote_file: 'libmongocrypt/windows/latest_release/libmongocrypt${upload_suffix}.tar.gz'
946962
display_name: (Deprecated) libmongocrypt${upload_suffix}.tar.gz
947-
bucket: ${upload_bucket}
963+
bucket: mciuploads
948964
permissions: public-read
949965
local_file: 'libmongocrypt_upload.tar.gz'
950966
content_type: 'application/x-gzip'
951967
- command: s3.put # Upload tarball for GitHub Release.
952968
params:
953-
role_arn: ${upload_arn}
969+
aws_key: '${aws_key}'
970+
aws_secret: '${aws_secret}'
954971
remote_file: '${project}/${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz'
955972
display_name: libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.tar.gz
956-
bucket: ${upload_bucket}
973+
bucket: mciuploads
957974
permissions: public-read
958975
local_file: 'libmongocrypt_upload.tar.gz'
959976
content_type: 'application/x-gzip'
@@ -969,10 +986,11 @@ tasks:
969986
args: --secret garasign_username=${garasign_username} --secret garasign_password=${garasign_password} +sign --file_to_sign=libmongocrypt_upload.tar.gz --output_file=libmongocrypt_upload.asc
970987
- command: s3.put # Upload signature for GitHub Release.
971988
params:
972-
role_arn: ${upload_arn}
989+
aws_key: '${aws_key}'
990+
aws_secret: '${aws_secret}'
973991
remote_file: '${project}/${build_variant}/${branch_name}/${revision}/${version_id}/libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc'
974992
display_name: libmongocrypt-windows-x86_64-${libmongocrypt_release_version}.asc
975-
bucket: ${upload_bucket}
993+
bucket: mciuploads
976994
permissions: public-read
977995
local_file: 'libmongocrypt/libmongocrypt_upload.asc'
978996
content_type: 'application/pgp-signature'
@@ -995,10 +1013,11 @@ tasks:
9951013
bash .evergreen/debian_package_build.sh --is-patch=${is_patch}
9961014
- command: s3.put
9971015
params:
998-
role_arn: ${upload_arn}
1016+
aws_key: ${aws_key}
1017+
aws_secret: ${aws_secret}
9991018
local_file: deb.tar.gz
10001019
remote_file: libmongocrypt/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages.tar.gz
1001-
bucket: ${upload_bucket}
1020+
bucket: mciuploads
10021021
permissions: public-read
10031022
content_type: ${content_type|application/x-gzip}
10041023
display_name: "deb.tar.gz"
@@ -1019,10 +1038,11 @@ tasks:
10191038
bash .evergreen/debian_package_build.sh --arch=i386 --is-patch=${is_patch}
10201039
- command: s3.put
10211040
params:
1022-
role_arn: ${upload_arn}
1041+
aws_key: ${aws_key}
1042+
aws_secret: ${aws_secret}
10231043
local_file: deb.tar.gz
10241044
remote_file: libmongocrypt/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-i386.tar.gz
1025-
bucket: ${upload_bucket}
1045+
bucket: mciuploads
10261046
permissions: public-read
10271047
content_type: ${content_type|application/x-gzip}
10281048
display_name: "deb.tar.gz"
@@ -1118,29 +1138,15 @@ pre:
11181138
REMOTE_SUFFIX_COPY="latest-${branch_name}"
11191139
fi
11201140
1121-
# If we are a non-patch build in the libmongocrypt-release project, we upload to a restricted
1122-
# CDN S3 bucket. Otherwise, we upload to a less restricted bucket for convenience. The corresponding
1123-
# role_arn_... values come from EVG project configuration variables stored on the EVG server
1124-
if test "${is_patch}" = 'true' || "${project_name}" != 'libmongocrypt-release'; then
1125-
upload_bucket='mciuploads'
1126-
upload_arn='${role_arn_for_mciuploads}'
1127-
else
1128-
upload_bucket='cdn-origin-libmongocrypt'
1129-
upload_arn='${role_arn_for_release}'
1130-
fi
1131-
11321141
PROJECT_DIRECTORY="$(pwd)"
11331142
echo "libmongocrypt_s3_suffix: $REMOTE_SUFFIX"
11341143
echo "libmongocrypt_s3_suffix_copy: $REMOTE_SUFFIX_COPY"
11351144
echo "project_directory: $PROJECT_DIRECTORY"
1136-
echo "Upload S3 bucket: $upload_bucket"
11371145
11381146
cat <<EOT > expansion.yml
11391147
libmongocrypt_s3_suffix: "$REMOTE_SUFFIX"
11401148
libmongocrypt_s3_suffix_copy: "$REMOTE_SUFFIX_COPY"
11411149
project_directory: "$PROJECT_DIRECTORY"
1142-
upload_bucket: "$upload_bucket"
1143-
upload_arn: "$upload_arn"
11441150
EOT
11451151
- command: expansions.update
11461152
params:

0 commit comments

Comments
 (0)