penguin/s3-arch-utils

commit 207fddb3efd02c67e027351bdb5a4e2fa45a8bc9

commit 207fddb3efd02c67e027351bdb5a4e2fa45a8bc9
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date:   2025-01-21T11:38:35Z

    Added acl param
---
 arch_upload_aws4.sh   | 15 +++++++++++++--
 create-k8s-secrets.sh |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch_upload_aws4.sh b/arch_upload_aws4.sh
index 96c3e71..5473650 100755
--- a/arch_upload_aws4.sh
+++ b/arch_upload_aws4.sh
@@ -20,6 +20,7 @@
 
 _PATH=$1
 _FILE=$2
+_ACL=$3
 
 if [ -z "$_PATH" ]; then
 	echo "Please define a path"
@@ -36,6 +37,10 @@ if [ -z "$ARCH_S3_BUCKET_URL" ]; then
 	exit 1
 fi
 
+if [ -z "$_ACL" ]; then
+    _ACL="private"
+fi
+
 function _str { printf "%s" $@; }
 function _stre { printf $( echo -n "$@" | sed "s/%/%%/g" ); }
 
@@ -54,10 +59,14 @@ fi
 
 _DATE=$( date -u +"%Y%m%d" )
 _DTIME=$( date -u +"%Y%m%dT%H%M%SZ" )
-_HEADERS="content-length;content-type;host;x-amz-content-sha256;x-amz-date"
-_CTYPE="application/octet-stream"
+_HEADERS="content-length;content-type;host;x-amz-acl;x-amz-content-sha256;x-amz-date"
 _CLEN=$( wc -c < $_FILE | tr -d ' ' )
 
+_CTYPE=$( file --mime-type -b $_FILE )
+if [ -z "$_CTYPE" ]; then
+    _CTYPE="application/octet-stream"
+fi
+
 # Canon Request
 _C="PUT"
 _C="$_C\n/$_PATH"
@@ -65,6 +74,7 @@ _C="$_C\n" # No query string here
 _C="$_C\ncontent-length:$_CLEN"
 _C="$_C\ncontent-type:$_CTYPE"
 _C="$_C\nhost:$BUCKET_URL"
+_C="$_C\nx-amz-acl:$_ACL"
 _C="$_C\nx-amz-content-sha256:$_FILE_SHA"
 _C="$_C\nx-amz-date:$_DTIME"
 _C="$_C\n"
@@ -90,6 +100,7 @@ echo "Upload Target $_FILE -> $BUCKET_URL/$_PATH"
 curl -XPUT -T $_FILE \
   -H "Content-Type: $_CTYPE" \
   -H "Content-Length: $_CLEN" \
+  -H "X-Amz-ACL: $_ACL" \
   -H "X-Amz-Content-SHA256: $_FILE_SHA" \
   -H "X-Amz-Date: $_DTIME" \
   -H "Authorization: AWS4-HMAC-SHA256 Credential=$ACCESS_KEY/$_DATE/$REGION/$SERVICE/aws4_request,SignedHeaders=$_HEADERS,Signature=$SIG" \
diff --git a/create-k8s-secrets.sh b/create-k8s-secrets.sh
index ef4a2e0..474637d 100755
--- a/create-k8s-secrets.sh
+++ b/create-k8s-secrets.sh
@@ -42,7 +42,7 @@
 #                   - |
 #                     cd /tmp;
 #                     _DATE=$( date -u +"%Y%m%dT%H%M%SZ" );
-#                     bash /s3/arch_upload_aws4.sh blog $_DATE.tar.gz;
+#                     bash /s3/arch_upload_aws4.sh blog/$_DATE.tar.gz $_DATE.tar.gz;
 #                     rm -r dump/ $_DATE.tar.gz $_DATE.tar.gz.enc;
 #                 volumeMounts:
 #                   - mountPath: "/s3"