From b1d8fc066da54332077d3b8852444b9da63466a2 Mon Sep 17 00:00:00 2001
From: Ruan <ruanclaudio4@gmail.com>
Date: Mon, 29 Apr 2024 16:09:16 -0300
Subject: [PATCH] fix: code suggestions

---
 .gitignore        |  3 ++-
 core/views.py     |  1 -
 webapp/secrets.py | 33 ++++++++++++++++-----------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0c5a00..5e25cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 
 node_modules/
-
+secrets.json
+.pdm-python
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/core/views.py b/core/views.py
index a126cbc..c577a1b 100644
--- a/core/views.py
+++ b/core/views.py
@@ -30,7 +30,6 @@ def home(request):
 
 
 def google_calendar_init_view(request):
-    print(settings.ENVIRONMENT)
     config = get_secret(f"{settings.ENVIRONMENT}/google/calendar")
     creds = CredentialsService.init_for(request.user, scopes=SCOPES)
     if not creds or not creds.valid:
diff --git a/webapp/secrets.py b/webapp/secrets.py
index 7220a93..bc61dd5 100644
--- a/webapp/secrets.py
+++ b/webapp/secrets.py
@@ -5,27 +5,26 @@
 
 
 def get_secret(secret_name, region_name="sa-east-1"):
-    if "dev" in secret_name:
-        try:
-            with open(os.path.join(os.getcwd(), 'webapp/secrets.json'), 'r') as f:
-                secrets = json.load(f)
-                return secrets[secret_name]
-        except Exception as e_:
-            raise e_ from e
-    else:
-        session = boto3.session.Session()
-        client = session.client(
-            service_name='secretsmanager',
-            region_name=region_name
-        )
-
         try:
+            session = boto3.session.Session()
+            try:
+                client = session.client(
+                    service_name='secretsmanager',
+                    region_name=region_name
+                )
+            except Exception as e:
+                print(e)
             get_secret_value_response = client.get_secret_value(
                 SecretId=secret_name
             )
+            
+            with open(os.path.join(os.getcwd(), 'webapp/secrets.json'), 'r') as f:
+                secrets = json.load(f)
         except ClientError as e:
             # For a list of exceptions thrown, see
             # https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_GetSecretValue.html
-            raise e
-        
-        return json.loads(json.loads(get_secret_value_response['SecretString'])['credentials'])
\ No newline at end of file
+            raise e      
+        except Exception as e:
+             raise e from e
+  
+        return secrets[secret_name], json.loads(json.loads(get_secret_value_response['SecretString'])['credentials'])
\ No newline at end of file