Skip to content

Commit 9a7f45b

Browse files
GSVarshaFerenc-
GSVarsha
authored and
Ferenc-
committed
- remove explicit credential mocking
- minor variable name fixes Signed-off-by: Varsha GS <[email protected]>
1 parent fa2e561 commit 9a7f45b

File tree

6 files changed

+26
-47
lines changed

6 files changed

+26
-47
lines changed

‎tests/clients/boto3/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ from instana.singletons import tracer
1111
1212
http_client = urllib3.PoolManager()
1313
14-
os.environ['AWS_ACCESS_KEY_ID'] = 'testing'
15-
os.environ['AWS_SECRET_ACCESS_KEY'] = 'testing'
16-
os.environ['AWS_SECURITY_TOKEN'] = 'testing'
17-
os.environ['AWS_SESSION_TOKEN'] = 'testing'
18-
1914
@mock_aws
2015
def test_app_boto3_sqs():
2116
with tracer.start_active_span('wsgi') as scope:

‎tests/clients/boto3/test_boto3_lambda.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_lambda_invoke(self):
4040
self.assertIn("message", result_payload)
4141
self.assertEqual("success", result_payload["message"])
4242

43-
spans = tracer.recorder.queued_spans()
43+
spans = self.recorder.queued_spans()
4444
self.assertEqual(2, len(spans))
4545

4646
filter = lambda span: span.n == "sdk"
@@ -95,7 +95,7 @@ def add_custom_header_before_call(params, **kwargs):
9595
self.assertIn("message", result_payload)
9696
self.assertEqual("success", result_payload["message"])
9797

98-
spans = tracer.recorder.queued_spans()
98+
spans = self.recorder.queued_spans()
9999
self.assertEqual(2, len(spans))
100100

101101
filter = lambda span: span.n == "sdk"
@@ -158,7 +158,7 @@ def add_custom_header_before_sign(request, **kwargs):
158158
self.assertIn("message", result_payload)
159159
self.assertEqual("success", result_payload["message"])
160160

161-
spans = tracer.recorder.queued_spans()
161+
spans = self.recorder.queued_spans()
162162
self.assertEqual(2, len(spans))
163163

164164
filter = lambda span: span.n == "sdk"
@@ -220,7 +220,7 @@ def modify_after_call_args(parsed, **kwargs):
220220
self.assertIn("message", result_payload)
221221
self.assertEqual("success", result_payload["message"])
222222

223-
spans = tracer.recorder.queued_spans()
223+
spans = self.recorder.queued_spans()
224224
self.assertEqual(2, len(spans))
225225

226226
filter = lambda span: span.n == "sdk"

‎tests/clients/boto3/test_boto3_s3.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_s3_create_bucket(self):
5151
self.assertEqual(1, len(result['Buckets']))
5252
self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
5353

54-
spans = tracer.recorder.queued_spans()
54+
spans = self.recorder.queued_spans()
5555
self.assertEqual(2, len(spans))
5656

5757
filter = lambda span: span.n == "sdk"
@@ -84,7 +84,7 @@ def test_s3_list_buckets(self):
8484
self.assertEqual(0, len(result['Buckets']))
8585
self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
8686

87-
spans = tracer.recorder.queued_spans()
87+
spans = self.recorder.queued_spans()
8888
self.assertEqual(2, len(spans))
8989

9090
filter = lambda span: span.n == "sdk"
@@ -128,7 +128,7 @@ def test_s3_upload_file(self):
128128
with tracer.start_active_span('test'):
129129
self.s3.upload_file(upload_filename, bucket_name, object_name)
130130

131-
spans = tracer.recorder.queued_spans()
131+
spans = self.recorder.queued_spans()
132132
self.assertEqual(2, len(spans))
133133

134134
filter = lambda span: span.n == "sdk"
@@ -164,7 +164,7 @@ def test_s3_upload_file_obj(self):
164164
with open(upload_filename, "rb") as fd:
165165
self.s3.upload_fileobj(fd, bucket_name, object_name)
166166

167-
spans = tracer.recorder.queued_spans()
167+
spans = self.recorder.queued_spans()
168168
self.assertEqual(2, len(spans))
169169

