From 44fee1e4d0e40d60cab3306fc57c654b3c260c68 Mon Sep 17 00:00:00 2001
From: lrakai <lmrakai@gmail.com>
Date: Sat, 18 Nov 2023 23:08:52 -0700
Subject: [PATCH] remove separate credential handler

---
 src/config.py      | 10 ++++++----
 src/credentials.py | 13 -------------
 src/vcf.py         | 11 +++--------
 3 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 src/credentials.py

diff --git a/src/config.py b/src/config.py
index 499cc5c..64529ca 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1,7 +1,9 @@
 import os
 
 CONFIG = {
-    'client_id'     : os.environ.get('AWS_CLIENT_ID'),
-    'client_secret' : os.environ.get('AWS_CLIENT_SECRET'),
-    'region_name'   : os.environ.get('AWS_REGION', 'us-west-2')
-}
\ No newline at end of file
+    'credentials': {
+        'credential_id': os.environ.get('AWS_CLIENT_ID'),
+        'credential_key': os.environ.get('AWS_CLIENT_SECRET'),
+    },
+    'region_id': os.environ.get('AWS_REGION', 'us-west-2'),
+}
diff --git a/src/credentials.py b/src/credentials.py
deleted file mode 100644
index 5c9f54d..0000000
--- a/src/credentials.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import boto3
-
-from config import CONFIG
-
-
-class credential_helper:
-    @staticmethod
-    def create_new_session():
-        return boto3.Session(
-        aws_access_key_id = CONFIG['client_id'],
-        aws_secret_access_key = CONFIG['client_secret'],
-      	region_name = CONFIG['region_name']
-    )
\ No newline at end of file
diff --git a/src/vcf.py b/src/vcf.py
index 6eefc06..d699cff 100644
--- a/src/vcf.py
+++ b/src/vcf.py
@@ -2,7 +2,6 @@
 import time
 
 from config import CONFIG
-from credentials import credential_helper
 
 import boto3
 import botocore
@@ -83,10 +82,10 @@ def create_new_session(event):
       	region_name=event['region_id']
     )
 
-def timed_handler():
+def timed_handler(event, context):
     start = time.time()
 
-    handler({}, None)
+    result = handler(event, context)
 
     end = time.time()
     print(end - start)
@@ -94,10 +93,6 @@ def timed_handler():
     return result
 
 
-def create_new_session(event):
-    return credential_helper.create_new_session()
-
-
 if __name__ == '__main__':
-    result = timed_handler()
+    result = timed_handler(CONFIG, None)
     print(result)