File tree Expand file tree Collapse file tree 3 files changed +6
-11
lines changed Expand file tree Collapse file tree 3 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -109,16 +109,14 @@ function trust_s3_endpoint_tls_cert() {
109
109
openssl s_client -showcerts -verify 5 -connect " $SERVER_ENDPOINT " < /dev/null |
110
110
awk ' /BEGIN CERTIFICATE/,/END CERTIFICATE/{ if(/BEGIN CERTIFICATE/){a++}; out="cert"a".pem"; print >out}'
111
111
for cert in * .pem; do
112
- mv -vf " ${cert} " /usr/local/share /ca-certificates/
112
+ cat " ${cert} " >> /etc/ssl/certs /ca-certificates.crt
113
113
done
114
114
115
- # Load the certificate in the system
116
- update-ca-certificates --fresh > /dev/null
117
-
118
115
# Ask different SDKs/tools to load system certificates
119
116
export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
120
117
export NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt
121
118
export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
119
+ export AWS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
122
120
}
123
121
124
122
function main() {
Original file line number Diff line number Diff line change @@ -21,8 +21,5 @@ export APT="apt --quiet --yes"
21
21
xargs --arg-file=" ${MINT_ROOT_DIR} /remove-packages.list" apt --quiet --yes purge
22
22
${APT} autoremove
23
23
24
- # remove unwanted files
25
- rm -fr " $GOROOT " " $GOPATH /src" /var/lib/apt/lists/*
26
-
27
24
# flush to disk
28
25
sync
Original file line number Diff line number Diff line change @@ -1445,13 +1445,13 @@ function test_serverside_encryption_multipart_copy() {
1445
1445
# copy object server side
1446
1446
if [ $rv -eq 0 ]; then
1447
1447
function=" ${AWS} s3api copy-object --bucket ${bucket_name} --key ${object_name} -copy --copy-source ${bucket_name} /${object_name} --copy-source-sse-customer-algorithm AES256 --copy-source-sse-customer-key MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ= --copy-source-sse-customer-key-md5 7PpPLAK26ONlVUGOWlusfg== --sse-customer-algorithm AES256 --sse-customer-key MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ= --sse-customer-key-md5 7PpPLAK26ONlVUGOWlusfg=="
1448
- test_function=${function}
1449
1448
out=$( $function )
1450
1449
rv=$?
1451
- if [ $rv -ne 255 ]; then
1450
+ echo $rv
1451
+ copyETag=$( echo " $out " | jq -r .CopyObjectResult.ETag | sed -e ' s/^"//' -e ' s/"$//' )
1452
+ if [ " ${copyETag} " == " " ]; then
1452
1453
rv=1
1453
- else
1454
- rv=0
1454
+ out=" copy-object with SSE-C failed"
1455
1455
fi
1456
1456
fi
1457
1457
You can’t perform that action at this time.
0 commit comments