170170
filter = lambda span: span.n == "sdk"
@@ -200,7 +200,7 @@ def test_s3_download_file(self):
200200
with tracer.start_active_span('test'):
201201
self.s3.download_file(bucket_name, object_name, download_target_filename)
202202

203-
spans = tracer.recorder.queued_spans()
203+
spans = self.recorder.queued_spans()
204204
self.assertEqual(2, len(spans))
205205

206206
filter = lambda span: span.n == "sdk"
@@ -237,7 +237,7 @@ def test_s3_download_file_obj(self):
237237
with open(download_target_filename, "wb") as fd:
238238
self.s3.download_fileobj(bucket_name, object_name, fd)
239239

240-
spans = tracer.recorder.queued_spans()
240+
spans = self.recorder.queued_spans()
241241
self.assertEqual(2, len(spans))
242242

243243
filter = lambda span: span.n == "sdk"
@@ -288,7 +288,7 @@ def add_custom_header_before_call(params, **kwargs):
288288
self.assertEqual(1, len(result['Buckets']))
289289
self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
290290

291-
spans = tracer.recorder.queued_spans()
291+
spans = self.recorder.queued_spans()
292292
self.assertEqual(2, len(spans))
293293

294294
filter = lambda span: span.n == "sdk"
@@ -349,7 +349,7 @@ def add_custom_header_before_sign(request, **kwargs):
349349
self.assertEqual(1, len(result['Buckets']))
350350
self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
351351

352-
spans = tracer.recorder.queued_spans()
352+
spans = self.recorder.queued_spans()
353353
self.assertEqual(2, len(spans))
354354

355355
filter = lambda span: span.n == "sdk"
@@ -409,7 +409,7 @@ def modify_after_call_args(parsed, **kwargs):
409409
self.assertEqual(1, len(result['Buckets']))
410410
self.assertEqual(result['Buckets'][0]['Name'], 'aws_bucket_name')
411411

412-
spans = tracer.recorder.queued_spans()
412+
spans = self.recorder.queued_spans()
413413
self.assertEqual(2, len(spans))
414414

415415
filter = lambda span: span.n == "sdk"

‎tests/clients/boto3/test_boto3_secretsmanager.py

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,17 @@
2020
pwd = os.path.dirname(os.path.abspath(__file__))
2121

2222
class TestSecretsManager(unittest.TestCase):
23-
def set_aws_credentials(self):
24-
""" Mocked AWS Credentials for moto """
25-
for variable_name in self.variable_names:
26-
os.environ[variable_name] = "testing"
27-
2823
def setUp(self):
2924
""" Clear all spans before a test run """
3025
self.recorder = tracer.recorder
3126
self.recorder.clear_spans()
32-
self.variable_names = (
33-
"AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY",
34-
"AWS_SECURITY_TOKEN", "AWS_SESSION_TOKEN"
35-
)
36-
self.set_aws_credentials()
3727
self.mock = mock_aws()
3828
self.mock.start()
3929
self.secretsmanager = boto3.client('secretsmanager', region_name='us-east-1')
4030

41-
def unset_aws_credentials(self):
42-
""" Reset all environment variables of consequence """
43-
for variable_name in self.variable_names:
44-
os.environ.pop(variable_name, None)
45-
4631
def tearDown(self):
4732
# Stop Moto after each test
4833
self.mock.stop()
49-
self.unset_aws_credentials()
5034

5135

5236
def test_vanilla_list_secrets(self):
@@ -70,7 +54,7 @@ def test_get_secret_value(self):
7054

7155
self.assertEqual(result['Name'], secret_id)
7256

73-
spans = tracer.recorder.queued_spans()
57+
spans = self.recorder.queued_spans()
7458
self.assertEqual(2, len(spans))
7559

7660
filter = lambda span: span.n == "sdk"
@@ -130,7 +114,7 @@ def add_custom_header_before_call(params, **kwargs):
130114

131115
self.assertEqual(result['Name'], secret_id)
132116

133-
spans = tracer.recorder.queued_spans()
117+
spans = self.recorder.queued_spans()
134118
self.assertEqual(2, len(spans))
135119

