Changing environment variables AGAIN. Sorry, foks. AWS_ACCESS_KEY and…

… AWS_SECRET_KEY , trying to keep up with Amazon and their inconsistencies
epheph · Apr 21, 2013 · c3d429a · c3d429a
1 parent bfb0e8c
commit c3d429a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -92,8 +92,8 @@ Installation
 =================================
 Put fec2din in your path, chmod +x. Ensure boto is installed and your access & secret key are exported as environment variables:
 ```
- export EC2_ACCESS_KEY=JFIOQNAKEIFJJAKDLIJA
- export EC2_SECRET_KEY=3jfioajkle+OnfAEV5OIvj5nLnRy2jfklZRop3nn
+ export AWS_ACCESS_KEY=JFIOQNAKEIFJJAKDLIJA
+ export AWS_SECRET_KEY=3jfioajkle+OnfAEV5OIvj5nLnRy2jfklZRop3nn
 ```
 
 If you are not using the us-east-1 region, you can set alternate endpoints in two ways:

diff --git a/fec2din b/fec2din
@@ -24,24 +24,24 @@ ec2_filter = args.ec2_filter
 
 
 # You can uncomment and set these, or set the env variables AWSAccessKeyId & AWSSecretKey
-# AWS_ACCESS_KEY_ID="aaaaaaaaaaaaaaaaaaaa"
-# AWS_SECRET_ACCESS_KEY="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+# AWS_ACCESS_KEY="aaaaaaaaaaaaaaaaaaaa"
+# AWS_SECRET_KEY="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
 
 ec2_url="https://us-east-1.ec2.amazonaws.com"
 
 try:
-  AWS_ACCESS_KEY_ID
+  AWS_ACCESS_KEY
 except NameError:
   try:
-    AWS_ACCESS_KEY_ID=os.environ['AWS_ACCESS_KEY_ID']
-    AWS_SECRET_ACCESS_KEY=os.environ['AWS_SECRET_ACCESS_KEY']
+    AWS_ACCESS_KEY=os.environ['AWS_ACCESS_KEY']
+    AWS_SECRET_KEY=os.environ['AWS_SECRET_KEY']
   except KeyError:
-    print """Please set environment variables EC2_ACCESS_KEY & EC2_SECRET_KEY
+    print """Please set environment variables AWS_ACCESS_KEY & AWS_SECRET_KEY
 Please note that while ec2-describe-instances and other CLI tools use
 EC2_CERT & EC2_PRIVATE_KEY, fec2din uses the access key & secret key.
 This would look something like:
-  export EC2_ACCESS_KEY=JFIOQNAKEIFJJAKDLIJA
-  export EC2_SECRET_KEY=3jfioajkle+OnfAEV5OIvj5nLnRy2jfklZRop3nn
+  export AWS_ACCESS_KEY=JFIOQNAKEIFJJAKDLIJA
+  export AWS_SECRET_KEY=3jfioajkle+OnfAEV5OIvj5nLnRy2jfklZRop3nn
 """
     sys.exit(1)
 
@@ -56,7 +56,7 @@ try:
 except KeyError:
   pass
 
-ec2_conn = boto.connect_ec2_endpoint(ec2_url, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
+ec2_conn = boto.connect_ec2_endpoint(ec2_url, AWS_ACCESS_KEY, AWS_SECRET_KEY)
 
 if ec2_filter:
   if re.match( "^i-", ec2_filter ):