ADD option to set cache

Author: Janez Justin

rpm/README.md

@@ -53,7 +53,7 @@ Here is a minimal requirement for the policy that is included in role:
 ```
 {"Version": "2012-10-17",
     "Statement": [
-        {"Sid": "<THIS IS UNIQE>",
+        {"Sid": "<THIS IS UNIQUE>",
             "Action": [
                 "s3:GetObject",
                 "s3:PutObject",
@@ -72,6 +72,7 @@ These are the environmental variables you will have to set:
 | GPG_PASS | GPG key password |
 | BUCKET_NAME | Bucket Name |
 | REPO_DIR | Directory |
+| CACHE | Directory |
 
 **PUBLIC** Set to True for the outputs to be publicly readable
 
@@ -83,6 +84,8 @@ These are the environmental variables you will have to set:
 
 **REPO_DIR** Path to repositroy from bucket root. If none is set, it is assumed root of repository is root of the bucket
 
+**CACHE**  Path to cache folder from bucket root (e.g. repo/cache)
+
 ### Set up lambda with CLI
 
 [Install aws cli](http://docs.aws.amazon.com/cli/latest/userguide/installing.html)
@@ -96,7 +99,7 @@ aws lambda create-function \
     --handler s3rpm.lambda_handler \
     --runtime python3.6 \
 # Replace '<...>' with environmental variables
-    --environment Variables='{PUBLIC=<bool>, GPG_KEY=<file>, GPG_PASS=<password>, BUCKET_NAME=<bucket name>, REPO_DIR=<dir>}'
+    --environment Variables='{PUBLIC=<bool>, GPG_KEY=<file>, GPG_PASS=<password>, BUCKET_NAME=<bucket name>, REPO_DIR=<dir>, CACHE=<dir>}'
 ```
 
 ### Set up lambda manually

rpm/s3rpm.py

@@ -16,7 +16,7 @@ def lambda_handler(event, context):
     prefix = '/'.join(key.split('/')[0:-1])+'/'
 
     s3_repo_dir = os.environ['REPO_DIR'].strip('/')
-
+    
     #make sure we are working with correct files
     if bucket == os.environ['BUCKET_NAME'] and key.endswith(".rpm") and prefix.startswith(s3_repo_dir):
         #check if repodata already exist, if not create new with key file
@@ -39,7 +39,7 @@ def lambda_handler(event, context):
             repo, cache = check_changed_files(repo, s3_repo_dir)
         #save cache to bucket
         s3 = boto3.resource('s3')
-        f_index_obj = s3.Object(bucket_name=os.environ['BUCKET_NAME'], key=s3_repo_dir+'/repo_cache')
+        f_index_obj = s3.Object(bucket_name=os.environ['BUCKET_NAME'], key=os.environ['CACHE']+'/repo_cache')
         print("Writing file: %s" % (str(f_index_obj)))
         f_index_obj.put(Body=str(json.dumps(cache)))
 
@@ -106,10 +106,10 @@ def get_cache(repo, s3_repo_dir):
     """
     Check for cache file
     """
-    if check_bucket_file_existance(s3_repo_dir+'/repo_cache'):
-        print('Repodata cache (%s) found, attempting to write to it' %(s3_repo_dir+'/repo_cache'))
+    if check_bucket_file_existance(os.environ['CACHE']+'/repo_cache'):
+        print('Repodata cache (%s) found, attempting to write to it' %(os.environ['CACHE']+'/repo_cache'))
         s3 = boto3.client('s3')
-        s3.download_file(os.environ['BUCKET_NAME'], s3_repo_dir+'/repo_cache', repo.repodir + 'repo_cache')
+        s3.download_file(os.environ['BUCKET_NAME'], os.environ['CACHE']+'/repo_cache', repo.repodir + 'repo_cache')
         with open(repo.repodir + 'repo_cache', 'r') as f:
             cache = json.loads(f.read(-1))
     else:
@@ -128,7 +128,7 @@ def remove_overwritten_file_from_cache(cache, newfile, s3_repo_dir, repo):
 
     # save cache in case new event occurs
     s3 = boto3.resource('s3')
-    f_index_obj = s3.Object(bucket_name=os.environ['BUCKET_NAME'], key=s3_repo_dir+'/repo_cache')
+    f_index_obj = s3.Object(bucket_name=os.environ['BUCKET_NAME'], key=os.environ['CACHE']+'/repo_cache')
     f_index_obj.put(Body=str(json.dumps(cache)))
 
     repo.remove_package(pkg_id)    

rpm/s3rpm_test.py

@@ -19,6 +19,7 @@ def setUp(self):
         os.environ['GPG_KEY'] = ''
         os.environ['PUBLIC'] = 'True'
         os.environ['GPG_PASS']='123'
+        os.environ['CACHE']='test_s3rpm'
 
     def tearDown(self):
         if os.path.exists('test_s3rpm'):
@@ -137,6 +138,7 @@ def setUp(self):
         os.environ['GPG_KEY'] = ''
         os.environ['PUBLIC'] = 'True'
         os.environ['GPG_PASS']='123'
+        os.environ['CACHE']='test_s3rpm'
         self.m = mock_open(read_data='')
 
     def tearDown(self):