136120
filter = lambda span: span.n == "sdk"
@@ -198,7 +182,7 @@ def add_custom_header_before_sign(request, **kwargs):
198182

199183
self.assertEqual(result['Name'], secret_id)
200184

201-
spans = tracer.recorder.queued_spans()
185+
spans = self.recorder.queued_spans()
202186
self.assertEqual(2, len(spans))
203187

204188
filter = lambda span: span.n == "sdk"
@@ -265,7 +249,7 @@ def modify_after_call_args(parsed, **kwargs):
265249

266250
self.assertEqual(result['Name'], secret_id)
267251

268-
spans = tracer.recorder.queued_spans()
252+
spans = self.recorder.queued_spans()
269253
self.assertEqual(2, len(spans))
270254

271255
filter = lambda span: span.n == "sdk"

‎tests/clients/boto3/test_boto3_ses.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_verify_email(self):
4444

4545
self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
4646

47-
spans = tracer.recorder.queued_spans()
47+
spans = self.recorder.queued_spans()
4848
self.assertEqual(2, len(spans))
4949

5050
filter = lambda span: span.n == "sdk"
@@ -95,7 +95,7 @@ def add_custom_header_before_call(params, **kwargs):
9595

9696
self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
9797

98-
spans = tracer.recorder.queued_spans()
98+
spans = self.recorder.queued_spans()
9999
self.assertEqual(2, len(spans))
100100

101101
filter = lambda span: span.n == "sdk"
@@ -154,7 +154,7 @@ def add_custom_header_before_sign(request, **kwargs):
154154

155155
self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
156156

157-
spans = tracer.recorder.queued_spans()
157+
spans = self.recorder.queued_spans()
158158
self.assertEqual(2, len(spans))
159159

160160
filter = lambda span: span.n == "sdk"
@@ -212,7 +212,7 @@ def modify_after_call_args(parsed, **kwargs):
212212

213213
self.assertEqual(result['ResponseMetadata']['HTTPStatusCode'], 200)
214214

215-
spans = tracer.recorder.queued_spans()
215+
spans = self.recorder.queued_spans()
216216
self.assertEqual(2, len(spans))
217217

218218
filter = lambda span: span.n == "sdk"

‎tests/clients/boto3/test_boto3_sqs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_send_message(self):
7676

7777
self.assertTrue(response['MessageId'])
7878

79-
spans = tracer.recorder.queued_spans()
79+
spans = self.recorder.queued_spans()
8080
self.assertEqual(2, len(spans))
8181

8282
filter = lambda span: span.n == "sdk"
@@ -110,7 +110,7 @@ def test_app_boto3_sqs(self):
110110
with tracer.start_active_span('test'):
111111
self.http_client.request('GET', testenv["wsgi_server"] + '/boto3/sqs')
112112

113-
spans = tracer.recorder.queued_spans()
113+
spans = self.recorder.queued_spans()
114114
self.assertEqual(5, len(spans))
115115

116116
filter = lambda span: span.n == "sdk"
@@ -193,7 +193,7 @@ def add_custom_header_before_call(params, **kwargs):
193193

194194
self.assertTrue(response['MessageId'])
195195

196-
spans = tracer.recorder.queued_spans()
196+
spans = self.recorder.queued_spans()
197197
self.assertEqual(2, len(spans))
198198

199199
filter = lambda span: span.n == "sdk"
@@ -278,7 +278,7 @@ def add_custom_header_before_sign(request, **kwargs):
278278

279279
self.assertTrue(response['MessageId'])
280280

281-
spans = tracer.recorder.queued_spans()
281+
spans = self.recorder.queued_spans()
282282
self.assertEqual(2, len(spans))
283283

284284
filter = lambda span: span.n == "sdk"
@@ -362,7 +362,7 @@ def modify_after_call_args(parsed, **kwargs):
362362

363363
self.assertTrue(response['MessageId'])
364364

365-
spans = tracer.recorder.queued_spans()
365+
spans = self.recorder.queued_spans()
366366
self.assertEqual(2, len(spans))
367367

368368
filter = lambda span: span.n == "sdk"

0 commit comments

Comments
 (0)