From d6d586680244734a463bd92ed7bcb8e80ab3f853 Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:26:12 +0000 Subject: [PATCH 1/7] added region to boto3 client --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 3fa24e2..4eb0078 100644 --- a/main.py +++ b/main.py @@ -11,7 +11,7 @@ class Config: def __init__(self): - self.secrets_manager = boto3.client('secretsmanager') + self.secrets_manager = boto3.client('secretsmanager, region_name='us-east-1') def get_secret_from_aws(self, secret_name): try: From 86ba398995e27eff6e680d0231f04aab9d54b8d5 Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:28:55 +0000 Subject: [PATCH 2/7] fix region quoting --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 4eb0078..b6c07e0 100644 --- a/main.py +++ b/main.py @@ -11,7 +11,7 @@ class Config: def __init__(self): - self.secrets_manager = boto3.client('secretsmanager, region_name='us-east-1') + self.secrets_manager = boto3.client('secretsmanager', region_name='us-east-1') def get_secret_from_aws(self, secret_name): try: From e1cce1b818e3ed7e7ea1051d54468bdfda14d2b6 Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:32:18 +0000 Subject: [PATCH 3/7] testing json load error --- main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/main.py b/main.py index b6c07e0..6b54507 100644 --- a/main.py +++ b/main.py @@ -17,6 +17,7 @@ def get_secret_from_aws(self, secret_name): try: response = self.secrets_manager.get_secret_value(SecretId=secret_name) if 'SecretString' in response: + print(response) return json.loads(response['SecretString']) return None except (ClientError,): From bc14ce727682ba4e385cbcf318cb107ec52e3044 Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:41:12 +0000 Subject: [PATCH 4/7] remove json loads --- main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.py b/main.py index 6b54507..1fdf245 100644 --- a/main.py +++ b/main.py @@ -17,8 +17,7 @@ def get_secret_from_aws(self, secret_name): try: response = self.secrets_manager.get_secret_value(SecretId=secret_name) if 'SecretString' in response: - print(response) - return json.loads(response['SecretString']) + return response['SecretString'] return None except (ClientError,): return None From 3b530855fedcb38bfb569e8f767ec51459ebc117 Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:47:57 +0000 Subject: [PATCH 5/7] printing password --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index 1fdf245..fc7b95f 100644 --- a/main.py +++ b/main.py @@ -75,6 +75,8 @@ def dedupe_data(session, table_name): config = Config() conn_string = config.get_conn_string() db = DatabaseConnection(conn_string) + + print(conn_string) session = db.get_session() dedupe_data(session, "crypto_transactions") From 2e3faf22b3730c3288b292ca65f991ec45509a3a Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:57:08 +0000 Subject: [PATCH 6/7] getting rid of json loads --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index fc7b95f..3f15f19 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ def get_secret_from_aws(self, secret_name): response = self.secrets_manager.get_secret_value(SecretId=secret_name) if 'SecretString' in response: return response['SecretString'] - return None + return None) except (ClientError,): return None From 0dba102eba24b352e211d8aa829355857afbe74e Mon Sep 17 00:00:00 2001 From: Chris Eldering <122896728+celdering-trm@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:58:36 +0000 Subject: [PATCH 7/7] Co-authored-by: Haptr3c Co-authored-by: Alex Janakos --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 3f15f19..fc7b95f 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ def get_secret_from_aws(self, secret_name): response = self.secrets_manager.get_secret_value(SecretId=secret_name) if 'SecretString' in response: return response['SecretString'] - return None) + return None except (ClientError,): return None