- remove explicit credential mocking

- minor variable name fixes

Signed-off-by: Varsha GS <[email protected]>

tests/clients/boto3/README.md

@@ -11,11 +11,6 @@ from instana.singletons import tracer
 
 http_client = urllib3.PoolManager()
 
-os.environ['AWS_ACCESS_KEY_ID'] = 'testing'
-os.environ['AWS_SECRET_ACCESS_KEY'] = 'testing'
-os.environ['AWS_SECURITY_TOKEN'] = 'testing'
-os.environ['AWS_SESSION_TOKEN'] = 'testing'
-
 @mock_aws
 def test_app_boto3_sqs():
     with tracer.start_active_span('wsgi') as scope:

tests/clients/boto3/test_boto3_lambda.py

@@ -40,7 +40,7 @@ def test_lambda_invoke(self):
         self.assertIn("message", result_payload)
         self.assertEqual("success", result_payload["message"])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -95,7 +95,7 @@ def add_custom_header_before_call(params, **kwargs):
         self.assertIn("message", result_payload)
         self.assertEqual("success", result_payload["message"])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -158,7 +158,7 @@ def add_custom_header_before_sign(request, **kwargs):
         self.assertIn("message", result_payload)
         self.assertEqual("success", result_payload["message"])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -220,7 +220,7 @@ def modify_after_call_args(parsed, **kwargs):
         self.assertIn("message", result_payload)
         self.assertEqual("success", result_payload["message"])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"

tests/clients/boto3/test_boto3_s3.py

@@ -51,7 +51,7 @@ def test_s3_create_bucket(self):
         self.assertEqual(1, len(result['Buckets']))
         self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -84,7 +84,7 @@ def test_s3_list_buckets(self):
         self.assertEqual(0, len(result['Buckets']))
         self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -128,7 +128,7 @@ def test_s3_upload_file(self):
         with tracer.start_active_span('test'):
             self.s3.upload_file(upload_filename, bucket_name, object_name)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -164,7 +164,7 @@ def test_s3_upload_file_obj(self):
             with open(upload_filename, "rb") as fd:
                 self.s3.upload_fileobj(fd, bucket_name, object_name)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -200,7 +200,7 @@ def test_s3_download_file(self):
         with tracer.start_active_span('test'):
             self.s3.download_file(bucket_name, object_name, download_target_filename)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -237,7 +237,7 @@ def test_s3_download_file_obj(self):
             with open(download_target_filename, "wb") as fd:
                 self.s3.download_fileobj(bucket_name, object_name, fd)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -288,7 +288,7 @@ def add_custom_header_before_call(params, **kwargs):
         self.assertEqual(1, len(result['Buckets']))
         self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -349,7 +349,7 @@ def add_custom_header_before_sign(request, **kwargs):
         self.assertEqual(1, len(result['Buckets']))
         self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -409,7 +409,7 @@ def modify_after_call_args(parsed, **kwargs):
         self.assertEqual(1, len(result['Buckets']))
         self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"

tests/clients/boto3/test_boto3_secretsmanager.py

@@ -20,33 +20,17 @@
 pwd = os.path.dirname(os.path.abspath(__file__))
 
 class TestSecretsManager(unittest.TestCase):
-    def set_aws_credentials(self):
-        """ Mocked AWS Credentials for moto """
-        for variable_name in self.variable_names:
-            os.environ[variable_name] = "testing"
-
     def setUp(self):
         """ Clear all spans before a test run """
         self.recorder = tracer.recorder
         self.recorder.clear_spans()
-        self.variable_names = (
-                "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY",
-                "AWS_SECURITY_TOKEN", "AWS_SESSION_TOKEN"
-                )
-        self.set_aws_credentials()
         self.mock = mock_aws()
         self.mock.start()
         self.secretsmanager = boto3.client('secretsmanager', region_name='us-east-1')
 
-    def unset_aws_credentials(self):
-        """ Reset all environment variables of consequence """
-        for variable_name in self.variable_names:
-            os.environ.pop(variable_name, None)
-
     def tearDown(self):
         # Stop Moto after each test
         self.mock.stop()
-        self.unset_aws_credentials()
 
 
     def test_vanilla_list_secrets(self):
@@ -70,7 +54,7 @@ def test_get_secret_value(self):
 
         self.assertEqual(result['Name'], secret_id)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -130,7 +114,7 @@ def add_custom_header_before_call(params, **kwargs):
 
         self.assertEqual(result['Name'], secret_id)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -198,7 +182,7 @@ def add_custom_header_before_sign(request, **kwargs):
 
         self.assertEqual(result['Name'], secret_id)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -265,7 +249,7 @@ def modify_after_call_args(parsed, **kwargs):
 
         self.assertEqual(result['Name'], secret_id)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"

tests/clients/boto3/test_boto3_ses.py

@@ -44,7 +44,7 @@ def test_verify_email(self):
 
         self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -95,7 +95,7 @@ def add_custom_header_before_call(params, **kwargs):
 
         self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -154,7 +154,7 @@ def add_custom_header_before_sign(request, **kwargs):
 
         self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -212,7 +212,7 @@ def modify_after_call_args(parsed, **kwargs):
 
         self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"

tests/clients/boto3/test_boto3_sqs.py

@@ -76,7 +76,7 @@ def test_send_message(self):
 
         self.assertTrue(response['MessageId'])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -110,7 +110,7 @@ def test_app_boto3_sqs(self):
         with tracer.start_active_span('test'):
             self.http_client.request('GET', testenv["wsgi_server"] + '/boto3/sqs')
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(5, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -193,7 +193,7 @@ def add_custom_header_before_call(params, **kwargs):
 
         self.assertTrue(response['MessageId'])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -278,7 +278,7 @@ def add_custom_header_before_sign(request, **kwargs):
 
         self.assertTrue(response['MessageId'])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"
@@ -362,7 +362,7 @@ def modify_after_call_args(parsed, **kwargs):
 
         self.assertTrue(response['MessageId'])
 
-        spans = tracer.recorder.queued_spans()
+        spans = self.recorder.queued_spans()
         self.assertEqual(2, len(spans))
 
         filter = lambda span: span.n == "sdk"