From d5896990bcc69efca4f387a6892e8f568e1fe7f4 Mon Sep 17 00:00:00 2001 From: Kyle Stewart Date: Wed, 19 May 2021 15:47:57 -0500 Subject: [PATCH 1/4] Fix to allow credential values of 'None' to work correctly --- sensors/sqs_sensor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sensors/sqs_sensor.py b/sensors/sqs_sensor.py index c34919a1..caaf61c9 100644 --- a/sensors/sqs_sensor.py +++ b/sensors/sqs_sensor.py @@ -172,7 +172,10 @@ def _is_same_credentials(session, account_id): def _setup_session(self): ''' Setup Boto3 session ''' - session = Session(aws_access_key_id=self.access_key_id, + if self.access_key_id.lower() == "none": + session = Session(aws_access_key_id=None, aws_secret_access_key=None) + else: + session = Session(aws_access_key_id=self.access_key_id, aws_secret_access_key=self.secret_access_key) if not self.account_id: From f7fd35dd9e0405fab1ac465e4e3de6f83f69db14 Mon Sep 17 00:00:00 2001 From: Kyle Stewart Date: Wed, 19 May 2021 15:55:25 -0500 Subject: [PATCH 2/4] Incrementing version # and adding Changelog entry for proposed fix --- CHANGES.md | 3 +++ pack.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 04916abc..77edb3a5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # Changelog +## 2.0.1 +- Fix issue when configured value for aws_access_key_id is `None` in SQS Sensor. + ## 2.0.0 * Drop Python 2.7 support diff --git a/pack.yaml b/pack.yaml index 1ff20ae5..031905a5 100644 --- a/pack.yaml +++ b/pack.yaml @@ -19,7 +19,7 @@ keywords: - SQS - lambda - kinesis -version: 2.0.0 +version: 2.0.1 author : StackStorm, Inc. email : info@stackstorm.com python_versions: From 5ecfea3af991f33ce32d2543358114a98723392c Mon Sep 17 00:00:00 2001 From: Kyle Stewart Date: Wed, 19 May 2021 16:15:33 -0500 Subject: [PATCH 3/4] Spacing looked incorrect after last commit. --- sensors/sqs_sensor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sensors/sqs_sensor.py b/sensors/sqs_sensor.py index caaf61c9..aeac8a36 100644 --- a/sensors/sqs_sensor.py +++ b/sensors/sqs_sensor.py @@ -173,9 +173,9 @@ def _is_same_credentials(session, account_id): def _setup_session(self): ''' Setup Boto3 session ''' if self.access_key_id.lower() == "none": - session = Session(aws_access_key_id=None, aws_secret_access_key=None) - else: - session = Session(aws_access_key_id=self.access_key_id, + session = Session(aws_access_key_id=None, aws_secret_access_key=None) + else: + session = Session(aws_access_key_id=self.access_key_id, aws_secret_access_key=self.secret_access_key) if not self.account_id: From 1eeb73645fce241d417f6300275ed36ac1097160 Mon Sep 17 00:00:00 2001 From: Kyle Stewart Date: Wed, 19 May 2021 16:25:18 -0500 Subject: [PATCH 4/4] Removing .lower() as that wasn't actually helping. --- .DS_Store | Bin 0 -> 6148 bytes sensors/sqs_sensor.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4df2e86159be245e2ff494ab120703f25772e574 GIT binary patch literal 6148 zcmeHKJ8r`;3?-8QHIT()M_nN|5CZ1}xj@jQor)TW(cM$d)uZ+CGt^MKr9+EHfP50g zC&OA1gmxo8b!qyki6slYn6 zz4iYC{D=8}N#c$QP=SA?fNqB4u*WN9Z*5-AdToK9;8ybiH^bT~2;Po?-j1=ccKql? bQCDn@^O`sZIvshZ1Nk#xy3nY=Z!7Q#X&)7| literal 0 HcmV?d00001 diff --git a/sensors/sqs_sensor.py b/sensors/sqs_sensor.py index aeac8a36..7324245a 100644 --- a/sensors/sqs_sensor.py +++ b/sensors/sqs_sensor.py @@ -172,7 +172,7 @@ def _is_same_credentials(session, account_id): def _setup_session(self): ''' Setup Boto3 session ''' - if self.access_key_id.lower() == "none": + if self.access_key_id == "None": session = Session(aws_access_key_id=None, aws_secret_access_key=None) else: session = Session(aws_access_key_id=self.access_key_id,