Use standard AWS access key ENV VAR names

README.md

@@ -10,10 +10,10 @@ If you're looking for the same kind of tool, but for APT repositories, I can rec
 
 1. You have python installed (2.6+).
 
-1. You have your S3 credentials available in the `AWS_ACCESS_KEY` and `AWS_SECRET_KEY` environment variables:
+1. You have your S3 credentials available in the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables:
 
-        export AWS_ACCESS_KEY="key"
-        export AWS_SECRET_KEY="secret"
+        export AWS_ACCESS_KEY_ID="key"
+        export AWS_SECRET_ACCESS_KEY="secret"
 
 ## Installation
 
@@ -31,7 +31,7 @@ Use the provided `/test/test.sh` script:
 
     vagrant up
     vagrant ssh
-    AWS_ACCESS_KEY=xx AWS_SECRET_KET=yy BUCKET=zz ./test/test.sh
+    AWS_ACCESS_KEY_ID=xx AWS_SECRET_KET=yy BUCKET=zz ./test/test.sh
 
 Also:
 
@@ -58,7 +58,7 @@ Have a `~/.rpmmacros` file ready with the following content:
 
 Pass the `--sign` option to `rpm-s3`:
 
-    AWS_ACCESS_KEY="key" AWS_SECRET_KEY="secret" ./bin/rpm-s3 --sign my-app-1.0.0.x86_64.rpm
+    AWS_ACCESS_KEY_ID="key" AWS_SECRET_ACCESS_KEY="secret" ./bin/rpm-s3 --sign my-app-1.0.0.x86_64.rpm
 
 ### Import gpg key to install signed packages
 

bin/rpm-s3

@@ -108,10 +108,10 @@ class FileGrabber(object):
 
 
 def getclient(base, host_url):
-    if os.getenv('AWS_ACCESS_KEY'):
+    if os.getenv('AWS_ACCESS_KEY_ID'):
         return boto.connect_s3(
-            os.getenv('AWS_ACCESS_KEY'),
-            os.getenv('AWS_SECRET_KEY'),
+            os.getenv('AWS_ACCESS_KEY_ID'),
+            os.getenv('AWS_SECRET_ACCESS_KEY'),
             host=host_url,
             calling_format=boto.s3.connection.OrdinaryCallingFormat()
         ).get_bucket(base.netloc)